[kernel] r11535 - in dists/sid/linux-2.6/debian/patches: features/all/vserver series
Bastian Blank
waldi at alioth.debian.org
Sat Jun 7 08:34:15 UTC 2008
Author: waldi
Date: Sat Jun 7 08:34:14 2008
New Revision: 11535
Log:
* debian/patches/series/4-extra: Remove.
* debian/patches/series/5-extra: Add patches.
* debian/patches/features/all/vserver/vs2.3.0.34.10.patch: Remove.
* debian/patches/features/all/vserver/vs2.3.0.34.11.patch: Add.
Added:
dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.34.11.patch
- copied, changed from r11468, /dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.34.10.patch
dists/sid/linux-2.6/debian/patches/series/5-extra
- copied, changed from r11468, /dists/sid/linux-2.6/debian/patches/series/4-extra
Removed:
dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.34.10.patch
dists/sid/linux-2.6/debian/patches/series/4-extra
Copied: dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.34.11.patch (from r11468, /dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.34.10.patch)
==============================================================================
--- /dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.34.10.patch (original)
+++ dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.34.11.patch Sat Jun 7 08:34:14 2008
@@ -1,5 +1,5 @@
---- linux-2.6.25.4/arch/alpha/Kconfig 2008-04-17 12:05:26.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/Kconfig 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/alpha/Kconfig 2008-04-17 12:05:26.000000000 -0400
++++ a/arch/alpha/Kconfig 2008-04-19 15:14:51.000000000 -0400
@@ -671,6 +671,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -9,8 +9,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/alpha/kernel/entry.S 2008-04-17 11:31:21.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/entry.S 2008-04-21 11:09:01.000000000 -0400
+--- a/arch/alpha/kernel/entry.S 2008-04-17 11:31:21.000000000 -0400
++++ a/arch/alpha/kernel/entry.S 2008-04-21 11:09:01.000000000 -0400
@@ -872,24 +872,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -43,8 +43,8 @@
ret
.end sys_getxpid
---- linux-2.6.25.4/arch/alpha/kernel/osf_sys.c 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/osf_sys.c 2008-05-21 14:30:40.000000000 -0400
+--- a/arch/alpha/kernel/osf_sys.c 2008-05-21 14:30:05.000000000 -0400
++++ a/arch/alpha/kernel/osf_sys.c 2008-05-21 14:30:40.000000000 -0400
@@ -883,7 +883,7 @@ osf_gettimeofday(struct timeval32 __user
{
if (tv) {
@@ -54,8 +54,8 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
---- linux-2.6.25.4/arch/alpha/kernel/ptrace.c 2008-04-17 11:31:21.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/ptrace.c 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/alpha/kernel/ptrace.c 2008-04-17 11:31:21.000000000 -0400
++++ a/arch/alpha/kernel/ptrace.c 2008-04-19 15:14:51.000000000 -0400
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -64,8 +64,8 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
---- linux-2.6.25.4/arch/alpha/kernel/semaphore.c 2008-04-17 11:31:21.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/semaphore.c 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/alpha/kernel/semaphore.c 2008-04-17 11:31:21.000000000 -0400
++++ a/arch/alpha/kernel/semaphore.c 2008-04-19 15:14:51.000000000 -0400
@@ -68,8 +68,8 @@ __down_failed(struct semaphore *sem)
DECLARE_WAITQUEUE(wait, tsk);
@@ -99,8 +99,8 @@
#endif
tsk->state = TASK_INTERRUPTIBLE;
---- linux-2.6.25.4/arch/alpha/kernel/systbls.S 2008-04-17 12:05:26.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/systbls.S 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/alpha/kernel/systbls.S 2008-04-17 12:05:26.000000000 -0400
++++ a/arch/alpha/kernel/systbls.S 2008-04-19 15:14:51.000000000 -0400
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -110,8 +110,8 @@
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
---- linux-2.6.25.4/arch/alpha/kernel/traps.c 2008-04-17 11:31:21.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/traps.c 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/alpha/kernel/traps.c 2008-04-17 11:31:21.000000000 -0400
++++ a/arch/alpha/kernel/traps.c 2008-04-19 15:14:51.000000000 -0400
@@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -122,8 +122,8 @@
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
---- linux-2.6.25.4/arch/alpha/mm/fault.c 2008-04-17 11:31:21.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/mm/fault.c 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/alpha/mm/fault.c 2008-04-17 11:31:21.000000000 -0400
++++ a/arch/alpha/mm/fault.c 2008-04-19 15:14:51.000000000 -0400
@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
@@ -135,8 +135,8 @@
if (!user_mode(regs))
goto no_context;
do_group_exit(SIGKILL);
---- linux-2.6.25.4/arch/arm/Kconfig 2008-04-17 12:05:26.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/arm/Kconfig 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/arm/Kconfig 2008-04-17 12:05:26.000000000 -0400
++++ a/arch/arm/Kconfig 2008-04-19 15:14:51.000000000 -0400
@@ -1180,6 +1180,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -146,8 +146,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/arm/kernel/calls.S 2008-04-17 12:05:26.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/arm/kernel/calls.S 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/arm/kernel/calls.S 2008-04-17 12:05:26.000000000 -0400
++++ a/arch/arm/kernel/calls.S 2008-04-19 15:14:51.000000000 -0400
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -157,8 +157,8 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
---- linux-2.6.25.4/arch/arm/kernel/process.c 2008-04-17 12:05:26.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/arm/kernel/process.c 2008-04-21 11:09:01.000000000 -0400
+--- a/arch/arm/kernel/process.c 2008-04-17 12:05:26.000000000 -0400
++++ a/arch/arm/kernel/process.c 2008-04-21 11:09:01.000000000 -0400
@@ -264,7 +264,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -169,8 +169,8 @@
__show_regs(regs);
__backtrace();
}
---- linux-2.6.25.4/arch/arm/kernel/traps.c 2008-04-17 12:05:26.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/arm/kernel/traps.c 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/arm/kernel/traps.c 2008-04-17 12:05:26.000000000 -0400
++++ a/arch/arm/kernel/traps.c 2008-04-19 15:14:51.000000000 -0400
@@ -214,8 +214,8 @@ static void __die(const char *str, int e
str, err, ++die_counter);
print_modules();
@@ -182,8 +182,8 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
---- linux-2.6.25.4/arch/arm/mm/fault.c 2008-04-17 12:05:27.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/arm/mm/fault.c 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/arm/mm/fault.c 2008-04-17 12:05:27.000000000 -0400
++++ a/arch/arm/mm/fault.c 2008-04-19 15:14:51.000000000 -0400
@@ -292,7 +292,8 @@ do_page_fault(unsigned long addr, unsign
* happened to us that made us unable to handle
* the page fault gracefully.
@@ -194,8 +194,8 @@
do_group_exit(SIGKILL);
return 0;
}
---- linux-2.6.25.4/arch/cris/Kconfig 2008-04-17 12:05:27.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/cris/Kconfig 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/cris/Kconfig 2008-04-17 12:05:27.000000000 -0400
++++ a/arch/cris/Kconfig 2008-04-19 15:14:51.000000000 -0400
@@ -679,6 +679,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -205,8 +205,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/frv/kernel/kernel_thread.S 2007-02-04 13:44:54.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/frv/kernel/kernel_thread.S 2008-04-21 11:09:01.000000000 -0400
+--- a/arch/frv/kernel/kernel_thread.S 2007-02-04 13:44:54.000000000 -0500
++++ a/arch/frv/kernel/kernel_thread.S 2008-04-21 11:09:01.000000000 -0400
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
@@ -216,8 +216,8 @@
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
---- linux-2.6.25.4/arch/h8300/Kconfig 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/h8300/Kconfig 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/h8300/Kconfig 2008-04-17 12:05:28.000000000 -0400
++++ a/arch/h8300/Kconfig 2008-04-19 15:14:51.000000000 -0400
@@ -233,6 +233,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -227,8 +227,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/ia64/ia32/ia32_entry.S 2008-04-17 10:37:14.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/ia32/ia32_entry.S 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/ia64/ia32/ia32_entry.S 2008-04-17 10:37:14.000000000 -0400
++++ a/arch/ia64/ia32/ia32_entry.S 2008-04-19 15:14:51.000000000 -0400
@@ -446,7 +446,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -238,8 +238,8 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
---- linux-2.6.25.4/arch/ia64/ia32/sys_ia32.c 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/ia32/sys_ia32.c 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/ia64/ia32/sys_ia32.c 2008-04-17 12:05:28.000000000 -0400
++++ a/arch/ia64/ia32/sys_ia32.c 2008-04-19 15:14:51.000000000 -0400
@@ -1177,7 +1177,7 @@ sys32_gettimeofday (struct compat_timeva
{
if (tv) {
@@ -249,8 +249,8 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
---- linux-2.6.25.4/arch/ia64/Kconfig 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/Kconfig 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/ia64/Kconfig 2008-04-17 12:05:28.000000000 -0400
++++ a/arch/ia64/Kconfig 2008-04-19 15:14:51.000000000 -0400
@@ -615,6 +615,8 @@ source "arch/ia64/hp/sim/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -260,8 +260,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/ia64/kernel/entry.S 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/entry.S 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/ia64/kernel/entry.S 2008-04-17 12:05:28.000000000 -0400
++++ a/arch/ia64/kernel/entry.S 2008-04-19 15:14:51.000000000 -0400
@@ -1547,7 +1547,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -271,8 +271,8 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
---- linux-2.6.25.4/arch/ia64/kernel/perfmon.c 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/perfmon.c 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/ia64/kernel/perfmon.c 2008-04-17 12:05:28.000000000 -0400
++++ a/arch/ia64/kernel/perfmon.c 2008-04-19 15:14:51.000000000 -0400
@@ -40,6 +40,7 @@
#include <linux/capability.h>
#include <linux/rcupdate.h>
@@ -290,8 +290,8 @@
vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
vma_pages(vma));
up_write(&task->mm->mmap_sem);
---- linux-2.6.25.4/arch/ia64/kernel/process.c 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/process.c 2008-04-21 11:09:01.000000000 -0400
+--- a/arch/ia64/kernel/process.c 2008-04-17 12:05:28.000000000 -0400
++++ a/arch/ia64/kernel/process.c 2008-04-21 11:09:01.000000000 -0400
@@ -105,8 +105,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -303,8 +303,8 @@
printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
init_utsname()->release);
---- linux-2.6.25.4/arch/ia64/kernel/ptrace.c 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/ptrace.c 2008-04-19 15:14:51.000000000 -0400
+--- a/arch/ia64/kernel/ptrace.c 2008-04-17 12:05:28.000000000 -0400
++++ a/arch/ia64/kernel/ptrace.c 2008-04-19 15:14:51.000000000 -0400
@@ -17,6 +17,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -313,8 +313,8 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
---- linux-2.6.25.4/arch/ia64/kernel/traps.c 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/traps.c 2008-04-21 10:33:04.000000000 -0400
+--- a/arch/ia64/kernel/traps.c 2008-04-17 12:05:28.000000000 -0400
++++ a/arch/ia64/kernel/traps.c 2008-04-21 10:33:04.000000000 -0400
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -339,8 +339,8 @@
}
}
}
---- linux-2.6.25.4/arch/ia64/mm/fault.c 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/ia64/mm/fault.c 2008-04-17 12:05:28.000000000 -0400
++++ a/arch/ia64/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
@@ -349,8 +349,8 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
---- linux-2.6.25.4/arch/m32r/kernel/traps.c 2008-04-17 11:31:23.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/m32r/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/m32r/kernel/traps.c 2008-04-17 11:31:23.000000000 -0400
++++ a/arch/m32r/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -363,8 +363,8 @@
/*
* When in-kernel, we also print out the stack and code at the
---- linux-2.6.25.4/arch/m68k/Kconfig 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/m68k/Kconfig 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/m68k/Kconfig 2008-04-17 12:05:28.000000000 -0400
++++ a/arch/m68k/Kconfig 2008-04-19 15:14:52.000000000 -0400
@@ -674,6 +674,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -374,8 +374,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/m68k/kernel/ptrace.c 2008-04-17 11:31:23.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/m68k/kernel/ptrace.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/m68k/kernel/ptrace.c 2008-04-17 11:31:23.000000000 -0400
++++ a/arch/m68k/kernel/ptrace.c 2008-04-19 15:14:52.000000000 -0400
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
@@ -393,8 +393,8 @@
return ret;
out_eio:
---- linux-2.6.25.4/arch/m68k/kernel/traps.c 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/m68k/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/m68k/kernel/traps.c 2008-04-17 12:05:28.000000000 -0400
++++ a/arch/m68k/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
@@ -898,8 +898,8 @@ void show_registers(struct pt_regs *regs
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
regs->d4, regs->d5, regs->a0, regs->a1);
@@ -406,8 +406,8 @@
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
---- linux-2.6.25.4/arch/m68knommu/Kconfig 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/m68knommu/Kconfig 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/m68knommu/Kconfig 2008-04-17 12:05:28.000000000 -0400
++++ a/arch/m68knommu/Kconfig 2008-04-19 15:14:52.000000000 -0400
@@ -722,6 +722,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -417,8 +417,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/m68knommu/kernel/traps.c 2008-04-17 10:37:14.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/m68knommu/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/m68knommu/kernel/traps.c 2008-04-17 10:37:14.000000000 -0400
++++ a/arch/m68knommu/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
@@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_
printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
fp->d4, fp->d5, fp->a0, fp->a1);
@@ -431,8 +431,8 @@
show_stack(NULL, (unsigned long *)(fp + 1));
add_taint(TAINT_DIE);
do_exit(SIGSEGV);
---- linux-2.6.25.4/arch/mips/Kconfig 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/mips/Kconfig 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/mips/Kconfig 2008-04-17 12:05:28.000000000 -0400
++++ a/arch/mips/Kconfig 2008-04-19 15:14:52.000000000 -0400
@@ -2099,6 +2099,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -442,8 +442,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/mips/kernel/linux32.c 2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/mips/kernel/linux32.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/mips/kernel/linux32.c 2008-04-17 12:05:29.000000000 -0400
++++ a/arch/mips/kernel/linux32.c 2008-04-19 15:14:52.000000000 -0400
@@ -209,7 +209,7 @@ sys32_gettimeofday(struct compat_timeval
{
if (tv) {
@@ -453,8 +453,8 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
---- linux-2.6.25.4/arch/mips/kernel/ptrace.c 2008-04-17 11:31:23.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/mips/kernel/ptrace.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/mips/kernel/ptrace.c 2008-04-17 11:31:23.000000000 -0400
++++ a/arch/mips/kernel/ptrace.c 2008-04-19 15:14:52.000000000 -0400
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -473,8 +473,8 @@
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
---- linux-2.6.25.4/arch/mips/kernel/scall32-o32.S 2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/mips/kernel/scall32-o32.S 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/mips/kernel/scall32-o32.S 2008-04-17 12:05:29.000000000 -0400
++++ a/arch/mips/kernel/scall32-o32.S 2008-04-19 15:14:52.000000000 -0400
@@ -619,7 +619,7 @@ einval: li v0, -EINVAL
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -484,8 +484,8 @@
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
---- linux-2.6.25.4/arch/mips/kernel/scall64-64.S 2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/mips/kernel/scall64-64.S 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/mips/kernel/scall64-64.S 2008-04-17 12:05:29.000000000 -0400
++++ a/arch/mips/kernel/scall64-64.S 2008-04-19 15:14:52.000000000 -0400
@@ -434,7 +434,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -495,8 +495,8 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
---- linux-2.6.25.4/arch/mips/kernel/scall64-n32.S 2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/mips/kernel/scall64-n32.S 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/mips/kernel/scall64-n32.S 2008-04-17 12:05:29.000000000 -0400
++++ a/arch/mips/kernel/scall64-n32.S 2008-04-19 15:14:52.000000000 -0400
@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -506,8 +506,8 @@
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
---- linux-2.6.25.4/arch/mips/kernel/scall64-o32.S 2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/mips/kernel/scall64-o32.S 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/mips/kernel/scall64-o32.S 2008-04-17 12:05:29.000000000 -0400
++++ a/arch/mips/kernel/scall64-o32.S 2008-04-19 15:14:52.000000000 -0400
@@ -482,7 +482,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -517,8 +517,8 @@
PTR sys32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
---- linux-2.6.25.4/arch/mips/kernel/traps.c 2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/mips/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/mips/kernel/traps.c 2008-04-17 12:05:29.000000000 -0400
++++ a/arch/mips/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
@@ -313,8 +313,9 @@ void show_registers(const struct pt_regs
{
__show_regs(regs);
@@ -531,8 +531,8 @@
show_stacktrace(current, regs);
show_code((unsigned int __user *) regs->cp0_epc);
printk("\n");
---- linux-2.6.25.4/arch/mips/mm/fault.c 2008-04-17 11:31:24.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/mips/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/mips/mm/fault.c 2008-04-17 11:31:24.000000000 -0400
++++ a/arch/mips/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
@@ -178,7 +178,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -543,8 +543,8 @@
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
---- linux-2.6.25.4/arch/parisc/Kconfig 2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/parisc/Kconfig 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/parisc/Kconfig 2008-04-17 12:05:29.000000000 -0400
++++ a/arch/parisc/Kconfig 2008-04-19 15:14:52.000000000 -0400
@@ -278,6 +278,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -554,8 +554,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/parisc/kernel/syscall_table.S 2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/parisc/kernel/syscall_table.S 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/parisc/kernel/syscall_table.S 2008-04-17 12:05:29.000000000 -0400
++++ a/arch/parisc/kernel/syscall_table.S 2008-04-19 15:14:52.000000000 -0400
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -565,8 +565,8 @@
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
---- linux-2.6.25.4/arch/parisc/kernel/sys_parisc32.c 2008-04-17 11:31:24.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/parisc/kernel/sys_parisc32.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/parisc/kernel/sys_parisc32.c 2008-04-17 11:31:24.000000000 -0400
++++ a/arch/parisc/kernel/sys_parisc32.c 2008-04-19 15:14:52.000000000 -0400
@@ -204,11 +204,11 @@ static inline long get_ts32(struct times
asmlinkage int
sys32_gettimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)
@@ -581,8 +581,8 @@
if (put_compat_timeval(tv, &ktv))
return -EFAULT;
}
---- linux-2.6.25.4/arch/parisc/kernel/traps.c 2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/parisc/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/parisc/kernel/traps.c 2008-04-17 12:05:29.000000000 -0400
++++ a/arch/parisc/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
@@ -237,8 +237,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
@@ -606,8 +606,8 @@
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
---- linux-2.6.25.4/arch/parisc/mm/fault.c 2008-04-17 11:31:24.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/parisc/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/parisc/mm/fault.c 2008-04-17 11:31:24.000000000 -0400
++++ a/arch/parisc/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
@@ -210,8 +210,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -630,8 +630,8 @@
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
---- linux-2.6.25.4/arch/powerpc/Kconfig 2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/powerpc/Kconfig 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/powerpc/Kconfig 2008-04-17 12:05:29.000000000 -0400
++++ a/arch/powerpc/Kconfig 2008-04-19 15:14:52.000000000 -0400
@@ -706,6 +706,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -641,8 +641,8 @@
source "security/Kconfig"
config KEYS_COMPAT
---- linux-2.6.25.4/arch/powerpc/kernel/irq.c 2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/powerpc/kernel/irq.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/powerpc/kernel/irq.c 2008-04-17 12:05:29.000000000 -0400
++++ a/arch/powerpc/kernel/irq.c 2008-04-19 15:14:52.000000000 -0400
@@ -53,6 +53,7 @@
#include <linux/bootmem.h>
#include <linux/pci.h>
@@ -651,8 +651,8 @@
#include <asm/uaccess.h>
#include <asm/system.h>
---- linux-2.6.25.4/arch/powerpc/kernel/process.c 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/powerpc/kernel/process.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/powerpc/kernel/process.c 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/powerpc/kernel/process.c 2008-04-19 15:14:52.000000000 -0400
@@ -464,8 +464,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
@@ -665,8 +665,8 @@
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
---- linux-2.6.25.4/arch/powerpc/kernel/sys_ppc32.c 2008-04-17 11:31:24.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/powerpc/kernel/sys_ppc32.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/powerpc/kernel/sys_ppc32.c 2008-04-17 11:31:24.000000000 -0400
++++ a/arch/powerpc/kernel/sys_ppc32.c 2008-04-19 15:14:52.000000000 -0400
@@ -205,7 +205,7 @@ asmlinkage long compat_sys_gettimeofday(
{
if (tv) {
@@ -676,8 +676,8 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
---- linux-2.6.25.4/arch/powerpc/kernel/traps.c 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/powerpc/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/powerpc/kernel/traps.c 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/powerpc/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
@@ -941,8 +941,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
@@ -690,8 +690,8 @@
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
---- linux-2.6.25.4/arch/powerpc/kernel/vdso.c 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/powerpc/kernel/vdso.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/powerpc/kernel/vdso.c 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/powerpc/kernel/vdso.c 2008-04-19 15:14:52.000000000 -0400
@@ -21,6 +21,7 @@
#include <linux/elf.h>
#include <linux/security.h>
@@ -700,8 +700,8 @@
#include <asm/pgtable.h>
#include <asm/system.h>
---- linux-2.6.25.4/arch/powerpc/mm/fault.c 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/powerpc/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/powerpc/mm/fault.c 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/powerpc/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
@@ -378,7 +378,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -712,8 +712,8 @@
if (user_mode(regs))
do_group_exit(SIGKILL);
return SIGKILL;
---- linux-2.6.25.4/arch/ppc/Kconfig 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ppc/Kconfig 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/ppc/Kconfig 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/ppc/Kconfig 2008-04-19 15:14:52.000000000 -0400
@@ -1261,6 +1261,8 @@ source "lib/Kconfig"
source "arch/ppc/Kconfig.debug"
@@ -723,8 +723,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/ppc/kernel/traps.c 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ppc/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/ppc/kernel/traps.c 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/ppc/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
@@ -669,8 +669,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
@@ -737,8 +737,8 @@
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
---- linux-2.6.25.4/arch/ppc/mm/fault.c 2008-04-17 11:31:25.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ppc/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/ppc/mm/fault.c 2008-04-17 11:31:25.000000000 -0400
++++ a/arch/ppc/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
@@ -295,7 +295,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -749,8 +749,8 @@
if (user_mode(regs))
do_group_exit(SIGKILL);
return SIGKILL;
---- linux-2.6.25.4/arch/s390/Kconfig 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/s390/Kconfig 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/s390/Kconfig 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/s390/Kconfig 2008-04-19 15:14:52.000000000 -0400
@@ -544,6 +544,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -760,8 +760,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/s390/kernel/compat_linux.c 2008-04-17 11:31:25.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/s390/kernel/compat_linux.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/s390/kernel/compat_linux.c 2008-04-17 11:31:25.000000000 -0400
++++ a/arch/s390/kernel/compat_linux.c 2008-04-19 15:14:52.000000000 -0400
@@ -567,7 +567,7 @@ asmlinkage long sys32_gettimeofday(struc
{
if (tv) {
@@ -771,8 +771,8 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
---- linux-2.6.25.4/arch/s390/kernel/process.c 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/s390/kernel/process.c 2008-04-21 11:09:01.000000000 -0400
+--- a/arch/s390/kernel/process.c 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/s390/kernel/process.c 2008-04-21 11:09:01.000000000 -0400
@@ -194,9 +194,9 @@ void show_regs(struct pt_regs *regs)
init_utsname()->release,
(int)strcspn(init_utsname()->version, " "),
@@ -786,8 +786,8 @@
show_registers(regs);
/* Show stack backtrace if pt_regs is from kernel mode */
if (!(regs->psw.mask & PSW_MASK_PSTATE))
---- linux-2.6.25.4/arch/s390/kernel/ptrace.c 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/s390/kernel/ptrace.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/s390/kernel/ptrace.c 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/s390/kernel/ptrace.c 2008-04-19 15:14:52.000000000 -0400
@@ -33,6 +33,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -810,8 +810,8 @@
put_task_struct(child);
out:
unlock_kernel();
---- linux-2.6.25.4/arch/s390/kernel/syscalls.S 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/s390/kernel/syscalls.S 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/s390/kernel/syscalls.S 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/s390/kernel/syscalls.S 2008-04-19 15:14:52.000000000 -0400
@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
@@ -821,8 +821,8 @@
SYSCALL(s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
---- linux-2.6.25.4/arch/s390/mm/fault.c 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/s390/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/s390/mm/fault.c 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/s390/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
@@ -217,7 +217,8 @@ static int do_out_of_memory(struct pt_re
down_read(&mm->mmap_sem);
return 1;
@@ -833,8 +833,8 @@
if (regs->psw.mask & PSW_MASK_PSTATE)
do_group_exit(SIGKILL);
do_no_context(regs, error_code, address);
---- linux-2.6.25.4/arch/sh/Kconfig 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sh/Kconfig 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/sh/Kconfig 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/sh/Kconfig 2008-04-19 15:14:52.000000000 -0400
@@ -913,6 +913,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -844,8 +844,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/sh/kernel/irq.c 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sh/kernel/irq.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/sh/kernel/irq.c 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/sh/kernel/irq.c 2008-04-19 15:14:52.000000000 -0400
@@ -11,6 +11,7 @@
#include <linux/module.h>
#include <linux/kernel_stat.h>
@@ -854,8 +854,8 @@
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
---- linux-2.6.25.4/arch/sh/kernel/vsyscall/vsyscall.c 2008-04-17 10:37:14.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sh/kernel/vsyscall/vsyscall.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/sh/kernel/vsyscall/vsyscall.c 2008-04-17 10:37:14.000000000 -0400
++++ a/arch/sh/kernel/vsyscall/vsyscall.c 2008-04-19 15:14:52.000000000 -0400
@@ -19,6 +19,7 @@
#include <linux/elf.h>
#include <linux/sched.h>
@@ -864,8 +864,8 @@
/*
* Should the kernel map a VDSO page into processes and pass its
---- linux-2.6.25.4/arch/sparc/Kconfig 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sparc/Kconfig 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/sparc/Kconfig 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/sparc/Kconfig 2008-04-19 15:14:52.000000000 -0400
@@ -330,6 +330,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -875,8 +875,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/sparc/kernel/ptrace.c 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sparc/kernel/ptrace.c 2008-05-21 14:30:40.000000000 -0400
+--- a/arch/sparc/kernel/ptrace.c 2008-05-21 14:30:05.000000000 -0400
++++ a/arch/sparc/kernel/ptrace.c 2008-05-21 14:30:40.000000000 -0400
@@ -21,6 +21,7 @@
#include <linux/signal.h>
#include <linux/regset.h>
@@ -896,8 +896,8 @@
if (!ret)
ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
---- linux-2.6.25.4/arch/sparc/kernel/systbls.S 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sparc/kernel/systbls.S 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/sparc/kernel/systbls.S 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/sparc/kernel/systbls.S 2008-04-19 15:14:52.000000000 -0400
@@ -70,7 +70,7 @@ sys_call_table:
/*250*/ .long sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
/*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
@@ -907,8 +907,8 @@
/*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
/*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
---- linux-2.6.25.4/arch/sparc/kernel/traps.c 2008-04-17 11:31:25.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sparc/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/sparc/kernel/traps.c 2008-04-17 11:31:25.000000000 -0400
++++ a/arch/sparc/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
@@ -99,7 +99,8 @@ void die_if_kernel(char *str, struct pt_
" /_| \\__/ |_\\\n"
" \\__U_/\n");
@@ -919,8 +919,8 @@
show_regs(regs);
add_taint(TAINT_DIE);
---- linux-2.6.25.4/arch/sparc/mm/fault.c 2008-04-17 11:31:25.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sparc/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/sparc/mm/fault.c 2008-04-17 11:31:25.000000000 -0400
++++ a/arch/sparc/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
@@ -367,7 +367,8 @@ no_context:
*/
out_of_memory:
@@ -931,8 +931,8 @@
if (from_user)
do_group_exit(SIGKILL);
goto no_context;
---- linux-2.6.25.4/arch/sparc64/Kconfig 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sparc64/Kconfig 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/sparc64/Kconfig 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/sparc64/Kconfig 2008-04-19 15:14:52.000000000 -0400
@@ -471,6 +471,8 @@ source "fs/Kconfig"
source "arch/sparc64/Kconfig.debug"
@@ -942,8 +942,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/sparc64/kernel/binfmt_aout32.c 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sparc64/kernel/binfmt_aout32.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/sparc64/kernel/binfmt_aout32.c 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/sparc64/kernel/binfmt_aout32.c 2008-04-19 15:14:52.000000000 -0400
@@ -27,6 +27,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -952,8 +952,8 @@
#include <asm/system.h>
#include <asm/uaccess.h>
---- linux-2.6.25.4/arch/sparc64/kernel/ptrace.c 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sparc64/kernel/ptrace.c 2008-05-21 14:30:40.000000000 -0400
+--- a/arch/sparc64/kernel/ptrace.c 2008-05-21 14:30:05.000000000 -0400
++++ a/arch/sparc64/kernel/ptrace.c 2008-05-21 14:30:40.000000000 -0400
@@ -25,6 +25,7 @@
#include <linux/regset.h>
#include <linux/compat.h>
@@ -973,8 +973,8 @@
if (!ret) {
/* TSTATE, TPC, TNPC */
---- linux-2.6.25.4/arch/sparc64/kernel/sys_sparc32.c 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sparc64/kernel/sys_sparc32.c 2008-05-21 14:30:40.000000000 -0400
+--- a/arch/sparc64/kernel/sys_sparc32.c 2008-05-21 14:30:05.000000000 -0400
++++ a/arch/sparc64/kernel/sys_sparc32.c 2008-05-21 14:30:40.000000000 -0400
@@ -722,7 +722,7 @@ asmlinkage long sys32_gettimeofday(struc
{
if (tv) {
@@ -984,8 +984,8 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
---- linux-2.6.25.4/arch/sparc64/kernel/systbls.S 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sparc64/kernel/systbls.S 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/sparc64/kernel/systbls.S 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/sparc64/kernel/systbls.S 2008-04-19 15:14:52.000000000 -0400
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys32_mremap, sys32_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
@@ -1004,8 +1004,8 @@
/*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
.word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
---- linux-2.6.25.4/arch/sparc64/kernel/traps.c 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sparc64/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/sparc64/kernel/traps.c 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/sparc64/kernel/traps.c 2008-04-19 15:14:52.000000000 -0400
@@ -2183,7 +2183,8 @@ void die_if_kernel(char *str, struct pt_
" /_| \\__/ |_\\\n"
" \\__U_/\n");
@@ -1016,8 +1016,8 @@
notify_die(DIE_OOPS, str, regs, 0, 255, SIGSEGV);
__asm__ __volatile__("flushw");
__show_regs(regs);
---- linux-2.6.25.4/arch/sparc64/mm/fault.c 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sparc64/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/sparc64/mm/fault.c 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/sparc64/mm/fault.c 2008-04-19 15:14:52.000000000 -0400
@@ -453,7 +453,8 @@ handle_kernel_fault:
out_of_memory:
insn = get_fault_insn(regs, insn);
@@ -1028,8 +1028,8 @@
if (!(regs->tstate & TSTATE_PRIV))
do_group_exit(SIGKILL);
goto handle_kernel_fault;
---- linux-2.6.25.4/arch/sparc64/solaris/fs.c 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/sparc64/solaris/fs.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/sparc64/solaris/fs.c 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/sparc64/solaris/fs.c 2008-04-19 15:14:52.000000000 -0400
@@ -368,7 +368,7 @@ static int report_statvfs(struct vfsmoun
int j = strlen (p);
@@ -1048,8 +1048,8 @@
if (mnt->mnt_flags & MNT_NOSUID) i |= 2;
if (!sysv_valid_dev(inode->i_sb->s_dev))
return -EOVERFLOW;
---- linux-2.6.25.4/arch/um/Kconfig 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/um/Kconfig 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/um/Kconfig 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/um/Kconfig 2008-04-19 15:14:52.000000000 -0400
@@ -245,6 +245,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
@@ -1059,8 +1059,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/um/kernel/trap.c 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/um/kernel/trap.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/um/kernel/trap.c 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/um/kernel/trap.c 2008-04-19 15:14:52.000000000 -0400
@@ -215,7 +215,8 @@ unsigned long segv(struct faultinfo fi,
current->thread.arch.faultinfo = fi;
force_sig_info(SIGBUS, &si, current);
@@ -1071,8 +1071,8 @@
do_exit(SIGKILL);
} else {
BUG_ON(err != -EFAULT);
---- linux-2.6.25.4/arch/v850/Kconfig 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/v850/Kconfig 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/v850/Kconfig 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/v850/Kconfig 2008-04-19 15:14:52.000000000 -0400
@@ -344,6 +344,8 @@ source "drivers/usb/Kconfig"
source "arch/v850/Kconfig.debug"
@@ -1082,8 +1082,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/v850/kernel/ptrace.c 2008-04-17 10:37:14.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/v850/kernel/ptrace.c 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/v850/kernel/ptrace.c 2008-04-17 10:37:14.000000000 -0400
++++ a/arch/v850/kernel/ptrace.c 2008-04-19 15:14:52.000000000 -0400
@@ -23,6 +23,7 @@
#include <linux/sched.h>
#include <linux/ptrace.h>
@@ -1102,8 +1102,8 @@
switch (request) {
unsigned long val;
---- linux-2.6.25.4/arch/x86/ia32/ia32entry.S 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/x86/ia32/ia32entry.S 2008-04-22 20:07:49.000000000 -0400
+--- a/arch/x86/ia32/ia32entry.S 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/x86/ia32/ia32entry.S 2008-04-22 20:07:49.000000000 -0400
@@ -673,7 +673,7 @@ ia32_sys_call_table:
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
@@ -1113,8 +1113,8 @@
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
---- linux-2.6.25.4/arch/x86/Kconfig 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/x86/Kconfig 2008-05-21 14:30:40.000000000 -0400
+--- a/arch/x86/Kconfig 2008-05-21 14:30:05.000000000 -0400
++++ a/arch/x86/Kconfig 2008-05-21 14:30:40.000000000 -0400
@@ -1623,6 +1623,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
@@ -1124,8 +1124,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.25.4/arch/x86/kernel/syscall_table_32.S 2008-04-17 12:05:30.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/x86/kernel/syscall_table_32.S 2008-04-19 15:14:52.000000000 -0400
+--- a/arch/x86/kernel/syscall_table_32.S 2008-04-17 12:05:30.000000000 -0400
++++ a/arch/x86/kernel/syscall_table_32.S 2008-04-19 15:14:52.000000000 -0400
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -1135,8 +1135,8 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
---- linux-2.6.25.4/Documentation/vserver/debug.txt 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/Documentation/vserver/debug.txt 2008-04-19 15:14:51.000000000 -0400
+--- a/Documentation/vserver/debug.txt 1969-12-31 19:00:00.000000000 -0500
++++ a/Documentation/vserver/debug.txt 2008-04-19 15:14:51.000000000 -0400
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -1292,8 +1292,8 @@
+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
---- linux-2.6.25.4/drivers/block/Kconfig 2008-04-17 12:05:31.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/drivers/block/Kconfig 2008-04-19 15:14:52.000000000 -0400
+--- a/drivers/block/Kconfig 2008-04-17 12:05:31.000000000 -0400
++++ a/drivers/block/Kconfig 2008-04-19 15:14:52.000000000 -0400
@@ -263,6 +263,13 @@ config BLK_DEV_CRYPTOLOOP
instead, which can be configured to be on-disk compatible with the
cryptoloop device.
@@ -1308,8 +1308,8 @@
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
---- linux-2.6.25.4/drivers/block/loop.c 2008-04-17 12:05:32.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/drivers/block/loop.c 2008-04-19 15:14:52.000000000 -0400
+--- a/drivers/block/loop.c 2008-04-17 12:05:32.000000000 -0400
++++ a/drivers/block/loop.c 2008-04-19 15:14:52.000000000 -0400
@@ -76,6 +76,7 @@
#include <linux/gfp.h>
#include <linux/kthread.h>
@@ -1363,8 +1363,8 @@
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
---- linux-2.6.25.4/drivers/block/Makefile 2008-04-17 12:05:31.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/drivers/block/Makefile 2008-04-19 15:14:52.000000000 -0400
+--- a/drivers/block/Makefile 2008-04-17 12:05:31.000000000 -0400
++++ a/drivers/block/Makefile 2008-04-19 15:14:52.000000000 -0400
@@ -29,5 +29,6 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
@@ -1372,8 +1372,8 @@
+obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
---- linux-2.6.25.4/drivers/block/vroot.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/drivers/block/vroot.c 2008-04-19 15:14:52.000000000 -0400
+--- a/drivers/block/vroot.c 1969-12-31 19:00:00.000000000 -0500
++++ a/drivers/block/vroot.c 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,280 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1655,8 +1655,8 @@
+
+#endif
+
---- linux-2.6.25.4/drivers/char/sysrq.c 2008-04-17 11:31:27.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/drivers/char/sysrq.c 2008-04-19 15:14:52.000000000 -0400
+--- a/drivers/char/sysrq.c 2008-04-17 11:31:27.000000000 -0400
++++ a/drivers/char/sysrq.c 2008-04-19 15:14:52.000000000 -0400
@@ -37,6 +37,7 @@
#include <linux/irq.h>
#include <linux/hrtimer.h>
@@ -1709,8 +1709,8 @@
else
retval = -1;
return retval;
---- linux-2.6.25.4/drivers/char/tty_io.c 2008-04-17 12:05:32.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/drivers/char/tty_io.c 2008-04-19 15:14:52.000000000 -0400
+--- a/drivers/char/tty_io.c 2008-04-17 12:05:32.000000000 -0400
++++ a/drivers/char/tty_io.c 2008-04-19 15:14:52.000000000 -0400
@@ -105,6 +105,7 @@
#include <linux/kmod.h>
@@ -1727,8 +1727,8 @@
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
---- linux-2.6.25.4/drivers/infiniband/hw/ipath/ipath_user_pages.c 2008-04-17 10:37:17.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/drivers/infiniband/hw/ipath/ipath_user_pages.c 2008-04-19 15:14:52.000000000 -0400
+--- a/drivers/infiniband/hw/ipath/ipath_user_pages.c 2008-04-17 10:37:17.000000000 -0400
++++ a/drivers/infiniband/hw/ipath/ipath_user_pages.c 2008-04-19 15:14:52.000000000 -0400
@@ -33,6 +33,7 @@
#include <linux/mm.h>
@@ -1774,8 +1774,8 @@
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
---- linux-2.6.25.4/drivers/md/dm.c 2008-04-17 12:05:33.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/drivers/md/dm.c 2008-04-19 15:14:52.000000000 -0400
+--- a/drivers/md/dm.c 2008-04-17 12:05:33.000000000 -0400
++++ a/drivers/md/dm.c 2008-04-19 15:14:52.000000000 -0400
@@ -22,6 +22,7 @@
#include <linux/hdreg.h>
#include <linux/blktrace_api.h>
@@ -1849,8 +1849,8 @@
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
---- linux-2.6.25.4/drivers/md/dm.h 2008-04-17 11:31:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/drivers/md/dm.h 2008-04-19 15:14:52.000000000 -0400
+--- a/drivers/md/dm.h 2008-04-17 11:31:28.000000000 -0400
++++ a/drivers/md/dm.h 2008-04-19 15:14:52.000000000 -0400
@@ -127,6 +127,8 @@ void dm_put_target_type(struct target_ty
int dm_target_iterate(void (*iter_func)(struct target_type *tt,
void *param), void *param);
@@ -1860,8 +1860,8 @@
/*-----------------------------------------------------------------
* Useful inlines.
*---------------------------------------------------------------*/
---- linux-2.6.25.4/drivers/md/dm-ioctl.c 2008-04-17 12:05:33.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/drivers/md/dm-ioctl.c 2008-04-21 10:45:53.000000000 -0400
+--- a/drivers/md/dm-ioctl.c 2008-04-17 12:05:33.000000000 -0400
++++ a/drivers/md/dm-ioctl.c 2008-04-21 10:45:53.000000000 -0400
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1943,8 +1943,8 @@
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
---- linux-2.6.25.4/drivers/net/tun.c 2008-04-17 12:05:36.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/drivers/net/tun.c 2008-04-19 15:39:04.000000000 -0400
+--- a/drivers/net/tun.c 2008-04-17 12:05:36.000000000 -0400
++++ a/drivers/net/tun.c 2008-04-19 15:39:04.000000000 -0400
@@ -62,6 +62,7 @@
#include <linux/if_ether.h>
#include <linux/if_tun.h>
@@ -2014,8 +2014,8 @@
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
---- linux-2.6.25.4/fs/attr.c 2008-04-17 11:31:35.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/attr.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/attr.c 2008-04-17 11:31:35.000000000 -0400
++++ a/fs/attr.c 2008-04-19 15:14:52.000000000 -0400
@@ -14,6 +14,9 @@
#include <linux/fcntl.h>
#include <linux/quotaops.h>
@@ -2073,8 +2073,8 @@
error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
if (!error)
error = inode_setattr(inode, attr);
---- linux-2.6.25.4/fs/binfmt_aout.c 2008-04-17 12:05:39.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/binfmt_aout.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/binfmt_aout.c 2008-04-17 12:05:39.000000000 -0400
++++ a/fs/binfmt_aout.c 2008-04-19 15:14:52.000000000 -0400
@@ -24,6 +24,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -2083,8 +2083,8 @@
#include <asm/system.h>
#include <asm/uaccess.h>
---- linux-2.6.25.4/fs/binfmt_elf.c 2008-04-17 12:05:39.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/binfmt_elf.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/binfmt_elf.c 2008-04-17 12:05:39.000000000 -0400
++++ a/fs/binfmt_elf.c 2008-04-19 15:14:52.000000000 -0400
@@ -39,6 +39,7 @@
#include <linux/random.h>
#include <linux/elf.h>
@@ -2093,8 +2093,8 @@
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
---- linux-2.6.25.4/fs/binfmt_flat.c 2008-04-17 12:05:39.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/binfmt_flat.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/binfmt_flat.c 2008-04-17 12:05:39.000000000 -0400
++++ a/fs/binfmt_flat.c 2008-04-19 15:14:52.000000000 -0400
@@ -35,6 +35,7 @@
#include <linux/init.h>
#include <linux/flat.h>
@@ -2103,8 +2103,8 @@
#include <asm/byteorder.h>
#include <asm/system.h>
---- linux-2.6.25.4/fs/binfmt_som.c 2008-04-17 12:05:39.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/binfmt_som.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/binfmt_som.c 2008-04-17 12:05:39.000000000 -0400
++++ a/fs/binfmt_som.c 2008-04-19 15:14:52.000000000 -0400
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
@@ -2113,8 +2113,8 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
---- linux-2.6.25.4/fs/block_dev.c 2008-04-17 12:05:39.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/block_dev.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/block_dev.c 2008-04-17 12:05:39.000000000 -0400
++++ a/fs/block_dev.c 2008-04-19 15:14:52.000000000 -0400
@@ -23,6 +23,7 @@
#include <linux/uio.h>
#include <linux/namei.h>
@@ -2152,8 +2152,8 @@
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
---- linux-2.6.25.4/fs/char_dev.c 2008-04-17 12:05:39.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/char_dev.c 2008-04-29 18:44:50.000000000 -0400
+--- a/fs/char_dev.c 2008-04-17 12:05:39.000000000 -0400
++++ a/fs/char_dev.c 2008-04-29 18:44:50.000000000 -0400
@@ -21,6 +21,8 @@
#include <linux/cdev.h>
#include <linux/mutex.h>
@@ -2186,8 +2186,8 @@
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
---- linux-2.6.25.4/fs/dcache.c 2008-04-17 12:05:39.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/dcache.c 2008-04-19 17:06:15.000000000 -0400
+--- a/fs/dcache.c 2008-04-17 12:05:39.000000000 -0400
++++ a/fs/dcache.c 2008-04-19 17:06:15.000000000 -0400
@@ -31,6 +31,7 @@
#include <linux/seqlock.h>
#include <linux/swap.h>
@@ -2247,8 +2247,8 @@
found = dentry;
}
spin_unlock(&dentry->d_lock);
---- linux-2.6.25.4/fs/devpts/inode.c 2008-04-17 12:05:39.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/devpts/inode.c 2008-04-21 09:23:34.000000000 -0400
+--- a/fs/devpts/inode.c 2008-04-17 12:05:39.000000000 -0400
++++ a/fs/devpts/inode.c 2008-04-21 09:23:34.000000000 -0400
@@ -17,15 +17,30 @@
#include <linux/namei.h>
#include <linux/mount.h>
@@ -2329,8 +2329,8 @@
inode->i_private = tty;
dentry = get_node(number);
---- linux-2.6.25.4/fs/ecryptfs/inode.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ecryptfs/inode.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ecryptfs/inode.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ecryptfs/inode.c 2008-04-19 15:14:52.000000000 -0400
@@ -400,7 +400,7 @@ static int ecryptfs_link(struct dentry *
dget(lower_new_dentry);
lower_dir_dentry = lock_parent(lower_new_dentry);
@@ -2385,8 +2385,8 @@
if (rc || !lower_dentry->d_inode)
goto out;
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
---- linux-2.6.25.4/fs/exec.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/exec.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/exec.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/exec.c 2008-04-19 15:14:52.000000000 -0400
@@ -249,7 +249,9 @@ static int __bprm_mm_init(struct linux_b
goto err;
}
@@ -2407,8 +2407,8 @@
rc = snprintf(out_ptr, out_end - out_ptr,
"%lu", tv.tv_sec);
if (rc > out_end - out_ptr)
---- linux-2.6.25.4/fs/ext2/balloc.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext2/balloc.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext2/balloc.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext2/balloc.c 2008-04-19 15:14:52.000000000 -0400
@@ -16,6 +16,8 @@
#include <linux/sched.h>
#include <linux/buffer_head.h>
@@ -2466,8 +2466,8 @@
brelse(bitmap_bh);
return 0;
}
---- linux-2.6.25.4/fs/ext2/ext2.h 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext2/ext2.h 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext2/ext2.h 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext2/ext2.h 2008-04-19 15:14:52.000000000 -0400
@@ -168,6 +168,7 @@ extern const struct file_operations ext2
extern const struct address_space_operations ext2_aops;
extern const struct address_space_operations ext2_aops_xip;
@@ -2476,16 +2476,16 @@
/* namei.c */
extern const struct inode_operations ext2_dir_inode_operations;
---- linux-2.6.25.4/fs/ext2/file.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext2/file.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext2/file.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext2/file.c 2008-04-19 15:14:52.000000000 -0400
@@ -86,4 +86,5 @@ const struct inode_operations ext2_file_
#endif
.setattr = ext2_setattr,
.permission = ext2_permission,
+ .sync_flags = ext2_sync_flags,
};
---- linux-2.6.25.4/fs/ext2/ialloc.c 2008-04-17 11:31:35.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext2/ialloc.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext2/ialloc.c 2008-04-17 11:31:35.000000000 -0400
++++ a/fs/ext2/ialloc.c 2008-04-19 15:14:52.000000000 -0400
@@ -17,6 +17,8 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2541,8 +2541,8 @@
make_bad_inode(inode);
iput(inode);
return ERR_PTR(err);
---- linux-2.6.25.4/fs/ext2/inode.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext2/inode.c 2008-04-21 10:14:57.000000000 -0400
+--- a/fs/ext2/inode.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext2/inode.c 2008-04-21 10:14:57.000000000 -0400
@@ -31,6 +31,7 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -2677,8 +2677,8 @@
error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0;
if (error)
return error;
---- linux-2.6.25.4/fs/ext2/ioctl.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext2/ioctl.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext2/ioctl.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext2/ioctl.c 2008-04-19 15:14:52.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/sched.h>
#include <linux/compat.h>
@@ -2718,8 +2718,8 @@
return -EROFS;
if (get_user(inode->i_generation, (int __user *) arg))
return -EFAULT;
---- linux-2.6.25.4/fs/ext2/namei.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext2/namei.c 2008-04-21 10:12:49.000000000 -0400
+--- a/fs/ext2/namei.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext2/namei.c 2008-04-21 10:12:49.000000000 -0400
@@ -31,6 +31,7 @@
*/
@@ -2750,8 +2750,8 @@
.permission = ext2_permission,
+ .sync_flags = ext2_sync_flags,
};
---- linux-2.6.25.4/fs/ext2/super.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext2/super.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext2/super.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext2/super.c 2008-04-19 15:14:52.000000000 -0400
@@ -390,7 +390,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -2816,8 +2816,8 @@
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
---- linux-2.6.25.4/fs/ext2/symlink.c 2008-04-17 10:32:27.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext2/symlink.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext2/symlink.c 2008-04-17 10:32:27.000000000 -0400
++++ a/fs/ext2/symlink.c 2008-04-19 15:14:52.000000000 -0400
@@ -38,6 +38,7 @@ const struct inode_operations ext2_symli
.listxattr = ext2_listxattr,
.removexattr = generic_removexattr,
@@ -2832,8 +2832,8 @@
#endif
+ .sync_flags = ext2_sync_flags,
};
---- linux-2.6.25.4/fs/ext2/xattr.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext2/xattr.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext2/xattr.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext2/xattr.c 2008-04-19 15:14:52.000000000 -0400
@@ -60,6 +60,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
@@ -2871,8 +2871,8 @@
DQUOT_FREE_BLOCK(inode, 1);
}
EXT2_I(inode)->i_file_acl = 0;
---- linux-2.6.25.4/fs/ext3/balloc.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext3/balloc.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext3/balloc.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext3/balloc.c 2008-04-19 15:14:52.000000000 -0400
@@ -19,6 +19,8 @@
#include <linux/ext3_jbd.h>
#include <linux/quotaops.h>
@@ -2979,8 +2979,8 @@
if (fatal) {
*errp = fatal;
ext3_std_error(sb, fatal);
---- linux-2.6.25.4/fs/ext3/file.c 2008-04-17 10:37:23.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext3/file.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext3/file.c 2008-04-17 10:37:23.000000000 -0400
++++ a/fs/ext3/file.c 2008-04-19 15:14:52.000000000 -0400
@@ -134,5 +134,6 @@ const struct inode_operations ext3_file_
.removexattr = generic_removexattr,
#endif
@@ -2988,8 +2988,8 @@
+ .sync_flags = ext3_sync_flags,
};
---- linux-2.6.25.4/fs/ext3/ialloc.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext3/ialloc.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext3/ialloc.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext3/ialloc.c 2008-04-19 15:14:52.000000000 -0400
@@ -23,6 +23,8 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
@@ -3047,8 +3047,8 @@
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
---- linux-2.6.25.4/fs/ext3/inode.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext3/inode.c 2008-04-20 13:25:49.000000000 -0400
+--- a/fs/ext3/inode.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext3/inode.c 2008-04-20 13:25:49.000000000 -0400
@@ -36,6 +36,7 @@
#include <linux/mpage.h>
#include <linux/uio.h>
@@ -3234,8 +3234,8 @@
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
---- linux-2.6.25.4/fs/ext3/ioctl.c 2008-04-17 11:31:35.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext3/ioctl.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext3/ioctl.c 2008-04-17 11:31:35.000000000 -0400
++++ a/fs/ext3/ioctl.c 2008-04-19 15:14:52.000000000 -0400
@@ -8,6 +8,7 @@
*/
@@ -3313,8 +3313,8 @@
return -EROFS;
if (copy_from_user(&input, (struct ext3_new_group_input __user *)arg,
---- linux-2.6.25.4/fs/ext3/namei.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext3/namei.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext3/namei.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext3/namei.c 2008-04-19 15:14:52.000000000 -0400
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3345,8 +3345,8 @@
.permission = ext3_permission,
+ .sync_flags = ext3_sync_flags,
};
---- linux-2.6.25.4/fs/ext3/super.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext3/super.c 2008-04-20 13:26:55.000000000 -0400
+--- a/fs/ext3/super.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext3/super.c 2008-04-20 13:26:55.000000000 -0400
@@ -756,7 +756,7 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
@@ -3410,8 +3410,8 @@
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
---- linux-2.6.25.4/fs/ext3/symlink.c 2008-04-17 10:32:27.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext3/symlink.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext3/symlink.c 2008-04-17 10:32:27.000000000 -0400
++++ a/fs/ext3/symlink.c 2008-04-19 15:14:52.000000000 -0400
@@ -40,6 +40,7 @@ const struct inode_operations ext3_symli
.listxattr = ext3_listxattr,
.removexattr = generic_removexattr,
@@ -3426,8 +3426,8 @@
#endif
+ .sync_flags = ext3_sync_flags,
};
---- linux-2.6.25.4/fs/ext3/xattr.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext3/xattr.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext3/xattr.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext3/xattr.c 2008-04-19 15:14:52.000000000 -0400
@@ -58,6 +58,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
@@ -3469,8 +3469,8 @@
goto cleanup;
bad_block:
---- linux-2.6.25.4/fs/ext4/balloc.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext4/balloc.c 2008-04-21 10:23:33.000000000 -0400
+--- a/fs/ext4/balloc.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext4/balloc.c 2008-04-21 10:23:33.000000000 -0400
@@ -19,6 +19,8 @@
#include <linux/ext4_jbd2.h>
#include <linux/quotaops.h>
@@ -3576,8 +3576,8 @@
if (fatal) {
*errp = fatal;
ext4_std_error(sb, fatal);
---- linux-2.6.25.4/fs/ext4/file.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext4/file.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext4/file.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext4/file.c 2008-04-19 15:14:52.000000000 -0400
@@ -152,5 +152,6 @@ const struct inode_operations ext4_file_
#endif
.permission = ext4_permission,
@@ -3585,8 +3585,8 @@
+ .sync_flags = ext4_sync_flags,
};
---- linux-2.6.25.4/fs/ext4/ialloc.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext4/ialloc.c 2008-04-21 10:29:28.000000000 -0400
+--- a/fs/ext4/ialloc.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext4/ialloc.c 2008-04-21 10:29:28.000000000 -0400
@@ -24,6 +24,8 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -3644,8 +3644,8 @@
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
---- linux-2.6.25.4/fs/ext4/inode.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext4/inode.c 2008-04-21 10:20:53.000000000 -0400
+--- a/fs/ext4/inode.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext4/inode.c 2008-04-21 10:20:53.000000000 -0400
@@ -36,6 +36,7 @@
#include <linux/mpage.h>
#include <linux/uio.h>
@@ -3832,8 +3832,8 @@
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
---- linux-2.6.25.4/fs/ext4/ioctl.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext4/ioctl.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext4/ioctl.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext4/ioctl.c 2008-04-19 15:14:52.000000000 -0400
@@ -8,6 +8,7 @@
*/
@@ -3911,8 +3911,8 @@
return -EROFS;
if (copy_from_user(&input, (struct ext4_new_group_input __user *)arg,
---- linux-2.6.25.4/fs/ext4/namei.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext4/namei.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext4/namei.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext4/namei.c 2008-04-19 15:14:52.000000000 -0400
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3943,8 +3943,8 @@
.permission = ext4_permission,
+ .sync_flags = ext4_sync_flags,
};
---- linux-2.6.25.4/fs/ext4/super.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext4/super.c 2008-04-21 10:31:22.000000000 -0400
+--- a/fs/ext4/super.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext4/super.c 2008-04-21 10:31:22.000000000 -0400
@@ -887,6 +887,7 @@ enum {
Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
Opt_grpquota, Opt_extents, Opt_noextents, Opt_i_version,
@@ -4010,8 +4010,8 @@
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
---- linux-2.6.25.4/fs/ext4/symlink.c 2008-04-17 10:32:27.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext4/symlink.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext4/symlink.c 2008-04-17 10:32:27.000000000 -0400
++++ a/fs/ext4/symlink.c 2008-04-19 15:14:52.000000000 -0400
@@ -40,6 +40,7 @@ const struct inode_operations ext4_symli
.listxattr = ext4_listxattr,
.removexattr = generic_removexattr,
@@ -4026,8 +4026,8 @@
#endif
+ .sync_flags = ext4_sync_flags,
};
---- linux-2.6.25.4/fs/ext4/xattr.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ext4/xattr.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ext4/xattr.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ext4/xattr.c 2008-04-19 15:14:52.000000000 -0400
@@ -58,6 +58,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
@@ -4069,8 +4069,8 @@
goto cleanup;
bad_block:
---- linux-2.6.25.4/fs/fcntl.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/fcntl.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/fcntl.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/fcntl.c 2008-04-19 15:14:52.000000000 -0400
@@ -19,6 +19,7 @@
#include <linux/signal.h>
#include <linux/rcupdate.h>
@@ -4106,8 +4106,8 @@
err = newfd;
out:
return err;
---- linux-2.6.25.4/fs/file_table.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/file_table.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/file_table.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/file_table.c 2008-04-19 15:14:52.000000000 -0400
@@ -20,6 +20,8 @@
#include <linux/fsnotify.h>
#include <linux/sysctl.h>
@@ -4144,8 +4144,8 @@
file_kill(file);
file_free(file);
}
---- linux-2.6.25.4/fs/hfsplus/ioctl.c 2008-04-17 10:37:23.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/hfsplus/ioctl.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/hfsplus/ioctl.c 2008-04-17 10:37:23.000000000 -0400
++++ a/fs/hfsplus/ioctl.c 2008-04-19 15:14:52.000000000 -0400
@@ -16,6 +16,7 @@
#include <linux/fs.h>
#include <linux/sched.h>
@@ -4164,8 +4164,8 @@
return -EROFS;
if (!is_owner_or_cap(inode))
---- linux-2.6.25.4/fs/inode.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/inode.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/inode.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/inode.c 2008-04-19 15:14:52.000000000 -0400
@@ -124,6 +124,9 @@ static struct inode *alloc_inode(struct
struct address_space * const mapping = &inode->i_data;
@@ -4205,8 +4205,8 @@
} else if (S_ISFIFO(mode))
inode->i_fop = &def_fifo_fops;
else if (S_ISSOCK(mode))
---- linux-2.6.25.4/fs/ioctl.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ioctl.c 2008-04-21 09:25:46.000000000 -0400
+--- a/fs/ioctl.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ioctl.c 2008-04-21 09:25:46.000000000 -0400
@@ -13,6 +13,9 @@
#include <linux/security.h>
#include <linux/module.h>
@@ -4217,8 +4217,8 @@
#include <asm/ioctls.h>
---- linux-2.6.25.4/fs/ioprio.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ioprio.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ioprio.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ioprio.c 2008-04-19 15:14:52.000000000 -0400
@@ -26,6 +26,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -4245,8 +4245,8 @@
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
---- linux-2.6.25.4/fs/jfs/acl.c 2007-02-04 13:44:54.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/acl.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/jfs/acl.c 2007-02-04 13:44:54.000000000 -0500
++++ a/fs/jfs/acl.c 2008-04-19 15:14:52.000000000 -0400
@@ -232,7 +232,8 @@ int jfs_setattr(struct dentry *dentry, s
return rc;
@@ -4257,8 +4257,8 @@
if (DQUOT_TRANSFER(inode, iattr))
return -EDQUOT;
}
---- linux-2.6.25.4/fs/jfs/file.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/file.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/jfs/file.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/jfs/file.c 2008-04-19 15:14:52.000000000 -0400
@@ -98,6 +98,7 @@ const struct inode_operations jfs_file_i
.setattr = jfs_setattr,
.permission = jfs_permission,
@@ -4267,8 +4267,8 @@
};
const struct file_operations jfs_file_operations = {
---- linux-2.6.25.4/fs/jfs/inode.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/inode.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/jfs/inode.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/jfs/inode.c 2008-04-19 15:14:52.000000000 -0400
@@ -22,6 +22,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
@@ -4285,8 +4285,8 @@
}
clear_inode(inode);
---- linux-2.6.25.4/fs/jfs/ioctl.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/ioctl.c 2008-04-21 09:25:22.000000000 -0400
+--- a/fs/jfs/ioctl.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/jfs/ioctl.c 2008-04-21 09:25:22.000000000 -0400
@@ -10,6 +10,7 @@
#include <linux/capability.h>
#include <linux/time.h>
@@ -4316,8 +4316,8 @@
if (!capable(CAP_LINUX_IMMUTABLE)) {
mutex_unlock(&inode->i_mutex);
return -EPERM;
---- linux-2.6.25.4/fs/jfs/jfs_dinode.h 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/jfs_dinode.h 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/jfs/jfs_dinode.h 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/jfs/jfs_dinode.h 2008-04-19 15:14:52.000000000 -0400
@@ -162,9 +162,12 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
#define JFS_IMMUTABLE_FL 0x02000000 /* Immutable file */
@@ -4333,8 +4333,8 @@
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
#define JFS_IOC_GETFLAGS _IOR('f', 1, long)
---- linux-2.6.25.4/fs/jfs/jfs_dtree.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/jfs_dtree.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/jfs/jfs_dtree.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/jfs/jfs_dtree.c 2008-04-19 15:14:52.000000000 -0400
@@ -102,6 +102,7 @@
#include <linux/fs.h>
@@ -4446,8 +4446,8 @@
/* Free quota allocation */
DQUOT_FREE_BLOCK(ip, xlen);
---- linux-2.6.25.4/fs/jfs/jfs_extent.c 2008-04-17 10:37:23.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/jfs_extent.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/jfs/jfs_extent.c 2008-04-17 10:37:23.000000000 -0400
++++ a/fs/jfs/jfs_extent.c 2008-04-19 15:14:52.000000000 -0400
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -4509,8 +4509,8 @@
DQUOT_FREE_BLOCK(ip, nxlen);
goto exit;
}
---- linux-2.6.25.4/fs/jfs/jfs_filsys.h 2008-04-17 10:37:23.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/jfs_filsys.h 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/jfs/jfs_filsys.h 2008-04-17 10:37:23.000000000 -0400
++++ a/fs/jfs/jfs_filsys.h 2008-04-19 15:14:52.000000000 -0400
@@ -263,6 +263,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -4519,8 +4519,8 @@
/*
* file system state (superblock state)
---- linux-2.6.25.4/fs/jfs/jfs_imap.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/jfs_imap.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/jfs/jfs_imap.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/jfs/jfs_imap.c 2008-04-19 15:14:52.000000000 -0400
@@ -45,6 +45,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
@@ -4580,8 +4580,8 @@
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
---- linux-2.6.25.4/fs/jfs/jfs_inode.c 2008-04-17 10:33:02.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/jfs_inode.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/jfs/jfs_inode.c 2008-04-17 10:33:02.000000000 -0400
++++ a/fs/jfs/jfs_inode.c 2008-04-19 15:14:52.000000000 -0400
@@ -18,6 +18,8 @@
#include <linux/fs.h>
@@ -4661,8 +4661,8 @@
DQUOT_DROP(inode);
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
---- linux-2.6.25.4/fs/jfs/jfs_inode.h 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/jfs_inode.h 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/jfs/jfs_inode.h 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/jfs/jfs_inode.h 2008-04-19 15:14:52.000000000 -0400
@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
int fh_len, int fh_type);
@@ -4671,8 +4671,8 @@
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern const struct address_space_operations jfs_aops;
---- linux-2.6.25.4/fs/jfs/jfs_xtree.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/jfs_xtree.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/jfs/jfs_xtree.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/jfs/jfs_xtree.c 2008-04-19 15:14:52.000000000 -0400
@@ -21,6 +21,7 @@
#include <linux/fs.h>
@@ -4756,8 +4756,8 @@
/* update quota allocation to reflect freed blocks */
DQUOT_FREE_BLOCK(ip, nfreed);
---- linux-2.6.25.4/fs/jfs/namei.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/namei.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/jfs/namei.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/jfs/namei.c 2008-04-19 15:14:52.000000000 -0400
@@ -21,6 +21,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -4782,8 +4782,8 @@
};
const struct file_operations jfs_dir_operations = {
---- linux-2.6.25.4/fs/jfs/super.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/super.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/jfs/super.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/jfs/super.c 2008-04-19 15:14:52.000000000 -0400
@@ -195,7 +195,8 @@ static void jfs_put_super(struct super_b
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
@@ -4850,8 +4850,8 @@
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
---- linux-2.6.25.4/fs/jfs/xattr.c 2008-04-17 10:37:23.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/jfs/xattr.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/jfs/xattr.c 2008-04-17 10:37:23.000000000 -0400
++++ a/fs/jfs/xattr.c 2008-04-19 15:14:52.000000000 -0400
@@ -23,6 +23,7 @@
#include <linux/posix_acl_xattr.h>
#include <linux/quotaops.h>
@@ -4929,8 +4929,8 @@
inode->i_ctime = CURRENT_TIME;
---- linux-2.6.25.4/fs/libfs.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/libfs.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/libfs.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/libfs.c 2008-04-19 15:14:52.000000000 -0400
@@ -125,7 +125,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -4977,8 +4977,8 @@
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(get_sb_pseudo);
EXPORT_SYMBOL(simple_write_begin);
---- linux-2.6.25.4/fs/locks.c 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/locks.c 2008-05-21 14:30:41.000000000 -0400
+--- a/fs/locks.c 2008-05-21 14:30:05.000000000 -0400
++++ a/fs/locks.c 2008-05-21 14:30:41.000000000 -0400
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
@@ -5164,8 +5164,8 @@
f->private++;
return 0;
---- linux-2.6.25.4/fs/namei.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/namei.c 2008-04-22 19:23:22.000000000 -0400
+--- a/fs/namei.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/namei.c 2008-04-22 19:23:22.000000000 -0400
@@ -30,6 +30,13 @@
#include <linux/capability.h>
#include <linux/file.h>
@@ -5787,8 +5787,8 @@
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
---- linux-2.6.25.4/fs/namespace.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/namespace.c 2008-04-21 17:20:53.000000000 -0400
+--- a/fs/namespace.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/namespace.c 2008-04-21 17:20:53.000000000 -0400
@@ -26,6 +26,11 @@
#include <linux/mount.h>
#include <linux/ramfs.h>
@@ -6123,8 +6123,8 @@
+ atomic_dec(&vs_global_mnt_ns);
kfree(ns);
}
---- linux-2.6.25.4/fs/nfs/client.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/nfs/client.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/nfs/client.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/nfs/client.c 2008-04-19 15:14:52.000000000 -0400
@@ -589,6 +589,9 @@ static int nfs_init_server_rpcclient(str
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
@@ -6146,8 +6146,8 @@
server->maxfilesize = fsinfo->maxfilesize;
/* We're airborne Set socket buffersize */
---- linux-2.6.25.4/fs/nfs/dir.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/nfs/dir.c 2008-04-21 16:52:03.000000000 -0400
+--- a/fs/nfs/dir.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/nfs/dir.c 2008-04-21 16:52:03.000000000 -0400
@@ -34,6 +34,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
@@ -6174,8 +6174,8 @@
return 0;
return 1;
}
---- linux-2.6.25.4/fs/nfs/inode.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/nfs/inode.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/nfs/inode.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/nfs/inode.c 2008-04-19 15:14:52.000000000 -0400
@@ -37,6 +37,7 @@
#include <linux/vfs.h>
#include <linux/inet.h>
@@ -6270,8 +6270,8 @@
if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
/*
---- linux-2.6.25.4/fs/nfs/nfs3xdr.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/nfs/nfs3xdr.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/nfs/nfs3xdr.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/nfs/nfs3xdr.c 2008-04-19 15:14:52.000000000 -0400
@@ -22,6 +22,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -6361,8 +6361,8 @@
if (args->type == NF3CHR || args->type == NF3BLK) {
*p++ = htonl(MAJOR(args->rdev));
*p++ = htonl(MINOR(args->rdev));
---- linux-2.6.25.4/fs/nfs/nfsroot.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/nfs/nfsroot.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/nfs/nfsroot.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/nfs/nfsroot.c 2008-04-19 15:14:52.000000000 -0400
@@ -119,12 +119,12 @@ static int mount_port __initdata = 0; /
enum {
/* Options that take integer arguments */
@@ -6409,8 +6409,8 @@
default:
printk(KERN_WARNING "Root-NFS: unknown "
"option: %s\n", p);
---- linux-2.6.25.4/fs/nfs/super.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/nfs/super.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/nfs/super.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/nfs/super.c 2008-04-19 15:14:52.000000000 -0400
@@ -50,6 +50,7 @@
#include <linux/nfs_xdr.h>
#include <linux/magic.h>
@@ -6427,8 +6427,8 @@
{ 0, NULL, NULL }
};
const struct proc_nfs_info *nfs_infop;
---- linux-2.6.25.4/fs/nfsd/auth.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/nfsd/auth.c 2008-04-19 17:07:41.000000000 -0400
+--- a/fs/nfsd/auth.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/nfsd/auth.c 2008-04-19 17:07:41.000000000 -0400
@@ -10,6 +10,7 @@
#include <linux/sunrpc/svcauth.h>
#include <linux/nfsd/nfsd.h>
@@ -6464,8 +6464,8 @@
current->cap_effective =
cap_drop_nfsd_set(current->cap_effective);
} else {
---- linux-2.6.25.4/fs/nfsd/nfs3xdr.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/nfsd/nfs3xdr.c 2008-04-19 17:08:09.000000000 -0400
+--- a/fs/nfsd/nfs3xdr.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/nfsd/nfs3xdr.c 2008-04-19 17:08:09.000000000 -0400
@@ -21,6 +21,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/nfsd/nfsd.h>
@@ -6516,8 +6516,8 @@
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
---- linux-2.6.25.4/fs/nfsd/nfs4recover.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/nfsd/nfs4recover.c 2008-04-20 13:24:11.000000000 -0400
+--- a/fs/nfsd/nfs4recover.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/nfsd/nfs4recover.c 2008-04-20 13:24:11.000000000 -0400
@@ -154,7 +154,7 @@ nfsd4_create_clid_dir(struct nfs4_client
dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n");
goto out_put;
@@ -6545,8 +6545,8 @@
mutex_unlock(&dir->d_inode->i_mutex);
return status;
}
---- linux-2.6.25.4/fs/nfsd/nfs4xdr.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/nfsd/nfs4xdr.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/nfsd/nfs4xdr.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/nfsd/nfs4xdr.c 2008-04-19 15:14:52.000000000 -0400
@@ -58,6 +58,7 @@
#include <linux/nfs4_acl.h>
#include <linux/sunrpc/gss_api.h>
@@ -6576,8 +6576,8 @@
if (status == nfserr_resource)
goto out_resource;
if (status)
---- linux-2.6.25.4/fs/nfsd/nfsxdr.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/nfsd/nfsxdr.c 2008-04-20 13:23:36.000000000 -0400
+--- a/fs/nfsd/nfsxdr.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/nfsd/nfsxdr.c 2008-04-20 13:23:36.000000000 -0400
@@ -15,6 +15,7 @@
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/xdr.h>
@@ -6626,8 +6626,8 @@
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
---- linux-2.6.25.4/fs/nfsd/vfs.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/nfsd/vfs.c 2008-04-21 17:24:34.000000000 -0400
+--- a/fs/nfsd/vfs.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/nfsd/vfs.c 2008-04-21 17:24:34.000000000 -0400
@@ -1258,13 +1258,13 @@ nfsd_create(struct svc_rqst *rqstp, stru
host_err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
break;
@@ -6691,8 +6691,8 @@
return nfserr_rofs;
if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode))
return nfserr_perm;
---- linux-2.6.25.4/fs/ocfs2/dlm/dlmfs.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ocfs2/dlm/dlmfs.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ocfs2/dlm/dlmfs.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ocfs2/dlm/dlmfs.c 2008-04-19 15:14:52.000000000 -0400
@@ -43,6 +43,7 @@
#include <linux/init.h>
#include <linux/string.h>
@@ -6717,8 +6717,8 @@
inode->i_blocks = 0;
inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
---- linux-2.6.25.4/fs/ocfs2/dlmglue.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ocfs2/dlmglue.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ocfs2/dlmglue.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ocfs2/dlmglue.c 2008-04-19 15:14:52.000000000 -0400
@@ -1665,6 +1665,7 @@ static void __ocfs2_stuff_meta_lvb(struc
lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
lvb->lvb_iuid = cpu_to_be32(inode->i_uid);
@@ -6735,8 +6735,8 @@
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
inode->i_nlink = be16_to_cpu(lvb->lvb_inlink);
ocfs2_unpack_timespec(&inode->i_atime,
---- linux-2.6.25.4/fs/ocfs2/dlmglue.h 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ocfs2/dlmglue.h 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ocfs2/dlmglue.h 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ocfs2/dlmglue.h 2008-04-19 15:14:52.000000000 -0400
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
@@ -6747,8 +6747,8 @@
};
/* ocfs2_inode_lock_full() 'arg_flags' flags */
---- linux-2.6.25.4/fs/ocfs2/file.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ocfs2/file.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ocfs2/file.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ocfs2/file.c 2008-04-19 15:14:52.000000000 -0400
@@ -1054,13 +1054,15 @@ int ocfs2_setattr(struct dentry *dentry,
mlog(0, "uid change: %d\n", attr->ia_uid);
if (attr->ia_valid & ATTR_GID)
@@ -6774,8 +6774,8 @@
.permission = ocfs2_permission,
};
---- linux-2.6.25.4/fs/ocfs2/inode.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ocfs2/inode.c 2008-04-21 10:16:08.000000000 -0400
+--- a/fs/ocfs2/inode.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ocfs2/inode.c 2008-04-21 10:16:08.000000000 -0400
@@ -28,6 +28,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -6897,8 +6897,8 @@
inode->i_mode = le16_to_cpu(fe->i_mode);
if (S_ISLNK(inode->i_mode) && le32_to_cpu(fe->i_clusters) == 0)
inode->i_blocks = 0;
---- linux-2.6.25.4/fs/ocfs2/inode.h 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ocfs2/inode.h 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ocfs2/inode.h 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ocfs2/inode.h 2008-04-19 15:14:52.000000000 -0400
@@ -143,6 +143,7 @@ int ocfs2_aio_write(struct file *file, s
void ocfs2_set_inode_flags(struct inode *inode);
@@ -6907,8 +6907,8 @@
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
---- linux-2.6.25.4/fs/ocfs2/ioctl.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ocfs2/ioctl.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ocfs2/ioctl.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ocfs2/ioctl.c 2008-04-19 15:14:52.000000000 -0400
@@ -41,7 +41,7 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
@@ -6918,8 +6918,8 @@
unsigned mask)
{
struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
---- linux-2.6.25.4/fs/ocfs2/ioctl.h 2008-04-17 10:33:02.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ocfs2/ioctl.h 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ocfs2/ioctl.h 2008-04-17 10:33:02.000000000 -0400
++++ a/fs/ocfs2/ioctl.h 2008-04-19 15:14:52.000000000 -0400
@@ -10,6 +10,9 @@
#ifndef OCFS2_IOCTL_H
#define OCFS2_IOCTL_H
@@ -6930,8 +6930,8 @@
int ocfs2_ioctl(struct inode * inode, struct file * filp,
unsigned int cmd, unsigned long arg);
long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg);
---- linux-2.6.25.4/fs/ocfs2/namei.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ocfs2/namei.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ocfs2/namei.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ocfs2/namei.c 2008-04-19 15:14:52.000000000 -0400
@@ -40,6 +40,7 @@
#include <linux/types.h>
#include <linux/slab.h>
@@ -6980,8 +6980,8 @@
+ .sync_flags = ocfs2_sync_flags,
.permission = ocfs2_permission,
};
---- linux-2.6.25.4/fs/ocfs2/ocfs2_fs.h 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ocfs2/ocfs2_fs.h 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/ocfs2/ocfs2_fs.h 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ocfs2/ocfs2_fs.h 2008-04-19 15:14:52.000000000 -0400
@@ -188,8 +188,12 @@
#define OCFS2_NOATIME_FL (0x00000080) /* do not update atime */
#define OCFS2_DIRSYNC_FL (0x00010000) /* dirsync behaviour (directories only) */
@@ -6995,8 +6995,8 @@
/*
* Extent record flags (e_node.leaf.flags)
---- linux-2.6.25.4/fs/ocfs2/ocfs2.h 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ocfs2/ocfs2.h 2008-04-21 10:15:31.000000000 -0400
+--- a/fs/ocfs2/ocfs2.h 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ocfs2/ocfs2.h 2008-04-21 10:15:31.000000000 -0400
@@ -171,6 +171,7 @@ enum ocfs2_mount_options
OCFS2_MOUNT_ERRORS_PANIC = 1 << 3, /* Panic on errors */
OCFS2_MOUNT_DATA_WRITEBACK = 1 << 4, /* No data ordering */
@@ -7005,8 +7005,8 @@
};
#define OCFS2_OSB_SOFT_RO 0x0001
---- linux-2.6.25.4/fs/ocfs2/super.c 2008-04-17 12:05:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/ocfs2/super.c 2008-04-23 08:31:10.000000000 -0400
+--- a/fs/ocfs2/super.c 2008-04-17 12:05:40.000000000 -0400
++++ a/fs/ocfs2/super.c 2008-04-23 08:31:10.000000000 -0400
@@ -154,6 +154,7 @@ enum {
Opt_commit,
Opt_localalloc,
@@ -7070,8 +7070,8 @@
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
---- linux-2.6.25.4/fs/open.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/open.c 2008-04-21 13:51:52.000000000 -0400
+--- a/fs/open.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/open.c 2008-04-21 13:51:52.000000000 -0400
@@ -27,22 +27,31 @@
#include <linux/rcupdate.h>
#include <linux/audit.h>
@@ -7246,8 +7246,8 @@
}
void put_unused_fd(unsigned int fd)
---- linux-2.6.25.4/fs/proc/array.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/proc/array.c 2008-05-21 14:08:19.000000000 -0400
+--- a/fs/proc/array.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/proc/array.c 2008-05-21 14:08:19.000000000 -0400
@@ -79,6 +79,8 @@
#include <linux/delayacct.h>
#include <linux/seq_file.h>
@@ -7391,8 +7391,8 @@
seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \
%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n",
---- linux-2.6.25.4/fs/proc/base.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/proc/base.c 2008-05-21 14:08:19.000000000 -0400
+--- a/fs/proc/base.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/proc/base.c 2008-05-21 14:08:19.000000000 -0400
@@ -76,6 +76,8 @@
#include <linux/oom.h>
#include <linux/elf.h>
@@ -7506,8 +7506,8 @@
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
---- linux-2.6.25.4/fs/proc/generic.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/proc/generic.c 2008-04-20 14:23:26.000000000 -0400
+--- a/fs/proc/generic.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/proc/generic.c 2008-04-20 14:23:26.000000000 -0400
@@ -21,6 +21,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -7569,8 +7569,8 @@
} else {
kfree(ent);
ent = NULL;
---- linux-2.6.25.4/fs/proc/inode.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/proc/inode.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/proc/inode.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/proc/inode.c 2008-04-19 15:14:52.000000000 -0400
@@ -408,6 +408,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -7580,8 +7580,8 @@
if (de->size)
inode->i_size = de->size;
if (de->nlink)
---- linux-2.6.25.4/fs/proc/internal.h 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/proc/internal.h 2008-05-21 14:08:19.000000000 -0400
+--- a/fs/proc/internal.h 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/proc/internal.h 2008-05-21 14:08:19.000000000 -0400
@@ -10,6 +10,7 @@
*/
@@ -7618,8 +7618,8 @@
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
---- linux-2.6.25.4/fs/proc/proc_misc.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/proc/proc_misc.c 2008-04-23 11:56:24.000000000 -0400
+--- a/fs/proc/proc_misc.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/proc/proc_misc.c 2008-04-23 11:56:24.000000000 -0400
@@ -56,6 +56,8 @@
#include <asm/div64.h>
#include "internal.h"
@@ -7691,8 +7691,8 @@
cached = 0;
get_vmalloc_info(&vmi);
---- linux-2.6.25.4/fs/proc/root.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/proc/root.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/proc/root.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/proc/root.c 2008-04-19 15:14:52.000000000 -0400
@@ -23,6 +23,9 @@
#include "internal.h"
@@ -7711,8 +7711,8 @@
proc_sys_init();
}
---- linux-2.6.25.4/fs/quota.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/quota.c 2008-04-21 09:21:04.000000000 -0400
+--- a/fs/quota.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/quota.c 2008-04-21 09:21:04.000000000 -0400
@@ -18,6 +18,7 @@
#include <linux/capability.h>
#include <linux/quotaops.h>
@@ -7818,8 +7818,8 @@
sb = get_super(bdev);
bdput(bdev);
if (!sb)
---- linux-2.6.25.4/fs/reiserfs/bitmap.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/reiserfs/bitmap.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/reiserfs/bitmap.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/reiserfs/bitmap.c 2008-04-19 15:14:52.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/reiserfs_fs_sb.h>
#include <linux/reiserfs_fs_i.h>
@@ -7912,16 +7912,16 @@
}
return CARRY_ON;
---- linux-2.6.25.4/fs/reiserfs/file.c 2008-04-17 11:31:38.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/reiserfs/file.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/reiserfs/file.c 2008-04-17 11:31:38.000000000 -0400
++++ a/fs/reiserfs/file.c 2008-04-19 15:14:52.000000000 -0400
@@ -306,4 +306,5 @@ const struct inode_operations reiserfs_f
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
.permission = reiserfs_permission,
+ .sync_flags = reiserfs_sync_flags,
};
---- linux-2.6.25.4/fs/reiserfs/inode.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/reiserfs/inode.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/reiserfs/inode.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/reiserfs/inode.c 2008-04-19 15:14:52.000000000 -0400
@@ -18,6 +18,8 @@
#include <linux/writeback.h>
#include <linux/quotaops.h>
@@ -8105,8 +8105,8 @@
mark_inode_dirty(inode);
error =
journal_end(&th, inode->i_sb, jbegin_count);
---- linux-2.6.25.4/fs/reiserfs/ioctl.c 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/reiserfs/ioctl.c 2008-05-21 14:30:41.000000000 -0400
+--- a/fs/reiserfs/ioctl.c 2008-05-21 14:30:05.000000000 -0400
++++ a/fs/reiserfs/ioctl.c 2008-05-21 14:30:41.000000000 -0400
@@ -6,6 +6,7 @@
#include <linux/fs.h>
#include <linux/reiserfs_fs.h>
@@ -8161,8 +8161,8 @@
return -EROFS;
if (get_user(inode->i_generation, (int __user *)arg))
return -EFAULT;
---- linux-2.6.25.4/fs/reiserfs/namei.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/reiserfs/namei.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/reiserfs/namei.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/reiserfs/namei.c 2008-04-19 15:14:52.000000000 -0400
@@ -17,6 +17,7 @@
#include <linux/reiserfs_acl.h>
#include <linux/reiserfs_xattr.h>
@@ -8210,8 +8210,8 @@
+ .sync_flags = reiserfs_sync_flags,
};
---- linux-2.6.25.4/fs/reiserfs/stree.c 2008-04-17 11:31:38.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/reiserfs/stree.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/reiserfs/stree.c 2008-04-17 11:31:38.000000000 -0400
++++ a/fs/reiserfs/stree.c 2008-04-19 15:14:52.000000000 -0400
@@ -55,6 +55,7 @@
#include <linux/reiserfs_fs.h>
#include <linux/buffer_head.h>
@@ -8287,8 +8287,8 @@
+ }
return retval;
}
---- linux-2.6.25.4/fs/reiserfs/super.c 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/reiserfs/super.c 2008-05-21 14:30:41.000000000 -0400
+--- a/fs/reiserfs/super.c 2008-05-21 14:30:05.000000000 -0400
++++ a/fs/reiserfs/super.c 2008-05-21 14:30:41.000000000 -0400
@@ -896,6 +896,14 @@ static int reiserfs_parse_options(struct
{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
@@ -8328,8 +8328,8 @@
rs = SB_DISK_SUPER_BLOCK(s);
/* Let's do basic sanity check to verify that underlying device is not
smaller than the filesystem. If the check fails then abort and scream,
---- linux-2.6.25.4/fs/reiserfs/xattr.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/reiserfs/xattr.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/reiserfs/xattr.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/reiserfs/xattr.c 2008-04-19 15:14:52.000000000 -0400
@@ -35,6 +35,7 @@
#include <linux/namei.h>
#include <linux/errno.h>
@@ -8347,8 +8347,8 @@
reiserfs_write_unlock_xattrs(inode->i_sb);
dput(root);
} else {
---- linux-2.6.25.4/fs/stat.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/stat.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/stat.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/stat.c 2008-04-19 15:14:52.000000000 -0400
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -8357,8 +8357,8 @@
stat->rdev = inode->i_rdev;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
---- linux-2.6.25.4/fs/super.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/super.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/super.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/super.c 2008-04-19 15:14:52.000000000 -0400
@@ -37,6 +37,9 @@
#include <linux/idr.h>
#include <linux/kobject.h>
@@ -8404,8 +8404,8 @@
if (error)
goto out_sb;
---- linux-2.6.25.4/fs/sysfs/mount.c 2008-04-17 11:31:38.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/sysfs/mount.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/sysfs/mount.c 2008-04-17 11:31:38.000000000 -0400
++++ a/fs/sysfs/mount.c 2008-04-19 15:14:52.000000000 -0400
@@ -19,8 +19,6 @@
#include "sysfs.h"
@@ -8424,8 +8424,8 @@
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
sysfs_sb = sb;
---- linux-2.6.25.4/fs/utimes.c 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/utimes.c 2008-05-21 14:30:41.000000000 -0400
+--- a/fs/utimes.c 2008-05-21 14:30:05.000000000 -0400
++++ a/fs/utimes.c 2008-05-21 14:30:41.000000000 -0400
@@ -7,6 +7,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -8445,8 +8445,8 @@
dentry = nd.path.dentry;
}
---- linux-2.6.25.4/fs/xattr.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xattr.c 2008-04-21 13:52:50.000000000 -0400
+--- a/fs/xattr.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/xattr.c 2008-04-21 13:52:50.000000000 -0400
@@ -17,6 +17,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
@@ -8547,8 +8547,8 @@
fput(f);
return error;
}
---- linux-2.6.25.4/fs/xfs/linux-2.6/xfs_ioctl.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/linux-2.6/xfs_ioctl.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/xfs/linux-2.6/xfs_ioctl.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/xfs/linux-2.6/xfs_ioctl.c 2008-04-19 15:14:52.000000000 -0400
@@ -1125,7 +1125,8 @@ xfs_merge_ioc_xflags(
STATIC unsigned int
@@ -8580,8 +8580,8 @@
if (copy_to_user(arg, &flags, sizeof(flags)))
error = -EFAULT;
break;
---- linux-2.6.25.4/fs/xfs/linux-2.6/xfs_iops.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/linux-2.6/xfs_iops.c 2008-04-19 17:01:15.000000000 -0400
+--- a/fs/xfs/linux-2.6/xfs_iops.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/xfs/linux-2.6/xfs_iops.c 2008-04-19 17:01:15.000000000 -0400
@@ -53,6 +53,7 @@
#include <linux/namei.h>
#include <linux/security.h>
@@ -8678,8 +8678,8 @@
.removexattr = xfs_vn_removexattr,
+ .sync_flags = xfs_vn_sync_flags,
};
---- linux-2.6.25.4/fs/xfs/linux-2.6/xfs_linux.h 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/linux-2.6/xfs_linux.h 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/xfs/linux-2.6/xfs_linux.h 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/xfs/linux-2.6/xfs_linux.h 2008-04-19 15:14:52.000000000 -0400
@@ -128,6 +128,7 @@
#define current_pid() (current->pid)
#define current_fsuid(cred) (current->fsuid)
@@ -8688,8 +8688,8 @@
#define current_test_flags(f) (current->flags & (f))
#define current_set_flags_nested(sp, f) \
(*(sp) = current->flags, current->flags |= (f))
---- linux-2.6.25.4/fs/xfs/linux-2.6/xfs_super.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/linux-2.6/xfs_super.c 2008-04-26 09:51:47.000000000 -0400
+--- a/fs/xfs/linux-2.6/xfs_super.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/xfs/linux-2.6/xfs_super.c 2008-04-26 09:51:47.000000000 -0400
@@ -137,6 +137,9 @@ xfs_args_allocate(
#define MNTOPT_DMAPI "dmapi" /* DMI enabled (DMAPI / XDSM) */
#define MNTOPT_XDSM "xdsm" /* DMI enabled (DMAPI / XDSM) */
@@ -8775,8 +8775,8 @@
sb->s_dirt = 1;
sb->s_magic = XFS_SB_MAGIC;
sb->s_blocksize = mp->m_sb.sb_blocksize;
---- linux-2.6.25.4/fs/xfs/linux-2.6/xfs_vnode.c 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/linux-2.6/xfs_vnode.c 2008-04-19 17:04:58.000000000 -0400
+--- a/fs/xfs/linux-2.6/xfs_vnode.c 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/xfs/linux-2.6/xfs_vnode.c 2008-04-19 17:04:58.000000000 -0400
@@ -105,6 +105,7 @@ vn_revalidate(
inode->i_mode = ip->i_d.di_mode;
inode->i_uid = ip->i_d.di_uid;
@@ -8800,8 +8800,8 @@
if (xflags & XFS_XFLAG_APPEND)
inode->i_flags |= S_APPEND;
else
---- linux-2.6.25.4/fs/xfs/linux-2.6/xfs_vnode.h 2008-04-17 12:05:41.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/linux-2.6/xfs_vnode.h 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/xfs/linux-2.6/xfs_vnode.h 2008-04-17 12:05:41.000000000 -0400
++++ a/fs/xfs/linux-2.6/xfs_vnode.h 2008-04-19 15:14:52.000000000 -0400
@@ -99,6 +99,7 @@ typedef struct bhv_vattr {
xfs_nlink_t va_nlink; /* number of references to file */
uid_t va_uid; /* owner user id */
@@ -8827,8 +8827,8 @@
#define XFS_AT_STAT (XFS_AT_TYPE|XFS_AT_MODE|XFS_AT_UID|XFS_AT_GID|\
XFS_AT_FSID|XFS_AT_NODEID|XFS_AT_NLINK|XFS_AT_SIZE|\
---- linux-2.6.25.4/fs/xfs/quota/xfs_qm_syscalls.c 2008-04-17 12:05:42.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/quota/xfs_qm_syscalls.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/xfs/quota/xfs_qm_syscalls.c 2008-04-17 12:05:42.000000000 -0400
++++ a/fs/xfs/quota/xfs_qm_syscalls.c 2008-04-19 15:14:52.000000000 -0400
@@ -17,6 +17,7 @@
*/
@@ -8873,8 +8873,8 @@
return XFS_ERROR(EPERM);
if ((newlim->d_fieldmask &
---- linux-2.6.25.4/fs/xfs/xfs_clnt.h 2008-04-17 12:05:42.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/xfs_clnt.h 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/xfs/xfs_clnt.h 2008-04-17 12:05:42.000000000 -0400
++++ a/fs/xfs/xfs_clnt.h 2008-04-19 15:14:52.000000000 -0400
@@ -100,5 +100,6 @@ struct xfs_mount_args {
* I/O size in stat(2) */
#define XFSMNT2_FILESTREAMS 0x00000002 /* enable the filestreams
@@ -8882,8 +8882,8 @@
+#define XFSMNT2_TAGGED 0x80000000 /* context tagging */
#endif /* __XFS_CLNT_H__ */
---- linux-2.6.25.4/fs/xfs/xfs_dinode.h 2008-04-17 12:05:42.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/xfs_dinode.h 2008-04-27 10:33:37.000000000 -0400
+--- a/fs/xfs/xfs_dinode.h 2008-04-17 12:05:42.000000000 -0400
++++ a/fs/xfs/xfs_dinode.h 2008-04-27 10:33:37.000000000 -0400
@@ -53,7 +53,9 @@ typedef struct xfs_dinode_core {
__be32 di_gid; /* owner's group id */
__be32 di_nlink; /* number of links to file */
@@ -8922,8 +8922,8 @@
+#define XFS_DIVFLAG_IUNLINK 0x02
+
#endif /* __XFS_DINODE_H__ */
---- linux-2.6.25.4/fs/xfs/xfs_fs.h 2008-04-17 12:05:42.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/xfs_fs.h 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/xfs/xfs_fs.h 2008-04-17 12:05:42.000000000 -0400
++++ a/fs/xfs/xfs_fs.h 2008-04-19 15:14:52.000000000 -0400
@@ -67,6 +67,8 @@ struct fsxattr {
#define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
#define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
@@ -8943,8 +8943,8 @@
__u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */
---- linux-2.6.25.4/fs/xfs/xfs_ialloc.c 2008-04-17 12:05:42.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/xfs_ialloc.c 2008-04-27 10:30:39.000000000 -0400
+--- a/fs/xfs/xfs_ialloc.c 2008-04-17 12:05:42.000000000 -0400
++++ a/fs/xfs/xfs_ialloc.c 2008-04-27 10:30:39.000000000 -0400
@@ -66,6 +66,8 @@ xfs_ialloc_log_di(
offsetof(xfs_dinode_core_t, di_gid),
offsetof(xfs_dinode_core_t, di_nlink),
@@ -8954,8 +8954,8 @@
offsetof(xfs_dinode_core_t, di_pad),
offsetof(xfs_dinode_core_t, di_atime),
offsetof(xfs_dinode_core_t, di_mtime),
---- linux-2.6.25.4/fs/xfs/xfs_inode.c 2008-04-17 12:05:42.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/xfs_inode.c 2008-04-26 11:06:34.000000000 -0400
+--- a/fs/xfs/xfs_inode.c 2008-04-17 12:05:42.000000000 -0400
++++ a/fs/xfs/xfs_inode.c 2008-04-26 11:06:34.000000000 -0400
@@ -219,6 +219,7 @@ xfs_inotobp(
return 0;
}
@@ -9049,8 +9049,8 @@
ip->i_d.di_projid = prid;
memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
---- linux-2.6.25.4/fs/xfs/xfs_inode.h 2008-04-17 12:05:42.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/xfs_inode.h 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/xfs/xfs_inode.h 2008-04-17 12:05:42.000000000 -0400
++++ a/fs/xfs/xfs_inode.h 2008-04-19 15:14:52.000000000 -0400
@@ -187,7 +187,9 @@ typedef struct xfs_icdinode {
__uint32_t di_gid; /* owner's group id */
__uint32_t di_nlink; /* number of links to file */
@@ -9062,8 +9062,8 @@
__uint16_t di_flushiter; /* incremented on flush */
xfs_ictimestamp_t di_atime; /* time last accessed */
xfs_ictimestamp_t di_mtime; /* time last modified */
---- linux-2.6.25.4/fs/xfs/xfs_itable.c 2008-04-17 12:05:42.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/xfs_itable.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/xfs/xfs_itable.c 2008-04-17 12:05:42.000000000 -0400
++++ a/fs/xfs/xfs_itable.c 2008-04-19 15:14:52.000000000 -0400
@@ -89,6 +89,7 @@ xfs_bulkstat_one_iget(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
@@ -9072,8 +9072,8 @@
buf->bs_size = dic->di_size;
vn_atime_to_bstime(vp, &buf->bs_atime);
buf->bs_mtime.tv_sec = dic->di_mtime.t_sec;
---- linux-2.6.25.4/fs/xfs/xfs_mount.h 2008-04-17 12:05:43.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/xfs_mount.h 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/xfs/xfs_mount.h 2008-04-17 12:05:43.000000000 -0400
++++ a/fs/xfs/xfs_mount.h 2008-04-19 15:14:52.000000000 -0400
@@ -378,6 +378,7 @@ typedef struct xfs_mount {
#define XFS_MOUNT_FILESTREAMS (1ULL << 24) /* enable the filestreams
allocator */
@@ -9082,8 +9082,8 @@
/*
* Default minimum read and write sizes.
---- linux-2.6.25.4/fs/xfs/xfs_vfsops.c 2008-04-17 12:05:43.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/xfs_vfsops.c 2008-04-26 09:52:49.000000000 -0400
+--- a/fs/xfs/xfs_vfsops.c 2008-04-17 12:05:43.000000000 -0400
++++ a/fs/xfs/xfs_vfsops.c 2008-04-26 09:52:49.000000000 -0400
@@ -290,6 +290,8 @@ xfs_start_flags(
if (ap->flags2 & XFSMNT2_COMPAT_IOSIZE)
@@ -9101,8 +9101,8 @@
return 0;
}
---- linux-2.6.25.4/fs/xfs/xfs_vnodeops.c 2008-04-17 12:05:43.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/fs/xfs/xfs_vnodeops.c 2008-04-19 15:14:52.000000000 -0400
+--- a/fs/xfs/xfs_vnodeops.c 2008-04-17 12:05:43.000000000 -0400
++++ a/fs/xfs/xfs_vnodeops.c 2008-04-19 15:14:52.000000000 -0400
@@ -122,6 +122,7 @@ xfs_getattr(
vap->va_mode = ip->i_d.di_mode;
vap->va_uid = ip->i_d.di_uid;
@@ -9207,8 +9207,8 @@
}
xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
timeflags |= XFS_ICHGTIME_CHG;
---- linux-2.6.25.4/include/asm-arm/tlb.h 2008-04-17 12:05:43.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/asm-arm/tlb.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/asm-arm/tlb.h 2008-04-17 12:05:43.000000000 -0400
++++ a/include/asm-arm/tlb.h 2008-04-19 15:14:52.000000000 -0400
@@ -28,6 +28,7 @@
#else /* !CONFIG_MMU */
@@ -9217,8 +9217,8 @@
/*
* TLB handling. This allows us to remove pages from the page
---- linux-2.6.25.4/include/asm-blackfin/unistd.h 2008-04-17 12:05:43.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/asm-blackfin/unistd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/asm-blackfin/unistd.h 2008-04-17 12:05:43.000000000 -0400
++++ a/include/asm-blackfin/unistd.h 2008-04-19 15:14:52.000000000 -0400
@@ -278,7 +278,7 @@
#define __NR_tgkill 271
#define __NR_utimes 272
@@ -9228,8 +9228,8 @@
/* 275 __NR_mbind */
/* 276 __NR_get_mempolicy */
/* 277 __NR_set_mempolicy */
---- linux-2.6.25.4/include/asm-generic/tlb.h 2008-04-17 12:05:43.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/asm-generic/tlb.h 2008-04-19 15:50:15.000000000 -0400
+--- a/include/asm-generic/tlb.h 2008-04-17 12:05:43.000000000 -0400
++++ a/include/asm-generic/tlb.h 2008-04-19 15:50:15.000000000 -0400
@@ -14,6 +14,7 @@
#define _ASM_GENERIC__TLB_H
@@ -9238,8 +9238,8 @@
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
---- linux-2.6.25.4/include/asm-ia64/tlb.h 2007-02-04 13:44:54.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/asm-ia64/tlb.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/asm-ia64/tlb.h 2007-02-04 13:44:54.000000000 -0500
++++ a/include/asm-ia64/tlb.h 2008-04-19 15:14:52.000000000 -0400
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -9248,8 +9248,8 @@
#include <asm/pgalloc.h>
#include <asm/processor.h>
---- linux-2.6.25.4/include/asm-powerpc/systbl.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/asm-powerpc/systbl.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/asm-powerpc/systbl.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/asm-powerpc/systbl.h 2008-04-19 15:14:52.000000000 -0400
@@ -260,7 +260,7 @@ COMPAT_SYS_SPU(fstatfs64)
SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64)
PPC_SYS_SPU(rtas)
@@ -9259,8 +9259,8 @@
COMPAT_SYS(migrate_pages)
COMPAT_SYS(mbind)
COMPAT_SYS(get_mempolicy)
---- linux-2.6.25.4/include/asm-powerpc/unistd.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/asm-powerpc/unistd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/asm-powerpc/unistd.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/asm-powerpc/unistd.h 2008-04-19 15:14:52.000000000 -0400
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -9270,8 +9270,8 @@
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
---- linux-2.6.25.4/include/asm-s390/unistd.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/asm-s390/unistd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/asm-s390/unistd.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/asm-s390/unistd.h 2008-04-19 15:14:52.000000000 -0400
@@ -202,7 +202,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
@@ -9281,8 +9281,8 @@
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
---- linux-2.6.25.4/include/asm-sparc/unistd.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/asm-sparc/unistd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/asm-sparc/unistd.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/asm-sparc/unistd.h 2008-04-19 15:14:52.000000000 -0400
@@ -282,7 +282,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -9292,8 +9292,8 @@
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
---- linux-2.6.25.4/include/asm-sparc64/tlb.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/asm-sparc64/tlb.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/asm-sparc64/tlb.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/asm-sparc64/tlb.h 2008-04-19 15:14:52.000000000 -0400
@@ -3,6 +3,7 @@
#include <linux/swap.h>
@@ -9302,8 +9302,8 @@
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
---- linux-2.6.25.4/include/asm-sparc64/unistd.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/asm-sparc64/unistd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/asm-sparc64/unistd.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/asm-sparc64/unistd.h 2008-04-19 15:14:52.000000000 -0400
@@ -284,7 +284,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -9313,8 +9313,8 @@
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
---- linux-2.6.25.4/include/asm-x86/unistd_64.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/asm-x86/unistd_64.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/asm-x86/unistd_64.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/asm-x86/unistd_64.h 2008-04-19 15:14:52.000000000 -0400
@@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
#define __NR_utimes 235
__SYSCALL(__NR_utimes, sys_utimes)
@@ -9324,8 +9324,8 @@
#define __NR_mbind 237
__SYSCALL(__NR_mbind, sys_mbind)
#define __NR_set_mempolicy 238
---- linux-2.6.25.4/include/linux/capability.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/capability.h 2008-04-22 11:01:12.000000000 -0400
+--- a/include/linux/capability.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/capability.h 2008-04-22 11:01:12.000000000 -0400
@@ -260,6 +260,7 @@ typedef struct kernel_cap_struct {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
@@ -9349,16 +9349,16 @@
#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
---- linux-2.6.25.4/include/linux/devpts_fs.h 2007-02-04 13:44:54.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/devpts_fs.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/devpts_fs.h 2007-02-04 13:44:54.000000000 -0500
++++ a/include/linux/devpts_fs.h 2008-04-19 15:14:52.000000000 -0400
@@ -30,5 +30,4 @@ static inline void devpts_pty_kill(int n
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
---- linux-2.6.25.4/include/linux/ext2_fs.h 2008-04-17 11:31:39.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/ext2_fs.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/ext2_fs.h 2008-04-17 11:31:39.000000000 -0400
++++ a/include/linux/ext2_fs.h 2008-04-19 15:14:52.000000000 -0400
@@ -189,6 +189,8 @@ struct ext2_group_desc
#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
@@ -9393,8 +9393,8 @@
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
---- linux-2.6.25.4/include/linux/ext3_fs.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/ext3_fs.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/ext3_fs.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/ext3_fs.h 2008-04-19 15:14:52.000000000 -0400
@@ -173,6 +173,8 @@ struct ext3_group_desc
#define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
@@ -9437,8 +9437,8 @@
extern struct inode *ext3_iget(struct super_block *, unsigned long);
extern int ext3_write_inode (struct inode *, int);
---- linux-2.6.25.4/include/linux/ext4_fs.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/ext4_fs.h 2008-04-19 15:43:04.000000000 -0400
+--- a/include/linux/ext4_fs.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/ext4_fs.h 2008-04-19 15:43:04.000000000 -0400
@@ -231,6 +231,8 @@ struct ext4_group_desc
#define EXT4_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
#define EXT4_HUGE_FILE_FL 0x00040000 /* Set to each huge file */
@@ -9482,8 +9482,8 @@
extern struct inode *ext4_iget(struct super_block *, unsigned long);
extern int ext4_write_inode (struct inode *, int);
---- linux-2.6.25.4/include/linux/fs.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/fs.h 2008-04-19 15:37:28.000000000 -0400
+--- a/include/linux/fs.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/fs.h 2008-04-19 15:37:28.000000000 -0400
@@ -125,6 +125,8 @@ extern int dir_notify_enable;
#define MS_RELATIME (1<<21) /* Update atime relative to mtime/ctime. */
#define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
@@ -9668,8 +9668,8 @@
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
extern int simple_link(struct dentry *, struct inode *, struct dentry *);
---- linux-2.6.25.4/include/linux/if_tun.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/if_tun.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/if_tun.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/if_tun.h 2008-04-19 15:14:52.000000000 -0400
@@ -42,6 +42,7 @@
#define TUNSETOWNER _IOW('T', 204, int)
#define TUNSETLINK _IOW('T', 205, int)
@@ -9678,8 +9678,8 @@
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
---- linux-2.6.25.4/include/linux/init_task.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/init_task.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/init_task.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/init_task.h 2008-04-19 15:14:52.000000000 -0400
@@ -196,6 +196,10 @@ extern struct group_info init_groups;
INIT_IDS \
INIT_TRACE_IRQFLAGS \
@@ -9691,8 +9691,8 @@
}
---- linux-2.6.25.4/include/linux/interrupt.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/interrupt.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/interrupt.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/interrupt.h 2008-04-19 15:14:52.000000000 -0400
@@ -8,8 +8,8 @@
#include <linux/preempt.h>
#include <linux/cpumask.h>
@@ -9703,8 +9703,8 @@
#include <linux/irqflags.h>
#include <asm/atomic.h>
#include <asm/ptrace.h>
---- linux-2.6.25.4/include/linux/ipc.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/ipc.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/ipc.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/ipc.h 2008-04-19 15:14:52.000000000 -0400
@@ -93,6 +93,7 @@ struct kern_ipc_perm
key_t key;
uid_t uid;
@@ -9713,8 +9713,8 @@
uid_t cuid;
gid_t cgid;
mode_t mode;
---- linux-2.6.25.4/include/linux/Kbuild 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/Kbuild 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/Kbuild 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/Kbuild 2008-04-19 15:14:52.000000000 -0400
@@ -354,3 +354,6 @@ unifdef-y += xattr.h
unifdef-y += xfrm.h
@@ -9722,8 +9722,8 @@
+
+header-y += vserver/
+
---- linux-2.6.25.4/include/linux/loop.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/loop.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/loop.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/loop.h 2008-04-19 15:14:52.000000000 -0400
@@ -45,6 +45,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -9732,8 +9732,8 @@
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
---- linux-2.6.25.4/include/linux/magic.h 2008-04-17 11:31:39.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/magic.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/magic.h 2008-04-17 11:31:39.000000000 -0400
++++ a/include/linux/magic.h 2008-04-19 15:14:52.000000000 -0400
@@ -3,7 +3,7 @@
#define ADFS_SUPER_MAGIC 0xadf5
@@ -9751,8 +9751,8 @@
#define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */
#define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */
---- linux-2.6.25.4/include/linux/major.h 2008-04-17 10:37:24.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/major.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/major.h 2008-04-17 10:37:24.000000000 -0400
++++ a/include/linux/major.h 2008-04-19 15:14:52.000000000 -0400
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
@@ -9761,8 +9761,8 @@
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
---- linux-2.6.25.4/include/linux/mm_types.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/mm_types.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/mm_types.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/mm_types.h 2008-04-19 15:14:52.000000000 -0400
@@ -201,6 +201,7 @@ struct mm_struct {
/* Architecture-specific MM context */
@@ -9771,8 +9771,8 @@
/* Swap token stuff */
/*
---- linux-2.6.25.4/include/linux/mount.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/mount.h 2008-04-19 15:45:19.000000000 -0400
+--- a/include/linux/mount.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/mount.h 2008-04-19 15:45:19.000000000 -0400
@@ -28,6 +28,9 @@ struct mnt_namespace;
#define MNT_NOATIME 0x08
#define MNT_NODIRATIME 0x10
@@ -9802,8 +9802,8 @@
};
static inline struct vfsmount *mntget(struct vfsmount *mnt)
---- linux-2.6.25.4/include/linux/net.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/net.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/net.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/net.h 2008-04-19 15:14:52.000000000 -0400
@@ -65,6 +65,7 @@ typedef enum {
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
@@ -9812,8 +9812,8 @@
#ifndef ARCH_HAS_SOCKET_TYPES
/**
---- linux-2.6.25.4/include/linux/nfs_mount.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/nfs_mount.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/nfs_mount.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/nfs_mount.h 2008-04-19 15:14:52.000000000 -0400
@@ -63,6 +63,7 @@ struct nfs_mount_data {
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
@@ -9823,8 +9823,8 @@
+#define NFS_MOUNT_FLAGMASK 0x1FFFF
#endif
---- linux-2.6.25.4/include/linux/nsproxy.h 2008-04-17 11:31:39.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/nsproxy.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/nsproxy.h 2008-04-17 11:31:39.000000000 -0400
++++ a/include/linux/nsproxy.h 2008-04-19 15:14:52.000000000 -0400
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -9873,8 +9873,8 @@
}
#ifdef CONFIG_CGROUP_NS
---- linux-2.6.25.4/include/linux/pid.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/pid.h 2008-04-29 17:56:00.000000000 -0400
+--- a/include/linux/pid.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/pid.h 2008-04-29 17:56:00.000000000 -0400
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
@@ -9893,8 +9893,8 @@
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
---- linux-2.6.25.4/include/linux/proc_fs.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/proc_fs.h 2008-04-19 15:44:54.000000000 -0400
+--- a/include/linux/proc_fs.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/proc_fs.h 2008-04-19 15:44:54.000000000 -0400
@@ -59,6 +59,7 @@ struct proc_dir_entry {
nlink_t nlink;
uid_t uid;
@@ -9927,8 +9927,8 @@
int fd;
union proc_op op;
struct proc_dir_entry *pde;
---- linux-2.6.25.4/include/linux/reiserfs_fs.h 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/reiserfs_fs.h 2008-05-21 14:30:41.000000000 -0400
+--- a/include/linux/reiserfs_fs.h 2008-05-21 14:30:05.000000000 -0400
++++ a/include/linux/reiserfs_fs.h 2008-05-21 14:30:41.000000000 -0400
@@ -837,6 +837,10 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL FS_COMPR_FL
#define REISERFS_NOTAIL_FL FS_NOTAIL_FL
@@ -9958,8 +9958,8 @@
/* namei.c */
void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
---- linux-2.6.25.4/include/linux/reiserfs_fs_sb.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/reiserfs_fs_sb.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/reiserfs_fs_sb.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/reiserfs_fs_sb.h 2008-04-19 15:14:52.000000000 -0400
@@ -456,6 +456,7 @@ enum reiserfs_mount_options {
REISERFS_POSIXACL,
REISERFS_BARRIER_NONE,
@@ -9968,8 +9968,8 @@
/* Actions on error */
REISERFS_ERROR_PANIC,
---- linux-2.6.25.4/include/linux/sched.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/sched.h 2008-04-21 11:09:01.000000000 -0400
+--- a/include/linux/sched.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/sched.h 2008-04-21 11:09:01.000000000 -0400
@@ -73,7 +73,6 @@ struct sched_param {
#include <linux/fs_struct.h>
#include <linux/compiler.h>
@@ -10069,8 +10069,8 @@
}
---- linux-2.6.25.4/include/linux/shmem_fs.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/shmem_fs.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/shmem_fs.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/shmem_fs.h 2008-04-19 15:14:52.000000000 -0400
@@ -8,6 +8,9 @@
#define SHMEM_NR_DIRECT 16
@@ -10081,8 +10081,8 @@
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
---- linux-2.6.25.4/include/linux/stat.h 2008-04-17 10:33:07.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/stat.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/stat.h 2008-04-17 10:33:07.000000000 -0400
++++ a/include/linux/stat.h 2008-04-19 15:14:52.000000000 -0400
@@ -66,6 +66,7 @@ struct kstat {
unsigned int nlink;
uid_t uid;
@@ -10091,8 +10091,8 @@
dev_t rdev;
loff_t size;
struct timespec atime;
---- linux-2.6.25.4/include/linux/sunrpc/auth.h 2008-04-17 10:37:24.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/sunrpc/auth.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/sunrpc/auth.h 2008-04-17 10:37:24.000000000 -0400
++++ a/include/linux/sunrpc/auth.h 2008-04-19 15:14:52.000000000 -0400
@@ -25,6 +25,7 @@
struct auth_cred {
uid_t uid;
@@ -10101,8 +10101,8 @@
struct group_info *group_info;
};
---- linux-2.6.25.4/include/linux/sunrpc/clnt.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/sunrpc/clnt.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/sunrpc/clnt.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/sunrpc/clnt.h 2008-04-19 15:14:52.000000000 -0400
@@ -42,7 +42,8 @@ struct rpc_clnt {
unsigned int cl_softrtry : 1,/* soft timeouts */
@@ -10113,8 +10113,8 @@
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
---- linux-2.6.25.4/include/linux/syscalls.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/syscalls.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/syscalls.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/syscalls.h 2008-04-19 15:14:52.000000000 -0400
@@ -294,6 +294,8 @@ asmlinkage long sys_symlink(const char _
asmlinkage long sys_unlink(const char __user *pathname);
asmlinkage long sys_rename(const char __user *oldname,
@@ -10124,8 +10124,8 @@
asmlinkage long sys_chmod(const char __user *filename, mode_t mode);
asmlinkage long sys_fchmod(unsigned int fd, mode_t mode);
---- linux-2.6.25.4/include/linux/sysctl.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/sysctl.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/sysctl.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/sysctl.h 2008-04-19 15:14:52.000000000 -0400
@@ -70,6 +70,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
@@ -10142,8 +10142,8 @@
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
---- linux-2.6.25.4/include/linux/sysfs.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/sysfs.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/sysfs.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/sysfs.h 2008-04-19 15:14:52.000000000 -0400
@@ -17,6 +17,8 @@
#include <linux/list.h>
#include <asm/atomic.h>
@@ -10153,8 +10153,8 @@
struct kobject;
struct module;
---- linux-2.6.25.4/include/linux/time.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/time.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/time.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/time.h 2008-04-19 15:14:52.000000000 -0400
@@ -183,6 +183,9 @@ static inline void timespec_add_ns(struc
}
a->tv_nsec = ns;
@@ -10165,8 +10165,8 @@
#endif /* __KERNEL__ */
#define NFDBITS __NFDBITS
---- linux-2.6.25.4/include/linux/types.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/types.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/types.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/linux/types.h 2008-04-19 15:14:52.000000000 -0400
@@ -36,6 +36,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -10177,8 +10177,8 @@
typedef unsigned long uintptr_t;
---- linux-2.6.25.4/include/linux/vroot.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vroot.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vroot.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vroot.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,51 @@
+
+/*
@@ -10231,8 +10231,8 @@
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
---- linux-2.6.25.4/include/linux/vs_base.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_base.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vs_base.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_base.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -10244,8 +10244,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vs_context.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_context.h 2008-04-29 18:42:09.000000000 -0400
+--- a/include/linux/vs_context.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_context.h 2008-04-29 18:42:09.000000000 -0400
@@ -0,0 +1,227 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -10474,8 +10474,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vs_cowbl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_cowbl.h 2008-04-21 13:49:51.000000000 -0400
+--- a/include/linux/vs_cowbl.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_cowbl.h 2008-04-21 13:49:51.000000000 -0400
@@ -0,0 +1,44 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -10521,8 +10521,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vs_cvirt.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_cvirt.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vs_cvirt.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_cvirt.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -10574,8 +10574,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vs_device.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_device.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vs_device.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_device.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
@@ -10622,8 +10622,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vs_dlimit.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_dlimit.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vs_dlimit.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_dlimit.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,211 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
@@ -10836,8 +10836,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vserver/base.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/base.h 2008-04-23 20:52:31.000000000 -0400
+--- a/include/linux/vserver/base.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/base.h 2008-04-23 20:52:31.000000000 -0400
@@ -0,0 +1,157 @@
+#ifndef _VX_BASE_H
+#define _VX_BASE_H
@@ -10996,8 +10996,8 @@
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
---- linux-2.6.25.4/include/linux/vserver/cacct_cmd.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/cacct_cmd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/cacct_cmd.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/cacct_cmd.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,23 @@
+#ifndef _VX_CACCT_CMD_H
+#define _VX_CACCT_CMD_H
@@ -11022,8 +11022,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_CMD_H */
---- linux-2.6.25.4/include/linux/vserver/cacct_def.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/cacct_def.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/cacct_def.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/cacct_def.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,43 @@
+#ifndef _VX_CACCT_DEF_H
+#define _VX_CACCT_DEF_H
@@ -11068,8 +11068,8 @@
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
---- linux-2.6.25.4/include/linux/vserver/cacct.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/cacct.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/cacct.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/cacct.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,15 @@
+#ifndef _VX_CACCT_H
+#define _VX_CACCT_H
@@ -11086,8 +11086,8 @@
+};
+
+#endif /* _VX_CACCT_H */
---- linux-2.6.25.4/include/linux/vserver/cacct_int.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/cacct_int.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/cacct_int.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/cacct_int.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,21 @@
+#ifndef _VX_CACCT_INT_H
+#define _VX_CACCT_INT_H
@@ -11110,8 +11110,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_INT_H */
---- linux-2.6.25.4/include/linux/vserver/check.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/check.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/check.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/check.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,89 @@
+#ifndef _VS_CHECK_H
+#define _VS_CHECK_H
@@ -11202,8 +11202,8 @@
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
---- linux-2.6.25.4/include/linux/vserver/context_cmd.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/context_cmd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/context_cmd.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/context_cmd.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,128 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
@@ -11333,8 +11333,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
---- linux-2.6.25.4/include/linux/vserver/context.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/context.h 2008-04-22 15:14:28.000000000 -0400
+--- a/include/linux/vserver/context.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/context.h 2008-04-22 15:14:28.000000000 -0400
@@ -0,0 +1,176 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
@@ -11512,8 +11512,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
---- linux-2.6.25.4/include/linux/vserver/cvirt_cmd.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/cvirt_cmd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/cvirt_cmd.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/cvirt_cmd.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,53 @@
+#ifndef _VX_CVIRT_CMD_H
+#define _VX_CVIRT_CMD_H
@@ -11568,8 +11568,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
---- linux-2.6.25.4/include/linux/vserver/cvirt_def.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/cvirt_def.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/cvirt_def.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/cvirt_def.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,80 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
@@ -11651,8 +11651,8 @@
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
---- linux-2.6.25.4/include/linux/vserver/cvirt.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/cvirt.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/cvirt.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/cvirt.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,20 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
@@ -11674,8 +11674,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
---- linux-2.6.25.4/include/linux/vserver/debug_cmd.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/debug_cmd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/debug_cmd.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/debug_cmd.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,58 @@
+#ifndef _VX_DEBUG_CMD_H
+#define _VX_DEBUG_CMD_H
@@ -11735,8 +11735,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
---- linux-2.6.25.4/include/linux/vserver/debug.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/debug.h 2008-04-21 13:55:14.000000000 -0400
+--- a/include/linux/vserver/debug.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/debug.h 2008-04-21 13:55:14.000000000 -0400
@@ -0,0 +1,130 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
@@ -11868,8 +11868,8 @@
+
+
+#endif /* _VX_DEBUG_H */
---- linux-2.6.25.4/include/linux/vserver/device_cmd.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/device_cmd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/device_cmd.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/device_cmd.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,44 @@
+#ifndef _VX_DEVICE_CMD_H
+#define _VX_DEVICE_CMD_H
@@ -11915,8 +11915,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEVICE_CMD_H */
---- linux-2.6.25.4/include/linux/vserver/device_def.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/device_def.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/device_def.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/device_def.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,17 @@
+#ifndef _VX_DEVICE_DEF_H
+#define _VX_DEVICE_DEF_H
@@ -11935,8 +11935,8 @@
+};
+
+#endif /* _VX_DEVICE_DEF_H */
---- linux-2.6.25.4/include/linux/vserver/device.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/device.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/device.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/device.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,15 @@
+#ifndef _VX_DEVICE_H
+#define _VX_DEVICE_H
@@ -11953,8 +11953,8 @@
+#else /* _VX_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VX_DEVICE_H */
---- linux-2.6.25.4/include/linux/vserver/dlimit_cmd.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/dlimit_cmd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/dlimit_cmd.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/dlimit_cmd.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,74 @@
+#ifndef _VX_DLIMIT_CMD_H
+#define _VX_DLIMIT_CMD_H
@@ -12030,8 +12030,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
---- linux-2.6.25.4/include/linux/vserver/dlimit.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/dlimit.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/dlimit.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/dlimit.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,54 @@
+#ifndef _VX_DLIMIT_H
+#define _VX_DLIMIT_H
@@ -12087,8 +12087,8 @@
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
---- linux-2.6.25.4/include/linux/vserver/global.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/global.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/global.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/global.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,20 @@
+#ifndef _VX_GLOBAL_H
+#define _VX_GLOBAL_H
@@ -12110,8 +12110,8 @@
+
+
+#endif /* _VX_GLOBAL_H */
---- linux-2.6.25.4/include/linux/vserver/history.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/history.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/history.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/history.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,197 @@
+#ifndef _VX_HISTORY_H
+#define _VX_HISTORY_H
@@ -12310,8 +12310,8 @@
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
---- linux-2.6.25.4/include/linux/vserver/inode_cmd.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/inode_cmd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/inode_cmd.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/inode_cmd.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,59 @@
+#ifndef _VX_INODE_CMD_H
+#define _VX_INODE_CMD_H
@@ -12372,8 +12372,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
---- linux-2.6.25.4/include/linux/vserver/inode.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/inode.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/inode.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/inode.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,38 @@
+#ifndef _VX_INODE_H
+#define _VX_INODE_H
@@ -12413,8 +12413,8 @@
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
---- linux-2.6.25.4/include/linux/vserver/Kbuild 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/Kbuild 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/Kbuild 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/Kbuild 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,8 @@
+
+unifdef-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -12424,8 +12424,8 @@
+
+unifdef-y += switch.h network.h monitor.h inode.h device.h
+
---- linux-2.6.25.4/include/linux/vserver/limit_cmd.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/limit_cmd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/limit_cmd.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/limit_cmd.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,69 @@
+#ifndef _VX_LIMIT_CMD_H
+#define _VX_LIMIT_CMD_H
@@ -12496,8 +12496,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
---- linux-2.6.25.4/include/linux/vserver/limit_def.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/limit_def.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/limit_def.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/limit_def.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,47 @@
+#ifndef _VX_LIMIT_DEF_H
+#define _VX_LIMIT_DEF_H
@@ -12546,8 +12546,8 @@
+#endif
+
+#endif /* _VX_LIMIT_DEF_H */
---- linux-2.6.25.4/include/linux/vserver/limit.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/limit.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/limit.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/limit.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,70 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
@@ -12619,8 +12619,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
---- linux-2.6.25.4/include/linux/vserver/limit_int.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/limit_int.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/limit_int.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/limit_int.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,198 @@
+#ifndef _VX_LIMIT_INT_H
+#define _VX_LIMIT_INT_H
@@ -12820,8 +12820,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_INT_H */
---- linux-2.6.25.4/include/linux/vserver/monitor.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/monitor.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/monitor.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/monitor.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,96 @@
+#ifndef _VX_MONITOR_H
+#define _VX_MONITOR_H
@@ -12919,8 +12919,8 @@
+
+
+#endif /* _VX_MONITOR_H */
---- linux-2.6.25.4/include/linux/vserver/network_cmd.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/network_cmd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/network_cmd.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/network_cmd.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,150 @@
+#ifndef _VX_NETWORK_CMD_H
+#define _VX_NETWORK_CMD_H
@@ -13072,8 +13072,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
---- linux-2.6.25.4/include/linux/vserver/network.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/network.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/network.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/network.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,146 @@
+#ifndef _VX_NETWORK_H
+#define _VX_NETWORK_H
@@ -13221,8 +13221,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NETWORK_H */
---- linux-2.6.25.4/include/linux/vserver/percpu.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/percpu.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/percpu.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/percpu.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,14 @@
+#ifndef _VX_PERCPU_H
+#define _VX_PERCPU_H
@@ -13238,8 +13238,8 @@
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VX_PERCPU_H */
---- linux-2.6.25.4/include/linux/vserver/pid.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/pid.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/pid.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/pid.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
@@ -13292,8 +13292,8 @@
+}
+
+#endif
---- linux-2.6.25.4/include/linux/vserver/sched_cmd.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/sched_cmd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/sched_cmd.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/sched_cmd.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,108 @@
+#ifndef _VX_SCHED_CMD_H
+#define _VX_SCHED_CMD_H
@@ -13403,8 +13403,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
---- linux-2.6.25.4/include/linux/vserver/sched_def.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/sched_def.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/sched_def.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/sched_def.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,68 @@
+#ifndef _VX_SCHED_DEF_H
+#define _VX_SCHED_DEF_H
@@ -13474,8 +13474,8 @@
+#endif
+
+#endif /* _VX_SCHED_DEF_H */
---- linux-2.6.25.4/include/linux/vserver/sched.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/sched.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/sched.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/sched.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,26 @@
+#ifndef _VX_SCHED_H
+#define _VX_SCHED_H
@@ -13503,8 +13503,8 @@
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
---- linux-2.6.25.4/include/linux/vserver/signal_cmd.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/signal_cmd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/signal_cmd.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/signal_cmd.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,43 @@
+#ifndef _VX_SIGNAL_CMD_H
+#define _VX_SIGNAL_CMD_H
@@ -13549,8 +13549,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
---- linux-2.6.25.4/include/linux/vserver/signal.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/signal.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/signal.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/signal.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,14 @@
+#ifndef _VX_SIGNAL_H
+#define _VX_SIGNAL_H
@@ -13566,8 +13566,8 @@
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
---- linux-2.6.25.4/include/linux/vserver/space_cmd.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/space_cmd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/space_cmd.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/space_cmd.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,26 @@
+#ifndef _VX_SPACE_CMD_H
+#define _VX_SPACE_CMD_H
@@ -13595,8 +13595,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SPACE_CMD_H */
---- linux-2.6.25.4/include/linux/vserver/space.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/space.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/space.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/space.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,13 @@
+#ifndef _VX_SPACE_H
+#define _VX_SPACE_H
@@ -13611,8 +13611,8 @@
+#else /* _VX_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_SPACE_H */
---- linux-2.6.25.4/include/linux/vserver/switch.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/switch.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/switch.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/switch.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,99 @@
+#ifndef _VX_SWITCH_H
+#define _VX_SWITCH_H
@@ -13713,8 +13713,8 @@
+#endif /* __KERNEL__ */
+
+#endif /* _VX_SWITCH_H */
---- linux-2.6.25.4/include/linux/vserver/tag_cmd.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/tag_cmd.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vserver/tag_cmd.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/tag_cmd.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,22 @@
+#ifndef _VX_TAG_CMD_H
+#define _VX_TAG_CMD_H
@@ -13738,8 +13738,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_TAG_CMD_H */
---- linux-2.6.25.4/include/linux/vserver/tag.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vserver/tag.h 2008-04-21 13:53:47.000000000 -0400
+--- a/include/linux/vserver/tag.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vserver/tag.h 2008-04-21 13:53:47.000000000 -0400
@@ -0,0 +1,143 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
@@ -13884,8 +13884,8 @@
+#endif
+
+#endif /* _DX_TAG_H */
---- linux-2.6.25.4/include/linux/vs_inet6.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_inet6.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vs_inet6.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_inet6.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,229 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
@@ -14116,8 +14116,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vs_inet.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_inet.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vs_inet.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_inet.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,342 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
@@ -14461,8 +14461,8 @@
+#else
+// #warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vs_limit.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_limit.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vs_limit.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_limit.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
@@ -14604,8 +14604,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vs_memory.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_memory.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vs_memory.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_memory.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,159 @@
+#ifndef _VS_MEMORY_H
+#define _VS_MEMORY_H
@@ -14766,8 +14766,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vs_network.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_network.h 2008-04-29 18:42:49.000000000 -0400
+--- a/include/linux/vs_network.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_network.h 2008-04-29 18:42:49.000000000 -0400
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
@@ -14938,8 +14938,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vs_pid.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_pid.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vs_pid.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_pid.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,95 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
@@ -15036,8 +15036,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vs_sched.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_sched.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vs_sched.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_sched.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,110 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
@@ -15149,8 +15149,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vs_socket.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_socket.h 2008-04-23 14:32:00.000000000 -0400
+--- a/include/linux/vs_socket.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_socket.h 2008-04-23 14:32:00.000000000 -0400
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
@@ -15219,8 +15219,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vs_tag.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_tag.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vs_tag.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_tag.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,43 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
@@ -15265,8 +15265,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/linux/vs_time.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/linux/vs_time.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/linux/vs_time.h 1969-12-31 19:00:00.000000000 -0500
++++ a/include/linux/vs_time.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
@@ -15287,8 +15287,8 @@
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.25.4/include/net/addrconf.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/net/addrconf.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/net/addrconf.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/net/addrconf.h 2008-04-19 15:14:52.000000000 -0400
@@ -75,10 +75,12 @@ extern struct inet6_ifaddr *ipv6_ge
extern int ipv6_get_saddr(struct dst_entry *dst,
@@ -15304,8 +15304,8 @@
extern int ipv6_get_lladdr(struct net_device *dev,
struct in6_addr *addr,
unsigned char banned_flags);
---- linux-2.6.25.4/include/net/af_unix.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/net/af_unix.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/net/af_unix.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/net/af_unix.h 2008-04-19 15:14:52.000000000 -0400
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
@@ -15314,8 +15314,8 @@
#include <net/sock.h>
extern void unix_inflight(struct file *fp);
---- linux-2.6.25.4/include/net/inet_sock.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/net/inet_sock.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/net/inet_sock.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/net/inet_sock.h 2008-04-19 15:14:52.000000000 -0400
@@ -24,7 +24,7 @@
#include <net/flow.h>
#include <net/sock.h>
@@ -15335,8 +15335,8 @@
-}
-
#endif /* _INET_SOCK_H */
---- linux-2.6.25.4/include/net/inet_timewait_sock.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/net/inet_timewait_sock.h 2008-04-19 15:25:34.000000000 -0400
+--- a/include/net/inet_timewait_sock.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/net/inet_timewait_sock.h 2008-04-19 15:25:34.000000000 -0400
@@ -15,15 +15,14 @@
#ifndef _INET_TIMEWAIT_SOCK_
#define _INET_TIMEWAIT_SOCK_
@@ -15366,8 +15366,8 @@
int tw_timeout;
volatile unsigned char tw_substate;
/* 3 bits hole, try to pack */
---- linux-2.6.25.4/include/net/route.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/net/route.h 2008-04-21 12:39:35.000000000 -0400
+--- a/include/net/route.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/net/route.h 2008-04-21 12:39:35.000000000 -0400
@@ -34,7 +34,7 @@
#include <linux/ip.h>
#include <linux/cache.h>
@@ -15432,8 +15432,8 @@
err = __ip_route_output_key(net, rp, &fl);
if (err)
return err;
---- linux-2.6.25.4/include/net/sock.h 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/include/net/sock.h 2008-04-19 15:14:52.000000000 -0400
+--- a/include/net/sock.h 2008-04-17 12:05:44.000000000 -0400
++++ a/include/net/sock.h 2008-04-19 15:14:52.000000000 -0400
@@ -123,6 +123,10 @@ struct sock_common {
unsigned int skc_hash;
struct proto *skc_prot;
@@ -15456,8 +15456,8 @@
unsigned char sk_shutdown : 2,
sk_no_check : 2,
sk_userlocks : 4;
---- linux-2.6.25.4/init/main.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/init/main.c 2008-04-21 10:46:10.000000000 -0400
+--- a/init/main.c 2008-04-17 12:05:44.000000000 -0400
++++ a/init/main.c 2008-04-21 10:46:10.000000000 -0400
@@ -58,6 +58,7 @@
#include <linux/kthread.h>
#include <linux/sched.h>
@@ -15483,8 +15483,8 @@
ptr = alloc_bootmem_pages(size * nr_possible_cpus);
for_each_possible_cpu(i) {
---- linux-2.6.25.4/ipc/mqueue.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/ipc/mqueue.c 2008-04-19 15:14:52.000000000 -0400
+--- a/ipc/mqueue.c 2008-04-17 12:05:44.000000000 -0400
++++ a/ipc/mqueue.c 2008-04-19 15:14:52.000000000 -0400
@@ -31,6 +31,8 @@
#include <linux/mutex.h>
#include <linux/nsproxy.h>
@@ -15570,8 +15570,8 @@
out_err:
dput(dentry);
---- linux-2.6.25.4/ipc/msg.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/ipc/msg.c 2008-04-21 10:41:47.000000000 -0400
+--- a/ipc/msg.c 2008-04-17 12:05:44.000000000 -0400
++++ a/ipc/msg.c 2008-04-21 10:41:47.000000000 -0400
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -15588,8 +15588,8 @@
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
---- linux-2.6.25.4/ipc/namespace.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/ipc/namespace.c 2008-04-21 10:44:58.000000000 -0400
+--- a/ipc/namespace.c 2008-04-17 12:05:44.000000000 -0400
++++ a/ipc/namespace.c 2008-04-21 10:44:58.000000000 -0400
@@ -9,6 +9,8 @@
#include <linux/rcupdate.h>
#include <linux/nsproxy.h>
@@ -15614,8 +15614,8 @@
+ atomic_dec(&vs_global_ipc_ns);
kfree(ns);
}
---- linux-2.6.25.4/ipc/sem.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/ipc/sem.c 2008-04-21 10:45:22.000000000 -0400
+--- a/ipc/sem.c 2008-04-17 12:05:44.000000000 -0400
++++ a/ipc/sem.c 2008-04-21 10:45:22.000000000 -0400
@@ -83,6 +83,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -15643,8 +15643,8 @@
sma->sem_perm.id = sem_buildid(id, sma->sem_perm.seq);
sma->sem_base = (struct sem *) &sma[1];
---- linux-2.6.25.4/ipc/shm.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/ipc/shm.c 2008-04-21 10:45:38.000000000 -0400
+--- a/ipc/shm.c 2008-04-17 12:05:44.000000000 -0400
++++ a/ipc/shm.c 2008-04-21 10:45:38.000000000 -0400
@@ -39,6 +39,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
@@ -15700,8 +15700,8 @@
return error;
no_id:
---- linux-2.6.25.4/kernel/capability.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/capability.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/capability.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/capability.c 2008-04-19 15:14:52.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -15732,8 +15732,8 @@
return __capable(current, cap);
}
EXPORT_SYMBOL(capable);
---- linux-2.6.25.4/kernel/cgroup.c 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/cgroup.c 2008-05-21 14:30:41.000000000 -0400
+--- a/kernel/cgroup.c 2008-05-21 14:30:05.000000000 -0400
++++ a/kernel/cgroup.c 2008-05-21 14:30:41.000000000 -0400
@@ -2833,7 +2833,7 @@ int cgroup_clone(struct task_struct *tsk
}
@@ -15743,8 +15743,8 @@
child = __d_cgrp(dentry);
dput(dentry);
if (ret) {
---- linux-2.6.25.4/kernel/compat.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/compat.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/compat.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/compat.c 2008-04-19 15:14:52.000000000 -0400
@@ -846,7 +846,7 @@ asmlinkage long compat_sys_time(compat_t
compat_time_t i;
struct timeval tv;
@@ -15763,8 +15763,8 @@
return 0;
}
---- linux-2.6.25.4/kernel/exit.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/exit.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/exit.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/exit.c 2008-04-19 15:14:52.000000000 -0400
@@ -44,6 +44,11 @@
#include <linux/resource.h>
#include <linux/blkdev.h>
@@ -15800,8 +15800,8 @@
preempt_disable();
/* causes final put_task_struct in finish_task_switch(). */
tsk->state = TASK_DEAD;
---- linux-2.6.25.4/kernel/fork.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/fork.c 2008-04-21 11:09:01.000000000 -0400
+--- a/kernel/fork.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/fork.c 2008-04-21 11:09:01.000000000 -0400
@@ -53,6 +53,11 @@
#include <linux/tty.h>
#include <linux/proc_fs.h>
@@ -15969,8 +15969,8 @@
bad_fork_free:
free_task(p);
fork_out:
---- linux-2.6.25.4/kernel/kthread.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/kthread.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/kthread.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/kthread.c 2008-04-19 15:14:52.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/file.h>
#include <linux/module.h>
@@ -15988,8 +15988,8 @@
read_unlock(&tasklist_lock);
/*
* root may have changed our (kthreadd's) priority or CPU mask.
---- linux-2.6.25.4/kernel/Makefile 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/Makefile 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/Makefile 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/Makefile 2008-04-19 15:14:52.000000000 -0400
@@ -11,6 +11,8 @@ obj-y = sched.o fork.o exec_domain.o
hrtimer.o rwsem.o nsproxy.o srcu.o \
notifier.o ksysfs.o pm_qos_params.o
@@ -15999,8 +15999,8 @@
obj-$(CONFIG_SYSCTL) += sysctl_check.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-y += time/
---- linux-2.6.25.4/kernel/nsproxy.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/nsproxy.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/nsproxy.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/nsproxy.c 2008-04-19 15:14:52.000000000 -0400
@@ -20,6 +20,8 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
@@ -16162,8 +16162,8 @@
if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC |
CLONE_NEWUSER | CLONE_NEWNET)))
return 0;
---- linux-2.6.25.4/kernel/pid.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/pid.c 2008-04-29 17:56:00.000000000 -0400
+--- a/kernel/pid.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/pid.c 2008-04-29 17:56:00.000000000 -0400
@@ -35,6 +35,8 @@
#include <linux/pid_namespace.h>
#include <linux/init_task.h>
@@ -16230,8 +16230,8 @@
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, current->nsproxy->pid_ns);
---- linux-2.6.25.4/kernel/pid_namespace.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/pid_namespace.c 2008-04-23 11:52:08.000000000 -0400
+--- a/kernel/pid_namespace.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/pid_namespace.c 2008-04-23 11:52:08.000000000 -0400
@@ -12,6 +12,7 @@
#include <linux/pid_namespace.h>
#include <linux/syscalls.h>
@@ -16256,8 +16256,8 @@
kmem_cache_free(pid_ns_cachep, ns);
}
---- linux-2.6.25.4/kernel/posix-timers.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/posix-timers.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/posix-timers.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/posix-timers.c 2008-04-19 15:14:52.000000000 -0400
@@ -47,6 +47,7 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
@@ -16308,8 +16308,8 @@
}
EXPORT_SYMBOL_GPL(posix_timer_event);
---- linux-2.6.25.4/kernel/printk.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/printk.c 2008-04-21 10:59:28.000000000 -0400
+--- a/kernel/printk.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/printk.c 2008-04-21 10:59:28.000000000 -0400
@@ -32,6 +32,7 @@
#include <linux/security.h>
#include <linux/bootmem.h>
@@ -16373,8 +16373,8 @@
count = len;
if (count > log_buf_len)
count = log_buf_len;
---- linux-2.6.25.4/kernel/ptrace.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/ptrace.c 2008-04-21 10:50:28.000000000 -0400
+--- a/kernel/ptrace.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/ptrace.c 2008-04-21 10:50:28.000000000 -0400
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/pid_namespace.h>
@@ -16406,8 +16406,8 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
/*
---- linux-2.6.25.4/kernel/sched.c 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/sched.c 2008-05-21 14:30:41.000000000 -0400
+--- a/kernel/sched.c 2008-05-21 14:30:05.000000000 -0400
++++ a/kernel/sched.c 2008-05-21 14:30:41.000000000 -0400
@@ -66,6 +66,8 @@
#include <linux/unistd.h>
#include <linux/pagemap.h>
@@ -16516,8 +16516,8 @@
retval = security_task_setnice(current, nice);
if (retval)
---- linux-2.6.25.4/kernel/sched_fair.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/sched_fair.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/sched_fair.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/sched_fair.c 2008-04-19 15:14:52.000000000 -0400
@@ -537,6 +537,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
check_spread(cfs_rq, se);
if (se != cfs_rq->curr)
@@ -16536,8 +16536,8 @@
account_entity_dequeue(cfs_rq, se);
}
---- linux-2.6.25.4/kernel/sched_hard.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/sched_hard.h 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/sched_hard.h 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/sched_hard.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,324 @@
+
+#ifdef CONFIG_VSERVER_IDLELIMIT
@@ -16863,8 +16863,8 @@
+
+#endif /* CONFIG_VSERVER_HARDCPU */
+
---- linux-2.6.25.4/kernel/sched_mon.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/sched_mon.h 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/sched_mon.h 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/sched_mon.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,200 @@
+
+#include <linux/vserver/monitor.h>
@@ -17066,8 +17066,8 @@
+
+#endif /* CONFIG_VSERVER_MONITOR */
+
---- linux-2.6.25.4/kernel/signal.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/signal.c 2008-05-15 15:41:03.000000000 -0400
+--- a/kernel/signal.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/signal.c 2008-05-15 15:41:03.000000000 -0400
@@ -26,6 +26,8 @@
#include <linux/freezer.h>
#include <linux/pid_namespace.h>
@@ -17143,8 +17143,8 @@
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
---- linux-2.6.25.4/kernel/softirq.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/softirq.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/softirq.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/softirq.c 2008-04-19 15:14:52.000000000 -0400
@@ -21,6 +21,7 @@
#include <linux/rcupdate.h>
#include <linux/smp.h>
@@ -17153,8 +17153,8 @@
#include <asm/irq.h>
/*
---- linux-2.6.25.4/kernel/sys.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/sys.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/sys.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/sys.c 2008-04-19 15:14:52.000000000 -0400
@@ -38,6 +38,7 @@
#include <linux/syscalls.h>
#include <linux/kprobes.h>
@@ -17240,8 +17240,8 @@
return -EPERM;
if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > sysctl_nr_open)
return -EPERM;
---- linux-2.6.25.4/kernel/sysctl.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/sysctl.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/sysctl.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/sysctl.c 2008-04-19 15:14:52.000000000 -0400
@@ -107,6 +107,7 @@ static int ngroups_max = NGROUPS_MAX;
#ifdef CONFIG_KMOD
extern char modprobe_path[];
@@ -17266,8 +17266,8 @@
#ifdef CONFIG_CHR_DEV_SG
{
.ctl_name = KERN_SG_BIG_BUFF,
---- linux-2.6.25.4/kernel/sysctl_check.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/sysctl_check.c 2008-04-21 13:42:56.000000000 -0400
+--- a/kernel/sysctl_check.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/sysctl_check.c 2008-04-21 13:42:56.000000000 -0400
@@ -39,6 +39,7 @@ static const struct trans_ctl_table tran
{ KERN_PANIC, "panic" },
@@ -17307,8 +17307,8 @@
{}
};
---- linux-2.6.25.4/kernel/time.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/time.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/time.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/time.c 2008-04-19 15:14:52.000000000 -0400
@@ -60,6 +60,7 @@ EXPORT_SYMBOL(sys_tz);
asmlinkage long sys_time(time_t __user * tloc)
{
@@ -17353,8 +17353,8 @@
tv->tv_sec = x.tv_sec;
tv->tv_nsec = x.tv_usec * NSEC_PER_USEC;
}
---- linux-2.6.25.4/kernel/timer.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/timer.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/timer.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/timer.c 2008-04-19 15:14:52.000000000 -0400
@@ -37,6 +37,10 @@
#include <linux/delay.h>
#include <linux/tick.h>
@@ -17413,8 +17413,8 @@
info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);
info->loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
---- linux-2.6.25.4/kernel/user.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/user.c 2008-04-23 16:24:56.000000000 -0400
+--- a/kernel/user.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/user.c 2008-04-23 16:24:56.000000000 -0400
@@ -219,14 +219,15 @@ static struct kobj_type uids_ktype = {
};
@@ -17461,8 +17461,8 @@
goto out_destoy_sched;
/*
---- linux-2.6.25.4/kernel/user_namespace.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/user_namespace.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/user_namespace.c 2008-04-17 12:05:44.000000000 -0400
++++ a/kernel/user_namespace.c 2008-04-19 15:14:52.000000000 -0400
@@ -9,6 +9,7 @@
#include <linux/version.h>
#include <linux/nsproxy.h>
@@ -17486,8 +17486,8 @@
+ atomic_dec(&vs_global_user_ns);
kfree(ns);
}
---- linux-2.6.25.4/kernel/utsname.c 2008-04-17 10:37:25.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/utsname.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/utsname.c 2008-04-17 10:37:25.000000000 -0400
++++ a/kernel/utsname.c 2008-04-19 15:14:52.000000000 -0400
@@ -14,6 +14,7 @@
#include <linux/utsname.h>
#include <linux/version.h>
@@ -17511,8 +17511,8 @@
+ atomic_dec(&vs_global_uts_ns);
kfree(ns);
}
---- linux-2.6.25.4/kernel/vserver/cacct.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/cacct.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/cacct.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/cacct.c 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
@@ -17556,8 +17556,8 @@
+ return 0;
+}
+
---- linux-2.6.25.4/kernel/vserver/cacct_init.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/cacct_init.h 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/cacct_init.h 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/cacct_init.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,25 @@
+
+
@@ -17584,8 +17584,8 @@
+ return;
+}
+
---- linux-2.6.25.4/kernel/vserver/cacct_proc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/cacct_proc.h 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/cacct_proc.h 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/cacct_proc.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
@@ -17640,8 +17640,8 @@
+}
+
+#endif /* _VX_CACCT_PROC_H */
---- linux-2.6.25.4/kernel/vserver/context.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/context.c 2008-04-23 22:26:24.000000000 -0400
+--- a/kernel/vserver/context.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/context.c 2008-04-23 22:26:24.000000000 -0400
@@ -0,0 +1,1005 @@
+/*
+ * linux/kernel/vserver/context.c
@@ -18648,8 +18648,8 @@
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
---- linux-2.6.25.4/kernel/vserver/cvirt.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/cvirt.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/cvirt.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/cvirt.c 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,301 @@
+/*
+ * linux/kernel/vserver/cvirt.c
@@ -18952,8 +18952,8 @@
+
+#endif
+
---- linux-2.6.25.4/kernel/vserver/cvirt_init.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/cvirt_init.h 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/cvirt_init.h 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/cvirt_init.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,69 @@
+
+
@@ -19024,8 +19024,8 @@
+ return;
+}
+
---- linux-2.6.25.4/kernel/vserver/cvirt_proc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/cvirt_proc.h 2008-04-21 13:01:29.000000000 -0400
+--- a/kernel/vserver/cvirt_proc.h 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/cvirt_proc.h 2008-04-21 13:01:29.000000000 -0400
@@ -0,0 +1,135 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
@@ -19162,8 +19162,8 @@
+}
+
+#endif /* _VX_CVIRT_PROC_H */
---- linux-2.6.25.4/kernel/vserver/debug.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/debug.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/debug.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/debug.c 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
@@ -19197,8 +19197,8 @@
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
---- linux-2.6.25.4/kernel/vserver/device.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/device.c 2008-04-21 12:35:24.000000000 -0400
+--- a/kernel/vserver/device.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/device.c 2008-04-21 12:35:24.000000000 -0400
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
@@ -19643,8 +19643,8 @@
+#endif /* CONFIG_COMPAT */
+
+
---- linux-2.6.25.4/kernel/vserver/dlimit.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/dlimit.c 2008-04-21 12:36:09.000000000 -0400
+--- a/kernel/vserver/dlimit.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/dlimit.c 2008-04-21 12:36:09.000000000 -0400
@@ -0,0 +1,521 @@
+/*
+ * linux/kernel/vserver/dlimit.c
@@ -20167,8 +20167,8 @@
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
---- linux-2.6.25.4/kernel/vserver/helper.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/helper.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/helper.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/helper.c 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,199 @@
+/*
+ * linux/kernel/vserver/helper.c
@@ -20369,8 +20369,8 @@
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
---- linux-2.6.25.4/kernel/vserver/history.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/history.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/history.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/history.c 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
@@ -20630,8 +20630,8 @@
+
+#endif /* CONFIG_COMPAT */
+
---- linux-2.6.25.4/kernel/vserver/inet.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/inet.c 2008-04-21 12:49:53.000000000 -0400
+--- a/kernel/vserver/inet.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/inet.c 2008-05-29 18:56:59.000000000 -0400
@@ -0,0 +1,225 @@
+
+#include <linux/in.h>
@@ -20833,7 +20833,7 @@
+ }
+ }
+ /* still no source ip? */
-+ found = IN_LOOPBACK(fl->fl4_dst)
++ found = ipv4_is_loopback(fl->fl4_dst)
+ ? IPI_LOOPBACK : nxi->v4.ip[0].s_addr;
+ found:
+ /* assign src ip to flow */
@@ -20845,11 +20845,11 @@
+ }
+
+ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) {
-+ if (IN_LOOPBACK(fl->fl4_dst))
++ if (ipv4_is_loopback(fl->fl4_dst))
+ fl->fl4_dst = nxi->v4_lback.s_addr;
-+ if (IN_LOOPBACK(fl->fl4_src))
++ if (ipv4_is_loopback(fl->fl4_src))
+ fl->fl4_src = nxi->v4_lback.s_addr;
-+ } else if (IN_LOOPBACK(fl->fl4_dst) &&
++ } else if (ipv4_is_loopback(fl->fl4_dst) &&
+ !nx_info_flags(nxi, NXF_LBACK_ALLOW, 0))
+ return -EPERM;
+
@@ -20858,8 +20858,8 @@
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
---- linux-2.6.25.4/kernel/vserver/init.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/init.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/init.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/init.c 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
@@ -20906,8 +20906,8 @@
+module_init(init_vserver);
+module_exit(exit_vserver);
+
---- linux-2.6.25.4/kernel/vserver/inode.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/inode.c 2008-04-21 16:52:16.000000000 -0400
+--- a/kernel/vserver/inode.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/inode.c 2008-04-21 16:52:16.000000000 -0400
@@ -0,0 +1,409 @@
+/*
+ * linux/kernel/vserver/inode.c
@@ -21318,8 +21318,8 @@
+
+#endif /* CONFIG_PROPAGATE */
+
---- linux-2.6.25.4/kernel/vserver/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/Kconfig 2008-05-21 15:02:48.000000000 -0400
+--- a/kernel/vserver/Kconfig 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/Kconfig 2008-05-21 15:02:48.000000000 -0400
@@ -0,0 +1,252 @@
+#
+# Linux VServer configuration
@@ -21573,8 +21573,8 @@
+ default y
+ select SECURITY_CAPABILITIES
+
---- linux-2.6.25.4/kernel/vserver/limit.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/limit.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/limit.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/limit.c 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,319 @@
+/*
+ * linux/kernel/vserver/limit.c
@@ -21895,8 +21895,8 @@
+ return points;
+}
+
---- linux-2.6.25.4/kernel/vserver/limit_init.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/limit_init.h 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/limit_init.h 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/limit_init.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,33 @@
+
+
@@ -21931,8 +21931,8 @@
+#endif
+}
+
---- linux-2.6.25.4/kernel/vserver/limit_proc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/limit_proc.h 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/limit_proc.h 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/limit_proc.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
@@ -21991,8 +21991,8 @@
+#endif /* _VX_LIMIT_PROC_H */
+
+
---- linux-2.6.25.4/kernel/vserver/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/Makefile 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/Makefile 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,18 @@
+#
+# Makefile for the Linux vserver routines.
@@ -22012,8 +22012,8 @@
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
+
---- linux-2.6.25.4/kernel/vserver/monitor.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/monitor.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/monitor.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/monitor.c 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,138 @@
+/*
+ * kernel/vserver/monitor.c
@@ -22153,8 +22153,8 @@
+
+#endif /* CONFIG_COMPAT */
+
---- linux-2.6.25.4/kernel/vserver/network.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/network.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/network.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/network.c 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,864 @@
+/*
+ * linux/kernel/vserver/network.c
@@ -23020,8 +23020,8 @@
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
---- linux-2.6.25.4/kernel/vserver/proc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/proc.c 2008-04-21 13:42:34.000000000 -0400
+--- a/kernel/vserver/proc.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/proc.c 2008-04-21 13:42:34.000000000 -0400
@@ -0,0 +1,1086 @@
+/*
+ * linux/kernel/vserver/proc.c
@@ -24109,8 +24109,8 @@
+ return buffer - orig;
+}
+
---- linux-2.6.25.4/kernel/vserver/sched.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/sched.c 2008-04-29 18:40:09.000000000 -0400
+--- a/kernel/vserver/sched.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/sched.c 2008-04-29 18:40:09.000000000 -0400
@@ -0,0 +1,413 @@
+/*
+ * linux/kernel/vserver/sched.c
@@ -24525,8 +24525,8 @@
+ return 0;
+}
+
---- linux-2.6.25.4/kernel/vserver/sched_init.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/sched_init.h 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/sched_init.h 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/sched_init.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,50 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
@@ -24578,8 +24578,8 @@
+{
+ return;
+}
---- linux-2.6.25.4/kernel/vserver/sched_proc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/sched_proc.h 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/sched_proc.h 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/sched_proc.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,57 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
@@ -24638,8 +24638,8 @@
+}
+
+#endif /* _VX_SCHED_PROC_H */
---- linux-2.6.25.4/kernel/vserver/signal.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/signal.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/signal.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/signal.c 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,132 @@
+/*
+ * linux/kernel/vserver/signal.c
@@ -24773,8 +24773,8 @@
+ return ret;
+}
+
---- linux-2.6.25.4/kernel/vserver/space.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/space.c 2008-05-15 15:41:12.000000000 -0400
+--- a/kernel/vserver/space.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/space.c 2008-05-15 15:41:12.000000000 -0400
@@ -0,0 +1,316 @@
+/*
+ * linux/kernel/vserver/space.c
@@ -25092,8 +25092,8 @@
+ return 0;
+}
+
---- linux-2.6.25.4/kernel/vserver/switch.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/switch.c 2008-04-29 18:40:18.000000000 -0400
+--- a/kernel/vserver/switch.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/switch.c 2008-04-29 18:40:18.000000000 -0400
@@ -0,0 +1,529 @@
+/*
+ * linux/kernel/vserver/switch.c
@@ -25624,8 +25624,8 @@
+}
+
+#endif /* CONFIG_COMPAT */
---- linux-2.6.25.4/kernel/vserver/sysctl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/sysctl.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/sysctl.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/sysctl.c 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,244 @@
+/*
+ * kernel/vserver/sysctl.c
@@ -25871,8 +25871,8 @@
+EXPORT_SYMBOL_GPL(vx_debug_space);
+EXPORT_SYMBOL_GPL(vx_debug_misc);
+
---- linux-2.6.25.4/kernel/vserver/tag.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/tag.c 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/tag.c 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/tag.c 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
@@ -25937,8 +25937,8 @@
+}
+
+
---- linux-2.6.25.4/kernel/vserver/vci_config.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/kernel/vserver/vci_config.h 2008-04-19 15:14:52.000000000 -0400
+--- a/kernel/vserver/vci_config.h 1969-12-31 19:00:00.000000000 -0500
++++ a/kernel/vserver/vci_config.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,81 @@
+
+/* interface version */
@@ -26021,8 +26021,8 @@
+ 0;
+}
+
---- linux-2.6.25.4/mm/filemap_xip.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/filemap_xip.c 2008-04-19 15:14:52.000000000 -0400
+--- a/mm/filemap_xip.c 2008-04-17 12:05:44.000000000 -0400
++++ a/mm/filemap_xip.c 2008-04-19 15:14:52.000000000 -0400
@@ -14,6 +14,7 @@
#include <linux/uio.h>
#include <linux/rmap.h>
@@ -26031,8 +26031,8 @@
#include <asm/tlbflush.h>
/*
---- linux-2.6.25.4/mm/fremap.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/fremap.c 2008-04-19 15:14:52.000000000 -0400
+--- a/mm/fremap.c 2008-04-17 12:05:44.000000000 -0400
++++ a/mm/fremap.c 2008-04-19 15:14:52.000000000 -0400
@@ -15,6 +15,7 @@
#include <linux/rmap.h>
#include <linux/module.h>
@@ -26041,8 +26041,8 @@
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
---- linux-2.6.25.4/mm/hugetlb.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/hugetlb.c 2008-04-19 15:14:52.000000000 -0400
+--- a/mm/hugetlb.c 2008-04-17 12:05:44.000000000 -0400
++++ a/mm/hugetlb.c 2008-04-19 15:14:52.000000000 -0400
@@ -19,6 +19,7 @@
#include <asm/pgtable.h>
@@ -26051,8 +26051,8 @@
#include "internal.h"
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
---- linux-2.6.25.4/mm/memory.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/memory.c 2008-04-19 15:14:52.000000000 -0400
+--- a/mm/memory.c 2008-04-17 12:05:44.000000000 -0400
++++ a/mm/memory.c 2008-04-19 15:14:52.000000000 -0400
@@ -505,6 +505,9 @@ static int copy_pte_range(struct mm_stru
int progress = 0;
int rss[2];
@@ -26119,8 +26119,8 @@
}
/*
---- linux-2.6.25.4/mm/mlock.c 2008-04-17 10:37:25.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/mlock.c 2008-04-19 15:14:52.000000000 -0400
+--- a/mm/mlock.c 2008-04-17 10:37:25.000000000 -0400
++++ a/mm/mlock.c 2008-04-19 15:14:52.000000000 -0400
@@ -12,6 +12,7 @@
#include <linux/syscalls.h>
#include <linux/sched.h>
@@ -26177,8 +26177,8 @@
if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
---- linux-2.6.25.4/mm/mmap.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/mmap.c 2008-04-19 15:14:52.000000000 -0400
+--- a/mm/mmap.c 2008-04-17 12:05:44.000000000 -0400
++++ a/mm/mmap.c 2008-04-19 15:14:52.000000000 -0400
@@ -1197,10 +1197,10 @@ munmap_back:
kmem_cache_free(vm_area_cachep, vma);
}
@@ -26287,8 +26287,8 @@
+ vx_vmpages_add(mm, len >> PAGE_SHIFT);
return 0;
}
---- linux-2.6.25.4/mm/mremap.c 2008-04-17 11:31:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/mremap.c 2008-04-19 15:14:52.000000000 -0400
+--- a/mm/mremap.c 2008-04-17 11:31:40.000000000 -0400
++++ a/mm/mremap.c 2008-04-19 15:14:52.000000000 -0400
@@ -18,6 +18,7 @@
#include <linux/highmem.h>
#include <linux/security.h>
@@ -26338,8 +26338,8 @@
make_pages_present(addr + old_len,
addr + new_len);
}
---- linux-2.6.25.4/mm/nommu.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/nommu.c 2008-04-19 15:14:52.000000000 -0400
+--- a/mm/nommu.c 2008-04-17 12:05:44.000000000 -0400
++++ a/mm/nommu.c 2008-04-19 15:14:52.000000000 -0400
@@ -991,7 +991,7 @@ unsigned long do_mmap_pgoff(struct file
realalloc += kobjsize(vma);
askedalloc += sizeof(*vma);
@@ -26367,8 +26367,8 @@
while ((tmp = mm->context.vmlist)) {
mm->context.vmlist = tmp->next;
---- linux-2.6.25.4/mm/oom_kill.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/oom_kill.c 2008-04-19 16:55:20.000000000 -0400
+--- a/mm/oom_kill.c 2008-04-17 12:05:44.000000000 -0400
++++ a/mm/oom_kill.c 2008-04-19 16:55:20.000000000 -0400
@@ -26,6 +26,7 @@
#include <linux/module.h>
#include <linux/notifier.h>
@@ -26423,8 +26423,8 @@
/* Try to kill a child first */
list_for_each_entry(c, &p->children, sibling) {
---- linux-2.6.25.4/mm/page_alloc.c 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/page_alloc.c 2008-05-21 14:30:41.000000000 -0400
+--- a/mm/page_alloc.c 2008-05-21 14:30:05.000000000 -0400
++++ a/mm/page_alloc.c 2008-05-21 14:30:41.000000000 -0400
@@ -45,6 +45,8 @@
#include <linux/fault-inject.h>
#include <linux/page-isolation.h>
@@ -26454,8 +26454,8 @@
}
#endif
---- linux-2.6.25.4/mm/rmap.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/rmap.c 2008-04-19 16:53:36.000000000 -0400
+--- a/mm/rmap.c 2008-04-17 12:05:44.000000000 -0400
++++ a/mm/rmap.c 2008-04-19 16:53:36.000000000 -0400
@@ -49,6 +49,7 @@
#include <linux/module.h>
#include <linux/kallsyms.h>
@@ -26464,8 +26464,8 @@
#include <asm/tlbflush.h>
---- linux-2.6.25.4/mm/shmem.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/shmem.c 2008-04-19 15:14:52.000000000 -0400
+--- a/mm/shmem.c 2008-04-17 12:05:44.000000000 -0400
++++ a/mm/shmem.c 2008-04-19 15:14:52.000000000 -0400
@@ -56,7 +56,6 @@
#include <asm/pgtable.h>
@@ -26492,8 +26492,8 @@
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_POSIX_ACL
---- linux-2.6.25.4/mm/slab.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/slab.c 2008-04-19 15:14:52.000000000 -0400
+--- a/mm/slab.c 2008-04-17 12:05:44.000000000 -0400
++++ a/mm/slab.c 2008-04-19 15:14:52.000000000 -0400
@@ -509,6 +509,8 @@ struct kmem_cache {
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
@@ -26527,8 +26527,8 @@
/*
* Skip calling cache_free_alien() when the platform is not numa.
---- linux-2.6.25.4/mm/slab_vs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/slab_vs.h 2008-04-19 15:14:52.000000000 -0400
+--- a/mm/slab_vs.h 1969-12-31 19:00:00.000000000 -0500
++++ a/mm/slab_vs.h 2008-04-19 15:14:52.000000000 -0400
@@ -0,0 +1,27 @@
+
+#include <linux/vserver/context.h>
@@ -26557,8 +26557,8 @@
+ atomic_sub(cachep->buffer_size, ¤t->vx_info->cacct.slab[what]);
+}
+
---- linux-2.6.25.4/mm/swapfile.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/mm/swapfile.c 2008-04-19 15:14:52.000000000 -0400
+--- a/mm/swapfile.c 2008-04-17 12:05:44.000000000 -0400
++++ a/mm/swapfile.c 2008-04-19 15:14:52.000000000 -0400
@@ -32,6 +32,8 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
@@ -26577,8 +26577,8 @@
}
/*
---- linux-2.6.25.4/net/core/dev.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/core/dev.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/core/dev.c 2008-04-17 12:05:44.000000000 -0400
++++ a/net/core/dev.c 2008-04-19 15:14:52.000000000 -0400
@@ -119,6 +119,7 @@
#include <linux/err.h>
#include <linux/ctype.h>
@@ -26606,8 +26606,8 @@
seq_printf(seq, "%6s:%8lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu "
"%8lu %7lu %4lu %4lu %4lu %5lu %7lu %10lu\n",
dev->name, stats->rx_bytes, stats->rx_packets,
---- linux-2.6.25.4/net/core/rtnetlink.c 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/core/rtnetlink.c 2008-05-21 14:30:41.000000000 -0400
+--- a/net/core/rtnetlink.c 2008-05-21 14:30:05.000000000 -0400
++++ a/net/core/rtnetlink.c 2008-05-21 14:30:41.000000000 -0400
@@ -674,6 +674,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
idx = 0;
@@ -26627,8 +26627,8 @@
skb = nlmsg_new(if_nlmsg_size(dev), GFP_KERNEL);
if (skb == NULL)
goto errout;
---- linux-2.6.25.4/net/core/sock.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/core/sock.c 2008-04-23 14:31:31.000000000 -0400
+--- a/net/core/sock.c 2008-04-17 12:05:44.000000000 -0400
++++ a/net/core/sock.c 2008-04-23 14:31:31.000000000 -0400
@@ -126,6 +126,10 @@
#include <linux/ipsec.h>
@@ -26695,8 +26695,8 @@
atomic_set(&sk->sk_refcnt, 1);
atomic_set(&sk->sk_drops, 0);
}
---- linux-2.6.25.4/net/ipv4/af_inet.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv4/af_inet.c 2008-04-19 16:08:42.000000000 -0400
+--- a/net/ipv4/af_inet.c 2008-04-17 12:05:44.000000000 -0400
++++ a/net/ipv4/af_inet.c 2008-04-19 16:08:42.000000000 -0400
@@ -115,6 +115,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
@@ -26773,8 +26773,8 @@
sin->sin_port = inet->sport;
sin->sin_addr.s_addr = addr;
}
---- linux-2.6.25.4/net/ipv4/devinet.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv4/devinet.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv4/devinet.c 2008-04-17 12:05:44.000000000 -0400
++++ a/net/ipv4/devinet.c 2008-04-19 15:14:52.000000000 -0400
@@ -421,6 +421,7 @@ struct in_device *inetdev_by_index(struc
return in_dev;
}
@@ -26841,8 +26841,8 @@
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
---- linux-2.6.25.4/net/ipv4/fib_hash.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv4/fib_hash.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv4/fib_hash.c 2008-04-17 12:05:44.000000000 -0400
++++ a/net/ipv4/fib_hash.c 2008-04-19 15:14:52.000000000 -0400
@@ -1025,7 +1025,7 @@ static int fib_seq_show(struct seq_file
prefix = f->fn_key;
mask = FZ_MASK(iter->zone);
@@ -26852,8 +26852,8 @@
snprintf(bf, sizeof(bf),
"%s\t%08X\t%08X\t%04X\t%d\t%u\t%d\t%08X\t%d\t%u\t%u",
fi->fib_dev ? fi->fib_dev->name : "*", prefix,
---- linux-2.6.25.4/net/ipv4/inet_connection_sock.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv4/inet_connection_sock.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv4/inet_connection_sock.c 2008-04-17 12:05:44.000000000 -0400
++++ a/net/ipv4/inet_connection_sock.c 2008-04-19 15:14:52.000000000 -0400
@@ -47,10 +47,40 @@ void inet_get_local_port_range(int *low,
}
EXPORT_SYMBOL(inet_get_local_port_range);
@@ -26907,8 +26907,8 @@
break;
}
}
---- linux-2.6.25.4/net/ipv4/inet_diag.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv4/inet_diag.c 2008-04-19 16:05:51.000000000 -0400
+--- a/net/ipv4/inet_diag.c 2008-04-17 12:05:44.000000000 -0400
++++ a/net/ipv4/inet_diag.c 2008-04-19 16:05:51.000000000 -0400
@@ -34,6 +34,8 @@
#include <linux/stddef.h>
@@ -27010,8 +27010,8 @@
if (num < s_num)
goto next_dying;
if (r->id.idiag_sport != tw->tw_sport &&
---- linux-2.6.25.4/net/ipv4/inet_hashtables.c 2008-04-17 12:05:44.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv4/inet_hashtables.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv4/inet_hashtables.c 2008-04-17 12:05:44.000000000 -0400
++++ a/net/ipv4/inet_hashtables.c 2008-04-19 15:14:52.000000000 -0400
@@ -21,6 +21,7 @@
#include <net/inet_connection_sock.h>
@@ -27044,8 +27044,8 @@
(sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&
!sk->sk_bound_dev_if && sk->sk_net == net)
goto sherry_cache;
---- linux-2.6.25.4/net/ipv4/netfilter/nf_nat_helper.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv4/netfilter/nf_nat_helper.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv4/netfilter/nf_nat_helper.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv4/netfilter/nf_nat_helper.c 2008-04-19 15:14:52.000000000 -0400
@@ -18,6 +18,7 @@
#include <net/tcp.h>
@@ -27054,8 +27054,8 @@
#include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_helper.h>
#include <net/netfilter/nf_conntrack_ecache.h>
---- linux-2.6.25.4/net/ipv4/netfilter.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv4/netfilter.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv4/netfilter.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv4/netfilter.c 2008-04-19 15:14:52.000000000 -0400
@@ -4,7 +4,7 @@
#include <linux/netfilter_ipv4.h>
#include <linux/ip.h>
@@ -27065,8 +27065,8 @@
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
---- linux-2.6.25.4/net/ipv4/raw.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv4/raw.c 2008-04-29 20:28:52.000000000 -0400
+--- a/net/ipv4/raw.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv4/raw.c 2008-04-29 20:28:52.000000000 -0400
@@ -126,7 +126,7 @@ static struct sock *__raw_v4_lookup(stru
if (sk->sk_net == net && inet->num == num &&
@@ -27176,8 +27176,8 @@
atomic_read(&sp->sk_wmem_alloc),
atomic_read(&sp->sk_rmem_alloc),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
---- linux-2.6.25.4/net/ipv4/syncookies.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv4/syncookies.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv4/syncookies.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv4/syncookies.c 2008-04-19 15:14:52.000000000 -0400
@@ -20,6 +20,7 @@
#include <linux/cryptohash.h>
#include <linux/kernel.h>
@@ -27186,8 +27186,8 @@
extern int sysctl_tcp_syncookies;
---- linux-2.6.25.4/net/ipv4/tcp.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv4/tcp.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv4/tcp.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv4/tcp.c 2008-04-19 15:14:52.000000000 -0400
@@ -263,6 +263,7 @@
#include <linux/cache.h>
#include <linux/err.h>
@@ -27196,8 +27196,8 @@
#include <net/icmp.h>
#include <net/tcp.h>
---- linux-2.6.25.4/net/ipv4/tcp_ipv4.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv4/tcp_ipv4.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv4/tcp_ipv4.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv4/tcp_ipv4.c 2008-04-19 15:14:52.000000000 -0400
@@ -1965,6 +1965,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
@@ -27311,8 +27311,8 @@
3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
atomic_read(&tw->tw_refcnt), tw);
}
---- linux-2.6.25.4/net/ipv4/tcp_minisocks.c 2008-04-17 11:31:40.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv4/tcp_minisocks.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv4/tcp_minisocks.c 2008-04-17 11:31:40.000000000 -0400
++++ a/net/ipv4/tcp_minisocks.c 2008-04-19 15:14:52.000000000 -0400
@@ -28,6 +28,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
@@ -27336,8 +27336,8 @@
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
---- linux-2.6.25.4/net/ipv4/udp.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv4/udp.c 2008-04-21 12:41:01.000000000 -0400
+--- a/net/ipv4/udp.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv4/udp.c 2008-04-21 12:41:01.000000000 -0400
@@ -246,14 +246,7 @@ int udp_get_port(struct sock *sk, unsign
return __udp_lib_get_port(sk, snum, udp_hash, scmp);
}
@@ -27453,8 +27453,8 @@
atomic_read(&sp->sk_wmem_alloc),
atomic_read(&sp->sk_rmem_alloc),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
---- linux-2.6.25.4/net/ipv6/addrconf.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv6/addrconf.c 2008-04-19 16:44:23.000000000 -0400
+--- a/net/ipv6/addrconf.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv6/addrconf.c 2008-04-19 16:44:23.000000000 -0400
@@ -87,6 +87,8 @@
#include <linux/proc_fs.h>
@@ -27622,8 +27622,8 @@
if ((idev = in6_dev_get(dev)) == NULL)
goto cont;
err = inet6_fill_ifinfo(skb, idev, NETLINK_CB(cb->skb).pid,
---- linux-2.6.25.4/net/ipv6/af_inet6.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv6/af_inet6.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv6/af_inet6.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv6/af_inet6.c 2008-04-19 15:14:52.000000000 -0400
@@ -43,6 +43,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
@@ -27719,8 +27719,8 @@
if (ipv6_addr_any(&np->rcv_saddr))
ipv6_addr_copy(&sin->sin6_addr, &np->saddr);
else
---- linux-2.6.25.4/net/ipv6/fib6_rules.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv6/fib6_rules.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv6/fib6_rules.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv6/fib6_rules.c 2008-04-19 15:14:52.000000000 -0400
@@ -86,7 +86,7 @@ static int fib6_rule_action(struct fib_r
r->src.plen && !(flags & RT6_LOOKUP_F_HAS_SADDR)) {
struct in6_addr saddr;
@@ -27730,8 +27730,8 @@
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
---- linux-2.6.25.4/net/ipv6/inet6_hashtables.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv6/inet6_hashtables.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv6/inet6_hashtables.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv6/inet6_hashtables.c 2008-04-19 15:14:52.000000000 -0400
@@ -16,6 +16,7 @@
#include <linux/module.h>
@@ -27750,8 +27750,8 @@
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
---- linux-2.6.25.4/net/ipv6/ip6_output.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv6/ip6_output.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv6/ip6_output.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv6/ip6_output.c 2008-04-19 15:14:52.000000000 -0400
@@ -920,7 +920,7 @@ static int ip6_dst_lookup_tail(struct so
goto out_err_release;
@@ -27761,8 +27761,8 @@
if (err)
goto out_err_release;
}
---- linux-2.6.25.4/net/ipv6/Kconfig 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv6/Kconfig 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv6/Kconfig 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv6/Kconfig 2008-04-19 15:14:52.000000000 -0400
@@ -4,8 +4,8 @@
# IPv6 as module will cause a CRASH if you try to unload it
@@ -27774,8 +27774,8 @@
---help---
This is complemental support for the IP version 6.
You will still be able to do traditional IPv4 networking as well.
---- linux-2.6.25.4/net/ipv6/ndisc.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv6/ndisc.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv6/ndisc.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv6/ndisc.c 2008-04-19 15:14:52.000000000 -0400
@@ -563,7 +563,7 @@ static void ndisc_send_na(struct net_dev
override = 0;
in6_ifa_put(ifp);
@@ -27785,8 +27785,8 @@
return;
src_addr = &tmpaddr;
}
---- linux-2.6.25.4/net/ipv6/route.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv6/route.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv6/route.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv6/route.c 2008-04-19 15:14:52.000000000 -0400
@@ -2122,7 +2122,7 @@ static int rt6_fill_node(struct sk_buff
NLA_PUT_U32(skb, RTA_IIF, iif);
else if (dst) {
@@ -27796,8 +27796,8 @@
NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
}
---- linux-2.6.25.4/net/ipv6/tcp_ipv6.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv6/tcp_ipv6.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv6/tcp_ipv6.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv6/tcp_ipv6.c 2008-04-19 15:14:52.000000000 -0400
@@ -68,6 +68,7 @@
#include <linux/crypto.h>
@@ -27824,8 +27824,8 @@
addr_type = ipv6_addr_type(&usin->sin6_addr);
---- linux-2.6.25.4/net/ipv6/udp.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv6/udp.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/ipv6/udp.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv6/udp.c 2008-04-19 15:14:52.000000000 -0400
@@ -49,6 +49,7 @@
#include <linux/proc_fs.h>
@@ -27845,8 +27845,8 @@
}
if (!ipv6_addr_any(&np->daddr)) {
if (!ipv6_addr_equal(&np->daddr, saddr))
---- linux-2.6.25.4/net/ipv6/xfrm6_policy.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/ipv6/xfrm6_policy.c 2008-04-19 16:13:21.000000000 -0400
+--- a/net/ipv6/xfrm6_policy.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/ipv6/xfrm6_policy.c 2008-04-19 16:13:21.000000000 -0400
@@ -58,7 +58,7 @@ static int xfrm6_get_saddr(xfrm_address_
return -EHOSTUNREACH;
@@ -27856,8 +27856,8 @@
dst_release(dst);
return 0;
}
---- linux-2.6.25.4/net/netlink/af_netlink.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/netlink/af_netlink.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/netlink/af_netlink.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/netlink/af_netlink.c 2008-04-19 15:14:52.000000000 -0400
@@ -56,6 +56,9 @@
#include <linux/audit.h>
#include <linux/selinux.h>
@@ -27868,8 +27868,8 @@
#include <net/net_namespace.h>
#include <net/sock.h>
---- linux-2.6.25.4/net/sctp/ipv6.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/sctp/ipv6.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/sctp/ipv6.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/sctp/ipv6.c 2008-04-19 15:14:52.000000000 -0400
@@ -316,7 +316,7 @@ static void sctp_v6_get_saddr(struct sct
__FUNCTION__, asoc, dst, NIP6(daddr->v6.sin6_addr));
@@ -27879,8 +27879,8 @@
SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: " NIP6_FMT "\n",
NIP6(saddr->v6.sin6_addr));
return;
---- linux-2.6.25.4/net/socket.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/socket.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/socket.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/socket.c 2008-04-19 15:14:52.000000000 -0400
@@ -93,6 +93,10 @@
#include <net/sock.h>
@@ -27989,8 +27989,8 @@
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
---- linux-2.6.25.4/net/sunrpc/auth.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/sunrpc/auth.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/sunrpc/auth.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/sunrpc/auth.c 2008-04-19 15:14:52.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/errno.h>
#include <linux/sunrpc/clnt.h>
@@ -28015,8 +28015,8 @@
.group_info = current->group_info,
};
struct rpc_cred *ret;
---- linux-2.6.25.4/net/sunrpc/auth_unix.c 2008-04-17 10:37:27.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/sunrpc/auth_unix.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/sunrpc/auth_unix.c 2008-04-17 10:37:27.000000000 -0400
++++ a/net/sunrpc/auth_unix.c 2008-04-19 15:14:52.000000000 -0400
@@ -11,12 +11,14 @@
#include <linux/module.h>
#include <linux/sunrpc/clnt.h>
@@ -28082,8 +28082,8 @@
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
*p++ = htonl((u32) cred->uc_gids[i]);
---- linux-2.6.25.4/net/sunrpc/clnt.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/sunrpc/clnt.c 2008-04-19 16:09:36.000000000 -0400
+--- a/net/sunrpc/clnt.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/sunrpc/clnt.c 2008-04-19 16:09:36.000000000 -0400
@@ -31,6 +31,7 @@
#include <linux/utsname.h>
#include <linux/workqueue.h>
@@ -28103,8 +28103,8 @@
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
---- linux-2.6.25.4/net/unix/af_unix.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/unix/af_unix.c 2008-04-19 15:55:39.000000000 -0400
+--- a/net/unix/af_unix.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/unix/af_unix.c 2008-04-19 15:55:39.000000000 -0400
@@ -116,6 +116,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
@@ -28132,8 +28132,8 @@
if (err)
goto out_mknod_dput;
mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
---- linux-2.6.25.4/net/x25/af_x25.c 2008-04-17 12:05:45.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/net/x25/af_x25.c 2008-04-19 15:14:52.000000000 -0400
+--- a/net/x25/af_x25.c 2008-04-17 12:05:45.000000000 -0400
++++ a/net/x25/af_x25.c 2008-04-19 15:14:52.000000000 -0400
@@ -506,7 +506,10 @@ static int x25_create(struct net *net, s
x25 = x25_sk(sk);
@@ -28146,8 +28146,8 @@
x25_init_timers(sk);
---- linux-2.6.25.4/scripts/checksyscalls.sh 2008-04-17 11:31:42.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/scripts/checksyscalls.sh 2008-04-19 15:14:52.000000000 -0400
+--- a/scripts/checksyscalls.sh 2008-04-17 11:31:42.000000000 -0400
++++ a/scripts/checksyscalls.sh 2008-04-19 15:14:52.000000000 -0400
@@ -108,7 +108,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
@@ -28156,8 +28156,8 @@
EOF
}
---- linux-2.6.25.4/security/commoncap.c 2008-04-17 12:05:46.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/security/commoncap.c 2008-04-23 22:22:54.000000000 -0400
+--- a/security/commoncap.c 2008-04-17 12:05:46.000000000 -0400
++++ a/security/commoncap.c 2008-04-23 22:22:54.000000000 -0400
@@ -24,6 +24,7 @@
#include <linux/hugetlb.h>
#include <linux/mount.h>
@@ -28211,8 +28211,8 @@
return -EPERM;
return 0;
}
---- linux-2.6.25.4/security/dummy.c 2008-04-17 12:05:46.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/security/dummy.c 2008-04-23 20:28:54.000000000 -0400
+--- a/security/dummy.c 2008-04-17 12:05:46.000000000 -0400
++++ a/security/dummy.c 2008-04-23 20:28:54.000000000 -0400
@@ -27,6 +27,7 @@
#include <linux/hugetlb.h>
#include <linux/ptrace.h>
@@ -28230,8 +28230,8 @@
return 0;
}
---- linux-2.6.25.4/security/selinux/hooks.c 2008-05-21 14:30:05.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/security/selinux/hooks.c 2008-05-21 14:30:41.000000000 -0400
+--- a/security/selinux/hooks.c 2008-05-21 14:30:05.000000000 -0400
++++ a/security/selinux/hooks.c 2008-05-21 14:30:41.000000000 -0400
@@ -64,7 +64,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
Copied: dists/sid/linux-2.6/debian/patches/series/5-extra (from r11468, /dists/sid/linux-2.6/debian/patches/series/4-extra)
==============================================================================
--- /dists/sid/linux-2.6/debian/patches/series/4-extra (original)
+++ dists/sid/linux-2.6/debian/patches/series/5-extra Sat Jun 7 08:34:14 2008
@@ -1,2 +1,2 @@
-+ features/all/vserver/vs2.3.0.34.10.patch featureset=vserver featureset=xen-vserver
++ features/all/vserver/vs2.3.0.34.11.patch featureset=vserver featureset=xen-vserver
+ features/all/vserver/bindmount-dev.patch featureset=vserver featureset=xen-vserver
More information about the Kernel-svn-changes
mailing list