-diff -NurpP --minimal linux-2.6.35.2/arch/alpha/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/Kconfig
---- linux-2.6.35.2/arch/alpha/Kconfig 2010-08-02 16:51:53.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/Kconfig 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/alpha/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/Kconfig
+--- linux-2.6.35.4/arch/alpha/Kconfig 2010-08-02 16:51:53.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/Kconfig 2010-08-02 17:05:05.000000000 +0200
@@ -681,6 +681,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/alpha/kernel/entry.S linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/entry.S
---- linux-2.6.35.2/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/entry.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/alpha/kernel/entry.S linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/entry.S
+--- linux-2.6.35.4/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/entry.S 2010-08-02 17:05:05.000000000 +0200
@@ -874,24 +874,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.35.2/arch/alpha/kernel/osf_sys.c linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/osf_sys.c
---- linux-2.6.35.2/arch/alpha/kernel/osf_sys.c 2010-07-07 18:30:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/osf_sys.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/alpha/kernel/osf_sys.c linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.35.4/arch/alpha/kernel/osf_sys.c 2010-07-07 18:30:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/osf_sys.c 2010-08-02 17:05:05.000000000 +0200
@@ -866,7 +866,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
{
if (tv) {
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.35.2/arch/alpha/kernel/ptrace.c linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/ptrace.c
---- linux-2.6.35.2/arch/alpha/kernel/ptrace.c 2010-07-07 18:30:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/ptrace.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/alpha/kernel/ptrace.c linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/ptrace.c
+--- linux-2.6.35.4/arch/alpha/kernel/ptrace.c 2010-07-07 18:30:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/ptrace.c 2010-08-02 17:05:05.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/user.h>
#include <linux/security.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/alpha/kernel/systbls.S linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/systbls.S
---- linux-2.6.35.2/arch/alpha/kernel/systbls.S 2010-02-25 11:51:19.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/systbls.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/alpha/kernel/systbls.S linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/systbls.S
+--- linux-2.6.35.4/arch/alpha/kernel/systbls.S 2010-02-25 11:51:19.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/systbls.S 2010-08-02 17:05:05.000000000 +0200
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.35.2/arch/alpha/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/traps.c
---- linux-2.6.35.2/arch/alpha/kernel/traps.c 2010-07-07 18:30:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/alpha/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/traps.c
+--- linux-2.6.35.4/arch/alpha/kernel/traps.c 2010-07-07 18:30:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.35.2/arch/arm/include/asm/tlb.h linux-2.6.35.2-vs2.3.0.36.31/arch/arm/include/asm/tlb.h
---- linux-2.6.35.2/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/arm/include/asm/tlb.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/arm/include/asm/tlb.h linux-2.6.35.4-vs2.3.0.36.32/arch/arm/include/asm/tlb.h
+--- linux-2.6.35.4/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/arm/include/asm/tlb.h 2010-08-02 17:05:05.000000000 +0200
@@ -27,6 +27,7 @@
#else /* !CONFIG_MMU */
#include <asm/pgalloc.h>
/*
-diff -NurpP --minimal linux-2.6.35.2/arch/arm/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/arm/Kconfig
---- linux-2.6.35.2/arch/arm/Kconfig 2010-08-14 18:16:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/arm/Kconfig 2010-08-14 18:19:32.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/arm/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/arm/Kconfig
+--- linux-2.6.35.4/arch/arm/Kconfig 2010-09-05 01:41:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/arm/Kconfig 2010-08-14 18:19:32.000000000 +0200
@@ -1685,6 +1685,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/arm/kernel/calls.S linux-2.6.35.2-vs2.3.0.36.31/arch/arm/kernel/calls.S
---- linux-2.6.35.2/arch/arm/kernel/calls.S 2010-07-07 18:30:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/arm/kernel/calls.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/arm/kernel/calls.S linux-2.6.35.4-vs2.3.0.36.32/arch/arm/kernel/calls.S
+--- linux-2.6.35.4/arch/arm/kernel/calls.S 2010-07-07 18:30:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/arm/kernel/calls.S 2010-08-02 17:05:05.000000000 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.35.2/arch/arm/kernel/process.c linux-2.6.35.2-vs2.3.0.36.31/arch/arm/kernel/process.c
---- linux-2.6.35.2/arch/arm/kernel/process.c 2010-08-02 16:51:55.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/arm/kernel/process.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/arm/kernel/process.c linux-2.6.35.4-vs2.3.0.36.32/arch/arm/kernel/process.c
+--- linux-2.6.35.4/arch/arm/kernel/process.c 2010-08-02 16:51:55.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/arm/kernel/process.c 2010-08-02 17:05:05.000000000 +0200
@@ -269,7 +269,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.35.2/arch/arm/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/arm/kernel/traps.c
---- linux-2.6.35.2/arch/arm/kernel/traps.c 2010-07-07 18:30:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/arm/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/arm/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/arm/kernel/traps.c
+--- linux-2.6.35.4/arch/arm/kernel/traps.c 2010-07-07 18:30:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/arm/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
@@ -243,8 +243,8 @@ static int __die(const char *str, int er
print_modules();
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.35.2/arch/avr32/mm/fault.c linux-2.6.35.2-vs2.3.0.36.31/arch/avr32/mm/fault.c
---- linux-2.6.35.2/arch/avr32/mm/fault.c 2009-09-10 15:25:20.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/avr32/mm/fault.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/avr32/mm/fault.c linux-2.6.35.4-vs2.3.0.36.32/arch/avr32/mm/fault.c
+--- linux-2.6.35.4/arch/avr32/mm/fault.c 2009-09-10 15:25:20.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/avr32/mm/fault.c 2010-08-02 17:05:05.000000000 +0200
@@ -216,7 +216,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.35.2/arch/cris/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/cris/Kconfig
---- linux-2.6.35.2/arch/cris/Kconfig 2010-08-02 16:52:03.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/cris/Kconfig 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/cris/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/cris/Kconfig
+--- linux-2.6.35.4/arch/cris/Kconfig 2010-08-02 16:52:03.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/cris/Kconfig 2010-08-02 17:05:05.000000000 +0200
@@ -694,6 +694,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/cris/mm/fault.c linux-2.6.35.2-vs2.3.0.36.31/arch/cris/mm/fault.c
---- linux-2.6.35.2/arch/cris/mm/fault.c 2010-02-25 11:51:26.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/cris/mm/fault.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/cris/mm/fault.c linux-2.6.35.4-vs2.3.0.36.32/arch/cris/mm/fault.c
+--- linux-2.6.35.4/arch/cris/mm/fault.c 2010-02-25 11:51:26.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/cris/mm/fault.c 2010-08-02 17:05:05.000000000 +0200
@@ -245,7 +245,8 @@ do_page_fault(unsigned long address, str
out_of_memory:
if (user_mode(regs))
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.35.2/arch/frv/kernel/kernel_thread.S linux-2.6.35.2-vs2.3.0.36.31/arch/frv/kernel/kernel_thread.S
---- linux-2.6.35.2/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/frv/kernel/kernel_thread.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/frv/kernel/kernel_thread.S linux-2.6.35.4-vs2.3.0.36.32/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.35.4/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/frv/kernel/kernel_thread.S 2010-08-02 17:05:05.000000000 +0200
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-2.6.35.2/arch/h8300/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/h8300/Kconfig
---- linux-2.6.35.2/arch/h8300/Kconfig 2010-02-25 11:51:26.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/h8300/Kconfig 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/h8300/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/h8300/Kconfig
+--- linux-2.6.35.4/arch/h8300/Kconfig 2010-02-25 11:51:26.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/h8300/Kconfig 2010-08-02 17:05:05.000000000 +0200
@@ -230,6 +230,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/include/asm/tlb.h linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/include/asm/tlb.h
---- linux-2.6.35.2/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/include/asm/tlb.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/include/asm/tlb.h linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/include/asm/tlb.h
+--- linux-2.6.35.4/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/include/asm/tlb.h 2010-08-02 17:05:05.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/Kconfig
---- linux-2.6.35.2/arch/ia64/Kconfig 2010-08-02 16:52:03.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/Kconfig 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/Kconfig
+--- linux-2.6.35.4/arch/ia64/Kconfig 2010-08-02 16:52:03.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/Kconfig 2010-08-02 17:05:05.000000000 +0200
@@ -676,6 +676,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/kernel/entry.S linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/entry.S
---- linux-2.6.35.2/arch/ia64/kernel/entry.S 2010-07-07 18:31:01.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/entry.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/kernel/entry.S linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/entry.S
+--- linux-2.6.35.4/arch/ia64/kernel/entry.S 2010-07-07 18:31:01.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/entry.S 2010-08-02 17:05:05.000000000 +0200
@@ -1714,7 +1714,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/kernel/perfmon.c linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/perfmon.c
---- linux-2.6.35.2/arch/ia64/kernel/perfmon.c 2010-07-07 18:31:01.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/perfmon.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/kernel/perfmon.c linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/perfmon.c
+--- linux-2.6.35.4/arch/ia64/kernel/perfmon.c 2010-07-07 18:31:01.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/perfmon.c 2010-08-02 17:05:05.000000000 +0200
@@ -42,6 +42,7 @@
#include <linux/completion.h>
#include <linux/tracehook.h>
#include <asm/errno.h>
#include <asm/intrinsics.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/kernel/process.c linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/process.c
---- linux-2.6.35.2/arch/ia64/kernel/process.c 2010-07-07 18:31:01.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/process.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/kernel/process.c linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/process.c
+--- linux-2.6.35.4/arch/ia64/kernel/process.c 2010-07-07 18:31:01.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/process.c 2010-08-02 17:05:05.000000000 +0200
@@ -113,8 +113,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
init_utsname()->release);
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/kernel/ptrace.c linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/ptrace.c
---- linux-2.6.35.2/arch/ia64/kernel/ptrace.c 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/ptrace.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/kernel/ptrace.c linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/ptrace.c
+--- linux-2.6.35.4/arch/ia64/kernel/ptrace.c 2010-08-02 16:52:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/ptrace.c 2010-08-02 17:05:05.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/traps.c
---- linux-2.6.35.2/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/traps.c
+--- linux-2.6.35.4/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
}
}
}
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/mm/fault.c linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/mm/fault.c
---- linux-2.6.35.2/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/mm/fault.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/mm/fault.c linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/mm/fault.c
+--- linux-2.6.35.4/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/mm/fault.c 2010-08-02 17:05:05.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/m32r/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/m32r/kernel/traps.c
---- linux-2.6.35.2/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/m32r/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/m32r/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/m32r/kernel/traps.c
+--- linux-2.6.35.4/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/m32r/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.35.2/arch/m68k/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/m68k/Kconfig
---- linux-2.6.35.2/arch/m68k/Kconfig 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/m68k/Kconfig 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/m68k/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/m68k/Kconfig
+--- linux-2.6.35.4/arch/m68k/Kconfig 2010-08-02 16:52:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/m68k/Kconfig 2010-08-02 17:05:05.000000000 +0200
@@ -619,6 +619,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/m68k/kernel/ptrace.c linux-2.6.35.2-vs2.3.0.36.31/arch/m68k/kernel/ptrace.c
---- linux-2.6.35.2/arch/m68k/kernel/ptrace.c 2010-07-07 18:31:02.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/m68k/kernel/ptrace.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/m68k/kernel/ptrace.c linux-2.6.35.4-vs2.3.0.36.32/arch/m68k/kernel/ptrace.c
+--- linux-2.6.35.4/arch/m68k/kernel/ptrace.c 2010-07-07 18:31:02.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/m68k/kernel/ptrace.c 2010-08-02 17:05:05.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.35.2/arch/m68k/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/m68k/kernel/traps.c
---- linux-2.6.35.2/arch/m68k/kernel/traps.c 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/m68k/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/m68k/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/m68k/kernel/traps.c
+--- linux-2.6.35.4/arch/m68k/kernel/traps.c 2010-08-02 16:52:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/m68k/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
@@ -906,8 +906,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);
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
-diff -NurpP --minimal linux-2.6.35.2/arch/m68knommu/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/m68knommu/Kconfig
---- linux-2.6.35.2/arch/m68knommu/Kconfig 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/m68knommu/Kconfig 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/m68knommu/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/m68knommu/Kconfig
+--- linux-2.6.35.4/arch/m68knommu/Kconfig 2010-08-02 16:52:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/m68knommu/Kconfig 2010-08-02 17:05:05.000000000 +0200
@@ -734,6 +734,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/m68knommu/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/m68knommu/kernel/traps.c
---- linux-2.6.35.2/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/m68knommu/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/m68knommu/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/m68knommu/kernel/traps.c
+--- linux-2.6.35.4/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/m68knommu/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
@@ -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);
show_stack(NULL, (unsigned long *)(fp + 1));
add_taint(TAINT_DIE);
do_exit(SIGSEGV);
-diff -NurpP --minimal linux-2.6.35.2/arch/mips/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/mips/Kconfig
---- linux-2.6.35.2/arch/mips/Kconfig 2010-08-02 16:52:05.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/mips/Kconfig 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/mips/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/mips/Kconfig
+--- linux-2.6.35.4/arch/mips/Kconfig 2010-08-02 16:52:05.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/mips/Kconfig 2010-08-02 17:05:05.000000000 +0200
@@ -2253,6 +2253,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/mips/kernel/ptrace.c linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/ptrace.c
---- linux-2.6.35.2/arch/mips/kernel/ptrace.c 2010-07-07 18:31:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/ptrace.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/mips/kernel/ptrace.c linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/ptrace.c
+--- linux-2.6.35.4/arch/mips/kernel/ptrace.c 2010-07-07 18:31:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/ptrace.c 2010-08-02 17:05:05.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-2.6.35.2/arch/mips/kernel/scall32-o32.S linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall32-o32.S
---- linux-2.6.35.2/arch/mips/kernel/scall32-o32.S 2010-02-25 11:51:28.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall32-o32.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/mips/kernel/scall32-o32.S linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.35.4/arch/mips/kernel/scall32-o32.S 2010-02-25 11:51:28.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall32-o32.S 2010-08-02 17:05:05.000000000 +0200
@@ -525,7 +525,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-2.6.35.2/arch/mips/kernel/scall64-64.S linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall64-64.S
---- linux-2.6.35.2/arch/mips/kernel/scall64-64.S 2010-02-25 11:51:28.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall64-64.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/mips/kernel/scall64-64.S linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall64-64.S
+--- linux-2.6.35.4/arch/mips/kernel/scall64-64.S 2010-02-25 11:51:28.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall64-64.S 2010-08-02 17:05:05.000000000 +0200
@@ -362,7 +362,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.35.2/arch/mips/kernel/scall64-n32.S linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall64-n32.S
---- linux-2.6.35.2/arch/mips/kernel/scall64-n32.S 2010-08-02 16:52:05.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall64-n32.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/mips/kernel/scall64-n32.S linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.35.4/arch/mips/kernel/scall64-n32.S 2010-08-02 16:52:05.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall64-n32.S 2010-08-02 17:05:05.000000000 +0200
@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.35.2/arch/mips/kernel/scall64-o32.S linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall64-o32.S
---- linux-2.6.35.2/arch/mips/kernel/scall64-o32.S 2010-07-07 18:31:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall64-o32.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/mips/kernel/scall64-o32.S linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.35.4/arch/mips/kernel/scall64-o32.S 2010-07-07 18:31:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall64-o32.S 2010-08-02 17:05:05.000000000 +0200
@@ -480,7 +480,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.35.2/arch/mips/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/traps.c
---- linux-2.6.35.2/arch/mips/kernel/traps.c 2010-08-02 16:52:05.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/mips/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/traps.c
+--- linux-2.6.35.4/arch/mips/kernel/traps.c 2010-08-02 16:52:05.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
@@ -340,9 +340,10 @@ void show_registers(const struct pt_regs
__show_regs(regs);
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-2.6.35.2/arch/parisc/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/Kconfig
---- linux-2.6.35.2/arch/parisc/Kconfig 2010-08-02 16:52:06.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/Kconfig 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/parisc/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/Kconfig
+--- linux-2.6.35.4/arch/parisc/Kconfig 2010-08-02 16:52:06.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/Kconfig 2010-08-02 17:05:05.000000000 +0200
@@ -299,6 +299,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/parisc/kernel/syscall_table.S linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/kernel/syscall_table.S
---- linux-2.6.35.2/arch/parisc/kernel/syscall_table.S 2010-07-07 18:31:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/kernel/syscall_table.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/parisc/kernel/syscall_table.S linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/kernel/syscall_table.S
+--- linux-2.6.35.4/arch/parisc/kernel/syscall_table.S 2010-07-07 18:31:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/kernel/syscall_table.S 2010-08-02 17:05:05.000000000 +0200
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.35.2/arch/parisc/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/kernel/traps.c
---- linux-2.6.35.2/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/parisc/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/kernel/traps.c
+--- linux-2.6.35.4/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-2.6.35.2/arch/parisc/mm/fault.c linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/mm/fault.c
---- linux-2.6.35.2/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/mm/fault.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/parisc/mm/fault.c linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/mm/fault.c
+--- linux-2.6.35.4/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/mm/fault.c 2010-08-02 17:05:05.000000000 +0200
@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
if (vma) {
printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
vma->vm_start, vma->vm_end);
-diff -NurpP --minimal linux-2.6.35.2/arch/powerpc/include/asm/unistd.h linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/include/asm/unistd.h
---- linux-2.6.35.2/arch/powerpc/include/asm/unistd.h 2010-07-07 18:31:05.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/include/asm/unistd.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/powerpc/include/asm/unistd.h linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/include/asm/unistd.h
+--- linux-2.6.35.4/arch/powerpc/include/asm/unistd.h 2010-07-07 18:31:05.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/include/asm/unistd.h 2010-08-02 17:05:05.000000000 +0200
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-2.6.35.2/arch/powerpc/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/Kconfig
---- linux-2.6.35.2/arch/powerpc/Kconfig 2010-08-02 16:52:06.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/Kconfig 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/powerpc/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/Kconfig
+--- linux-2.6.35.4/arch/powerpc/Kconfig 2010-08-02 16:52:06.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/Kconfig 2010-08-02 17:05:05.000000000 +0200
@@ -990,6 +990,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.35.2/arch/powerpc/kernel/process.c linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/kernel/process.c
---- linux-2.6.35.2/arch/powerpc/kernel/process.c 2010-08-02 16:52:07.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/kernel/process.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/powerpc/kernel/process.c linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/kernel/process.c
+--- linux-2.6.35.4/arch/powerpc/kernel/process.c 2010-08-02 16:52:07.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/kernel/process.c 2010-08-02 17:05:05.000000000 +0200
@@ -605,8 +605,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-2.6.35.2/arch/powerpc/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/kernel/traps.c
---- linux-2.6.35.2/arch/powerpc/kernel/traps.c 2010-08-02 16:52:07.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/powerpc/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/kernel/traps.c
+--- linux-2.6.35.4/arch/powerpc/kernel/traps.c 2010-08-02 16:52:07.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200
@@ -1053,8 +1053,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-2.6.35.2/arch/powerpc/kernel/vdso.c linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/kernel/vdso.c
---- linux-2.6.35.2/arch/powerpc/kernel/vdso.c 2010-08-02 16:52:07.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/kernel/vdso.c 2010-08-02 17:43:41.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/powerpc/kernel/vdso.c linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/kernel/vdso.c
+--- linux-2.6.35.4/arch/powerpc/kernel/vdso.c 2010-08-02 16:52:07.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/kernel/vdso.c 2010-08-02 17:43:41.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/security.h>
#include <linux/bootmem.h>
#include <asm/pgtable.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/s390/include/asm/tlb.h linux-2.6.35.2-vs2.3.0.36.31/arch/s390/include/asm/tlb.h
---- linux-2.6.35.2/arch/s390/include/asm/tlb.h 2009-09-10 15:25:43.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/s390/include/asm/tlb.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/s390/include/asm/tlb.h linux-2.6.35.4-vs2.3.0.36.32/arch/s390/include/asm/tlb.h
+--- linux-2.6.35.4/arch/s390/include/asm/tlb.h 2009-09-10 15:25:43.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/s390/include/asm/tlb.h 2010-08-02 17:05:05.000000000 +0200
@@ -23,6 +23,8 @@
#include <linux/mm.h>
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/smp.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/s390/include/asm/unistd.h linux-2.6.35.2-vs2.3.0.36.31/arch/s390/include/asm/unistd.h
---- linux-2.6.35.2/arch/s390/include/asm/unistd.h 2010-07-07 18:31:06.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/s390/include/asm/unistd.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/s390/include/asm/unistd.h linux-2.6.35.4-vs2.3.0.36.32/arch/s390/include/asm/unistd.h
+--- linux-2.6.35.4/arch/s390/include/asm/unistd.h 2010-07-07 18:31:06.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/s390/include/asm/unistd.h 2010-08-02 17:05:05.000000000 +0200
@@ -202,7 +202,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-2.6.35.2/arch/s390/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/s390/Kconfig
---- linux-2.6.35.2/arch/s390/Kconfig 2010-08-02 16:52:08.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/s390/Kconfig 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/s390/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/s390/Kconfig
+--- linux-2.6.35.4/arch/s390/Kconfig 2010-08-02 16:52:08.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/s390/Kconfig 2010-08-02 17:05:05.000000000 +0200
@@ -623,6 +623,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/s390/kernel/ptrace.c linux-2.6.35.2-vs2.3.0.36.31/arch/s390/kernel/ptrace.c
---- linux-2.6.35.2/arch/s390/kernel/ptrace.c 2010-08-02 16:52:09.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/s390/kernel/ptrace.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/s390/kernel/ptrace.c linux-2.6.35.4-vs2.3.0.36.32/arch/s390/kernel/ptrace.c
+--- linux-2.6.35.4/arch/s390/kernel/ptrace.c 2010-08-02 16:52:09.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/s390/kernel/ptrace.c 2010-08-02 17:05:05.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/regset.h>
#include <linux/tracehook.h>
#include <trace/syscall.h>
#include <asm/compat.h>
#include <asm/segment.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/s390/kernel/syscalls.S linux-2.6.35.2-vs2.3.0.36.31/arch/s390/kernel/syscalls.S
---- linux-2.6.35.2/arch/s390/kernel/syscalls.S 2010-07-07 18:31:07.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/s390/kernel/syscalls.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/s390/kernel/syscalls.S linux-2.6.35.4-vs2.3.0.36.32/arch/s390/kernel/syscalls.S
+--- linux-2.6.35.4/arch/s390/kernel/syscalls.S 2010-07-07 18:31:07.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/s390/kernel/syscalls.S 2010-08-02 17:05:05.000000000 +0200
@@ -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)
SYSCALL(sys_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)
-diff -NurpP --minimal linux-2.6.35.2/arch/sh/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/sh/Kconfig
---- linux-2.6.35.2/arch/sh/Kconfig 2010-08-02 16:52:09.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/sh/Kconfig 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/sh/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/sh/Kconfig
+--- linux-2.6.35.4/arch/sh/Kconfig 2010-08-02 16:52:09.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/sh/Kconfig 2010-08-02 17:05:05.000000000 +0200
@@ -881,6 +881,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/sh/kernel/irq.c linux-2.6.35.2-vs2.3.0.36.31/arch/sh/kernel/irq.c
---- linux-2.6.35.2/arch/sh/kernel/irq.c 2010-08-02 16:52:10.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/sh/kernel/irq.c 2010-08-02 17:41:50.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/sh/kernel/irq.c linux-2.6.35.4-vs2.3.0.36.32/arch/sh/kernel/irq.c
+--- linux-2.6.35.4/arch/sh/kernel/irq.c 2010-08-02 16:52:10.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/sh/kernel/irq.c 2010-08-02 17:41:50.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/seq_file.h>
#include <linux/ftrace.h>
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.35.2-vs2.3.0.36.31/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-2.6.35.2/arch/sh/kernel/vsyscall/vsyscall.c 2010-07-07 18:31:10.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/sh/kernel/vsyscall/vsyscall.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.35.4-vs2.3.0.36.32/arch/sh/kernel/vsyscall/vsyscall.c
+--- linux-2.6.35.4/arch/sh/kernel/vsyscall/vsyscall.c 2010-07-07 18:31:10.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/sh/kernel/vsyscall/vsyscall.c 2010-08-02 17:05:05.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/elf.h>
#include <linux/sched.h>
/*
* Should the kernel map a VDSO page into processes and pass its
-diff -NurpP --minimal linux-2.6.35.2/arch/sparc/include/asm/tlb_64.h linux-2.6.35.2-vs2.3.0.36.31/arch/sparc/include/asm/tlb_64.h
---- linux-2.6.35.2/arch/sparc/include/asm/tlb_64.h 2009-09-10 15:25:45.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/sparc/include/asm/tlb_64.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/sparc/include/asm/tlb_64.h linux-2.6.35.4-vs2.3.0.36.32/arch/sparc/include/asm/tlb_64.h
+--- linux-2.6.35.4/arch/sparc/include/asm/tlb_64.h 2009-09-10 15:25:45.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/sparc/include/asm/tlb_64.h 2010-08-02 17:05:05.000000000 +0200
@@ -3,6 +3,7 @@
#include <linux/swap.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/sparc/include/asm/unistd.h linux-2.6.35.2-vs2.3.0.36.31/arch/sparc/include/asm/unistd.h
---- linux-2.6.35.2/arch/sparc/include/asm/unistd.h 2010-07-07 18:31:10.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/sparc/include/asm/unistd.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/sparc/include/asm/unistd.h linux-2.6.35.4-vs2.3.0.36.32/arch/sparc/include/asm/unistd.h
+--- linux-2.6.35.4/arch/sparc/include/asm/unistd.h 2010-07-07 18:31:10.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/sparc/include/asm/unistd.h 2010-08-02 17:05:05.000000000 +0200
@@ -335,7 +335,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.35.2/arch/sparc/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/sparc/Kconfig
---- linux-2.6.35.2/arch/sparc/Kconfig 2010-08-02 16:52:10.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/sparc/Kconfig 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/sparc/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/sparc/Kconfig
+--- linux-2.6.35.4/arch/sparc/Kconfig 2010-08-02 16:52:10.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/sparc/Kconfig 2010-08-02 17:05:05.000000000 +0200
@@ -570,6 +570,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/sparc/kernel/systbls_32.S linux-2.6.35.2-vs2.3.0.36.31/arch/sparc/kernel/systbls_32.S
---- linux-2.6.35.2/arch/sparc/kernel/systbls_32.S 2010-02-25 11:51:34.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/sparc/kernel/systbls_32.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/sparc/kernel/systbls_32.S linux-2.6.35.4-vs2.3.0.36.32/arch/sparc/kernel/systbls_32.S
+--- linux-2.6.35.4/arch/sparc/kernel/systbls_32.S 2010-02-25 11:51:34.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/sparc/kernel/systbls_32.S 2010-08-02 17:05:05.000000000 +0200
@@ -70,7 +70,7 @@ sys_call_table:
/*250*/ .long sys_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
/*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
-diff -NurpP --minimal linux-2.6.35.2/arch/sparc/kernel/systbls_64.S linux-2.6.35.2-vs2.3.0.36.31/arch/sparc/kernel/systbls_64.S
---- linux-2.6.35.2/arch/sparc/kernel/systbls_64.S 2010-07-07 18:31:10.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/sparc/kernel/systbls_64.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/sparc/kernel/systbls_64.S linux-2.6.35.4-vs2.3.0.36.32/arch/sparc/kernel/systbls_64.S
+--- linux-2.6.35.4/arch/sparc/kernel/systbls_64.S 2010-07-07 18:31:10.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/sparc/kernel/systbls_64.S 2010-08-02 17:05:05.000000000 +0200
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys_mremap, compat_sys_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
/*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
-diff -NurpP --minimal linux-2.6.35.2/arch/um/include/asm/tlb.h linux-2.6.35.2-vs2.3.0.36.31/arch/um/include/asm/tlb.h
---- linux-2.6.35.2/arch/um/include/asm/tlb.h 2009-09-10 15:25:46.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/um/include/asm/tlb.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/um/include/asm/tlb.h linux-2.6.35.4-vs2.3.0.36.32/arch/um/include/asm/tlb.h
+--- linux-2.6.35.4/arch/um/include/asm/tlb.h 2009-09-10 15:25:46.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/um/include/asm/tlb.h 2010-08-02 17:05:05.000000000 +0200
@@ -3,6 +3,7 @@
#include <linux/pagemap.h>
#include <asm/percpu.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/um/include/shared/kern_constants.h linux-2.6.35.2-vs2.3.0.36.31/arch/um/include/shared/kern_constants.h
---- linux-2.6.35.2/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/um/include/shared/kern_constants.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/um/include/shared/kern_constants.h linux-2.6.35.4-vs2.3.0.36.32/arch/um/include/shared/kern_constants.h
+--- linux-2.6.35.4/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/um/include/shared/kern_constants.h 2010-08-02 17:05:05.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../include/generated/asm-offsets.h"
-diff -NurpP --minimal linux-2.6.35.2/arch/um/include/shared/user_constants.h linux-2.6.35.2-vs2.3.0.36.31/arch/um/include/shared/user_constants.h
---- linux-2.6.35.2/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/um/include/shared/user_constants.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/um/include/shared/user_constants.h linux-2.6.35.4-vs2.3.0.36.32/arch/um/include/shared/user_constants.h
+--- linux-2.6.35.4/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/um/include/shared/user_constants.h 2010-08-02 17:05:05.000000000 +0200
@@ -0,0 +1,40 @@
+/*
+ * DO NOT MODIFY.
+#define UM_PROT_WRITE 2 /* PROT_WRITE # */
+#define UM_PROT_EXEC 4 /* PROT_EXEC # */
+
-diff -NurpP --minimal linux-2.6.35.2/arch/um/Kconfig.rest linux-2.6.35.2-vs2.3.0.36.31/arch/um/Kconfig.rest
---- linux-2.6.35.2/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/um/Kconfig.rest 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/um/Kconfig.rest linux-2.6.35.4-vs2.3.0.36.32/arch/um/Kconfig.rest
+--- linux-2.6.35.4/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/um/Kconfig.rest 2010-08-02 17:05:05.000000000 +0200
@@ -18,6 +18,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/um/kernel/config.c linux-2.6.35.2-vs2.3.0.36.31/arch/um/kernel/config.c
---- linux-2.6.35.2/arch/um/kernel/config.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/um/kernel/config.c 2010-08-02 17:05:05.000000000 +0200
-@@ -0,0 +1,417 @@
-+/*
-+ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
-+ * Licensed under the GPL
-+ */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include "init.h"
-+
-+static __initdata const char *config[] = {
-+
-+"#\n",
-+"# Automatically generated make config: don't edit\n",
-+"# Linux kernel version: 2.6.33-vs2.3.0.36.29.1\n",
-+"# Wed Mar 10 20:29:46 2010\n",
-+"#\n",
-+"CONFIG_DEFCONFIG_LIST=\"arch/$ARCH/defconfig\"\n",
-+"CONFIG_GENERIC_HARDIRQS=y\n",
-+"CONFIG_UML=y\n",
-+"CONFIG_MMU=y\n",
-+"CONFIG_NO_IOMEM=y\n",
-+"# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set\n",
-+"CONFIG_LOCKDEP_SUPPORT=y\n",
-+"# CONFIG_STACKTRACE_SUPPORT is not set\n",
-+"CONFIG_GENERIC_CALIBRATE_DELAY=y\n",
-+"CONFIG_GENERIC_BUG=y\n",
-+"CONFIG_GENERIC_TIME=y\n",
-+"CONFIG_GENERIC_CLOCKEVENTS=y\n",
-+"CONFIG_IRQ_RELEASE_METHOD=y\n",
-+"CONFIG_HZ=100\n",
-+"\n",
-+"#\n",
-+"# UML-specific options\n",
-+"#\n",
-+"\n",
-+"#\n",
-+"# Host processor type and features\n",
-+"#\n",
-+"# CONFIG_M386 is not set\n",
-+"# CONFIG_M486 is not set\n",
-+"# CONFIG_M586 is not set\n",
-+"# CONFIG_M586TSC is not set\n",
-+"# CONFIG_M586MMX is not set\n",
-+"# CONFIG_M686 is not set\n",
-+"# CONFIG_MPENTIUMII is not set\n",
-+"# CONFIG_MPENTIUMIII is not set\n",
-+"# CONFIG_MPENTIUMM is not set\n",
-+"# CONFIG_MPENTIUM4 is not set\n",
-+"# CONFIG_MK6 is not set\n",
-+"# CONFIG_MK7 is not set\n",
-+"CONFIG_MK8=y\n",
-+"# CONFIG_MCRUSOE is not set\n",
-+"# CONFIG_MEFFICEON is not set\n",
-+"# CONFIG_MWINCHIPC6 is not set\n",
-+"# CONFIG_MWINCHIP3D is not set\n",
-+"# CONFIG_MGEODEGX1 is not set\n",
-+"# CONFIG_MGEODE_LX is not set\n",
-+"# CONFIG_MCYRIXIII is not set\n",
-+"# CONFIG_MVIAC3_2 is not set\n",
-+"# CONFIG_MVIAC7 is not set\n",
-+"# CONFIG_MPSC is not set\n",
-+"# CONFIG_MCORE2 is not set\n",
-+"# CONFIG_MATOM is not set\n",
-+"# CONFIG_GENERIC_CPU is not set\n",
-+"CONFIG_X86_CPU=y\n",
-+"CONFIG_X86_INTERNODE_CACHE_SHIFT=6\n",
-+"# CONFIG_X86_CMPXCHG is not set\n",
-+"CONFIG_X86_L1_CACHE_SHIFT=6\n",
-+"CONFIG_X86_WP_WORKS_OK=y\n",
-+"CONFIG_X86_INTEL_USERCOPY=y\n",
-+"CONFIG_X86_USE_PPRO_CHECKSUM=y\n",
-+"CONFIG_X86_TSC=y\n",
-+"CONFIG_X86_CMOV=y\n",
-+"CONFIG_X86_MINIMUM_CPU_FAMILY=3\n",
-+"CONFIG_CPU_SUP_INTEL=y\n",
-+"CONFIG_CPU_SUP_AMD=y\n",
-+"CONFIG_CPU_SUP_CENTAUR=y\n",
-+"CONFIG_UML_X86=y\n",
-+"CONFIG_64BIT=y\n",
-+"# CONFIG_X86_32 is not set\n",
-+"# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set\n",
-+"CONFIG_RWSEM_GENERIC_SPINLOCK=y\n",
-+"# CONFIG_ARCH_HAS_SC_SIGNALS is not set\n",
-+"# CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA is not set\n",
-+"CONFIG_SMP_BROKEN=y\n",
-+"CONFIG_GENERIC_HWEIGHT=y\n",
-+"# CONFIG_STATIC_LINK is not set\n",
-+"CONFIG_FLATMEM=y\n",
-+"CONFIG_FLAT_NODE_MEM_MAP=y\n",
-+"CONFIG_PAGEFLAGS_EXTENDED=y\n",
-+"CONFIG_SPLIT_PTLOCK_CPUS=4\n",
-+"CONFIG_PHYS_ADDR_T_64BIT=y\n",
-+"CONFIG_ZONE_DMA_FLAG=0\n",
-+"CONFIG_VIRT_TO_BUS=y\n",
-+"# CONFIG_KSM is not set\n",
-+"CONFIG_DEFAULT_MMAP_MIN_ADDR=4096\n",
-+"# CONFIG_NO_HZ is not set\n",
-+"# CONFIG_HIGH_RES_TIMERS is not set\n",
-+"CONFIG_GENERIC_CLOCKEVENTS_BUILD=y\n",
-+"CONFIG_LD_SCRIPT_DYN=y\n",
-+"# CONFIG_BINFMT_ELF is not set\n",
-+"# CONFIG_HAVE_AOUT is not set\n",
-+"# CONFIG_BINFMT_MISC is not set\n",
-+"# CONFIG_HOSTFS is not set\n",
-+"# CONFIG_MCONSOLE is not set\n",
-+"CONFIG_KERNEL_STACK_ORDER=1\n",
-+"\n",
-+"#\n",
-+"# General setup\n",
-+"#\n",
-+"# CONFIG_EXPERIMENTAL is not set\n",
-+"CONFIG_BROKEN_ON_SMP=y\n",
-+"CONFIG_INIT_ENV_ARG_LIMIT=128\n",
-+"CONFIG_LOCALVERSION=\"\"\n",
-+"# CONFIG_LOCALVERSION_AUTO is not set\n",
-+"# CONFIG_SWAP is not set\n",
-+"CONFIG_SYSVIPC=y\n",
-+"CONFIG_SYSVIPC_SYSCTL=y\n",
-+"# CONFIG_BSD_PROCESS_ACCT is not set\n",
-+"\n",
-+"#\n",
-+"# RCU Subsystem\n",
-+"#\n",
-+"CONFIG_TREE_RCU=y\n",
-+"# CONFIG_TREE_PREEMPT_RCU is not set\n",
-+"# CONFIG_TINY_RCU is not set\n",
-+"# CONFIG_RCU_TRACE is not set\n",
-+"CONFIG_RCU_FANOUT=64\n",
-+"# CONFIG_RCU_FANOUT_EXACT is not set\n",
-+"# CONFIG_TREE_RCU_TRACE is not set\n",
-+"# CONFIG_IKCONFIG is not set\n",
-+"CONFIG_LOG_BUF_SHIFT=17\n",
-+"# CONFIG_CGROUPS is not set\n",
-+"# CONFIG_SYSFS_DEPRECATED_V2 is not set\n",
-+"# CONFIG_RELAY is not set\n",
-+"CONFIG_NAMESPACES=y\n",
-+"CONFIG_UTS_NS=y\n",
-+"CONFIG_IPC_NS=y\n",
-+"CONFIG_USER_NS=y\n",
-+"# CONFIG_BLK_DEV_INITRD is not set\n",
-+"# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set\n",
-+"CONFIG_SYSCTL=y\n",
-+"CONFIG_ANON_INODES=y\n",
-+"# CONFIG_EMBEDDED is not set\n",
-+"CONFIG_UID16=y\n",
-+"CONFIG_SYSCTL_SYSCALL=y\n",
-+"CONFIG_KALLSYMS=y\n",
-+"# CONFIG_KALLSYMS_EXTRA_PASS is not set\n",
-+"CONFIG_HOTPLUG=y\n",
-+"CONFIG_PRINTK=y\n",
-+"CONFIG_BUG=y\n",
-+"CONFIG_ELF_CORE=y\n",
-+"CONFIG_BASE_FULL=y\n",
-+"CONFIG_FUTEX=y\n",
-+"CONFIG_EPOLL=y\n",
-+"CONFIG_SIGNALFD=y\n",
-+"CONFIG_TIMERFD=y\n",
-+"CONFIG_EVENTFD=y\n",
-+"CONFIG_SHMEM=y\n",
-+"CONFIG_AIO=y\n",
-+"\n",
-+"#\n",
-+"# Kernel Performance Events And Counters\n",
-+"#\n",
-+"CONFIG_VM_EVENT_COUNTERS=y\n",
-+"CONFIG_SLUB_DEBUG=y\n",
-+"# CONFIG_COMPAT_BRK is not set\n",
-+"# CONFIG_SLAB is not set\n",
-+"CONFIG_SLUB=y\n",
-+"# CONFIG_SLOB is not set\n",
-+"# CONFIG_PROFILING is not set\n",
-+"\n",
-+"#\n",
-+"# GCOV-based kernel profiling\n",
-+"#\n",
-+"# CONFIG_SLOW_WORK is not set\n",
-+"# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set\n",
-+"CONFIG_SLABINFO=y\n",
-+"CONFIG_RT_MUTEXES=y\n",
-+"CONFIG_BASE_SMALL=0\n",
-+"# CONFIG_MODULES is not set\n",
-+"CONFIG_BLOCK=y\n",
-+"# CONFIG_BLK_DEV_BSG is not set\n",
-+"# CONFIG_BLK_DEV_INTEGRITY is not set\n",
-+"\n",
-+"#\n",
-+"# IO Schedulers\n",
-+"#\n",
-+"CONFIG_IOSCHED_NOOP=y\n",
-+"# CONFIG_IOSCHED_DEADLINE is not set\n",
-+"# CONFIG_IOSCHED_CFQ is not set\n",
-+"# CONFIG_DEFAULT_DEADLINE is not set\n",
-+"# CONFIG_DEFAULT_CFQ is not set\n",
-+"CONFIG_DEFAULT_NOOP=y\n",
-+"CONFIG_DEFAULT_IOSCHED=\"noop\"\n",
-+"# CONFIG_INLINE_SPIN_TRYLOCK is not set\n",
-+"# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set\n",
-+"# CONFIG_INLINE_SPIN_LOCK is not set\n",
-+"# CONFIG_INLINE_SPIN_LOCK_BH is not set\n",
-+"# CONFIG_INLINE_SPIN_LOCK_IRQ is not set\n",
-+"# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set\n",
-+"CONFIG_INLINE_SPIN_UNLOCK=y\n",
-+"# CONFIG_INLINE_SPIN_UNLOCK_BH is not set\n",
-+"CONFIG_INLINE_SPIN_UNLOCK_IRQ=y\n",
-+"# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set\n",
-+"# CONFIG_INLINE_READ_TRYLOCK is not set\n",
-+"# CONFIG_INLINE_READ_LOCK is not set\n",
-+"# CONFIG_INLINE_READ_LOCK_BH is not set\n",
-+"# CONFIG_INLINE_READ_LOCK_IRQ is not set\n",
-+"# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set\n",
-+"CONFIG_INLINE_READ_UNLOCK=y\n",
-+"# CONFIG_INLINE_READ_UNLOCK_BH is not set\n",
-+"CONFIG_INLINE_READ_UNLOCK_IRQ=y\n",
-+"# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set\n",
-+"# CONFIG_INLINE_WRITE_TRYLOCK is not set\n",
-+"# CONFIG_INLINE_WRITE_LOCK is not set\n",
-+"# CONFIG_INLINE_WRITE_LOCK_BH is not set\n",
-+"# CONFIG_INLINE_WRITE_LOCK_IRQ is not set\n",
-+"# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set\n",
-+"CONFIG_INLINE_WRITE_UNLOCK=y\n",
-+"# CONFIG_INLINE_WRITE_UNLOCK_BH is not set\n",
-+"CONFIG_INLINE_WRITE_UNLOCK_IRQ=y\n",
-+"# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set\n",
-+"# CONFIG_MUTEX_SPIN_ON_OWNER is not set\n",
-+"# CONFIG_FREEZER is not set\n",
-+"# CONFIG_BLK_DEV is not set\n",
-+"\n",
-+"#\n",
-+"# Character Devices\n",
-+"#\n",
-+"# CONFIG_STDERR_CONSOLE is not set\n",
-+"CONFIG_STDIO_CONSOLE=y\n",
-+"# CONFIG_SSL is not set\n",
-+"# CONFIG_NULL_CHAN is not set\n",
-+"# CONFIG_PORT_CHAN is not set\n",
-+"# CONFIG_PTY_CHAN is not set\n",
-+"# CONFIG_TTY_CHAN is not set\n",
-+"# CONFIG_XTERM_CHAN is not set\n",
-+"CONFIG_NOCONFIG_CHAN=y\n",
-+"CONFIG_CON_ZERO_CHAN=\"fd:0,fd:1\"\n",
-+"CONFIG_CON_CHAN=\"xterm\"\n",
-+"CONFIG_SSL_CHAN=\"pty\"\n",
-+"# CONFIG_UNIX98_PTYS is not set\n",
-+"# CONFIG_LEGACY_PTYS is not set\n",
-+"# CONFIG_RAW_DRIVER is not set\n",
-+"# CONFIG_WATCHDOG is not set\n",
-+"# CONFIG_UML_SOUND is not set\n",
-+"# CONFIG_SOUND is not set\n",
-+"# CONFIG_SOUND_OSS_CORE is not set\n",
-+"# CONFIG_HOSTAUDIO is not set\n",
-+"# CONFIG_HW_RANDOM is not set\n",
-+"# CONFIG_UML_RANDOM is not set\n",
-+"# CONFIG_MMAPPER is not set\n",
-+"\n",
-+"#\n",
-+"# Generic Driver Options\n",
-+"#\n",
-+"CONFIG_UEVENT_HELPER_PATH=\"/sbin/hotplug\"\n",
-+"CONFIG_STANDALONE=y\n",
-+"# CONFIG_PREVENT_FIRMWARE_BUILD is not set\n",
-+"CONFIG_FW_LOADER=y\n",
-+"# CONFIG_FIRMWARE_IN_KERNEL is not set\n",
-+"CONFIG_EXTRA_FIRMWARE=\"\"\n",
-+"# CONFIG_SYS_HYPERVISOR is not set\n",
-+"# CONFIG_NET is not set\n",
-+"\n",
-+"#\n",
-+"# File systems\n",
-+"#\n",
-+"# CONFIG_EXT2_FS is not set\n",
-+"# CONFIG_EXT3_FS is not set\n",
-+"# CONFIG_EXT4_FS is not set\n",
-+"# CONFIG_REISERFS_FS is not set\n",
-+"# CONFIG_JFS_FS is not set\n",
-+"# CONFIG_FS_POSIX_ACL is not set\n",
-+"# CONFIG_XFS_FS is not set\n",
-+"CONFIG_FILE_LOCKING=y\n",
-+"# CONFIG_FSNOTIFY is not set\n",
-+"# CONFIG_DNOTIFY is not set\n",
-+"# CONFIG_INOTIFY is not set\n",
-+"# CONFIG_INOTIFY_USER is not set\n",
-+"# CONFIG_QUOTA is not set\n",
-+"# CONFIG_AUTOFS_FS is not set\n",
-+"# CONFIG_AUTOFS4_FS is not set\n",
-+"# CONFIG_FUSE_FS is not set\n",
-+"\n",
-+"#\n",
-+"# Caches\n",
-+"#\n",
-+"\n",
-+"#\n",
-+"# CD-ROM/DVD Filesystems\n",
-+"#\n",
-+"# CONFIG_ISO9660_FS is not set\n",
-+"# CONFIG_UDF_FS is not set\n",
-+"\n",
-+"#\n",
-+"# DOS/FAT/NT Filesystems\n",
-+"#\n",
-+"# CONFIG_MSDOS_FS is not set\n",
-+"# CONFIG_VFAT_FS is not set\n",
-+"# CONFIG_NTFS_FS is not set\n",
-+"\n",
-+"#\n",
-+"# Pseudo filesystems\n",
-+"#\n",
-+"CONFIG_PROC_FS=y\n",
-+"# CONFIG_PROC_KCORE is not set\n",
-+"CONFIG_PROC_SYSCTL=y\n",
-+"CONFIG_PROC_PAGE_MONITOR=y\n",
-+"CONFIG_SYSFS=y\n",
-+"# CONFIG_TMPFS is not set\n",
-+"# CONFIG_HUGETLB_PAGE is not set\n",
-+"# CONFIG_CONFIGFS_FS is not set\n",
-+"# CONFIG_MISC_FILESYSTEMS is not set\n",
-+"\n",
-+"#\n",
-+"# Partition Types\n",
-+"#\n",
-+"# CONFIG_PARTITION_ADVANCED is not set\n",
-+"CONFIG_MSDOS_PARTITION=y\n",
-+"# CONFIG_NLS is not set\n",
-+"\n",
-+"#\n",
-+"# Linux VServer\n",
-+"#\n",
-+"# CONFIG_VSERVER_AUTO_LBACK is not set\n",
-+"# CONFIG_VSERVER_COWBL is not set\n",
-+"# CONFIG_VSERVER_PROC_SECURE is not set\n",
-+"# CONFIG_VSERVER_HARDCPU is not set\n",
-+"# CONFIG_TAGGING_NONE is not set\n",
-+"# CONFIG_TAGGING_UID16 is not set\n",
-+"# CONFIG_TAGGING_GID16 is not set\n",
-+"CONFIG_TAGGING_ID24=y\n",
-+"# CONFIG_TAGGING_INTERN is not set\n",
-+"# CONFIG_TAG_NFSD is not set\n",
-+"# CONFIG_VSERVER_PRIVACY is not set\n",
-+"CONFIG_VSERVER_CONTEXTS=768\n",
-+"# CONFIG_VSERVER_WARN is not set\n",
-+"# CONFIG_VSERVER_DEBUG is not set\n",
-+"CONFIG_VSERVER=y\n",
-+"\n",
-+"#\n",
-+"# Security options\n",
-+"#\n",
-+"# CONFIG_KEYS is not set\n",
-+"# CONFIG_SECURITY is not set\n",
-+"# CONFIG_SECURITYFS is not set\n",
-+"# CONFIG_DEFAULT_SECURITY_SELINUX is not set\n",
-+"# CONFIG_DEFAULT_SECURITY_SMACK is not set\n",
-+"# CONFIG_DEFAULT_SECURITY_TOMOYO is not set\n",
-+"CONFIG_DEFAULT_SECURITY_DAC=y\n",
-+"CONFIG_DEFAULT_SECURITY=\"\"\n",
-+"# CONFIG_CRYPTO is not set\n",
-+"# CONFIG_BINARY_PRINTF is not set\n",
-+"\n",
-+"#\n",
-+"# Library routines\n",
-+"#\n",
-+"CONFIG_GENERIC_FIND_FIRST_BIT=y\n",
-+"CONFIG_GENERIC_FIND_NEXT_BIT=y\n",
-+"CONFIG_GENERIC_FIND_LAST_BIT=y\n",
-+"# CONFIG_CRC_CCITT is not set\n",
-+"# CONFIG_CRC16 is not set\n",
-+"# CONFIG_CRC_T10DIF is not set\n",
-+"# CONFIG_CRC_ITU_T is not set\n",
-+"# CONFIG_CRC32 is not set\n",
-+"# CONFIG_CRC7 is not set\n",
-+"# CONFIG_LIBCRC32C is not set\n",
-+"CONFIG_HAS_DMA=y\n",
-+"\n",
-+"#\n",
-+"# SCSI device support\n",
-+"#\n",
-+"# CONFIG_RAID_ATTRS is not set\n",
-+"# CONFIG_SCSI is not set\n",
-+"# CONFIG_SCSI_DMA is not set\n",
-+"# CONFIG_SCSI_NETLINK is not set\n",
-+"# CONFIG_MD is not set\n",
-+"# CONFIG_NEW_LEDS is not set\n",
-+"# CONFIG_INPUT is not set\n",
-+"\n",
-+"#\n",
-+"# Kernel hacking\n",
-+"#\n",
-+"# CONFIG_PRINTK_TIME is not set\n",
-+"# CONFIG_ENABLE_WARN_DEPRECATED is not set\n",
-+"# CONFIG_ENABLE_MUST_CHECK is not set\n",
-+"CONFIG_FRAME_WARN=2048\n",
-+"# CONFIG_STRIP_ASM_SYMS is not set\n",
-+"# CONFIG_UNUSED_SYMBOLS is not set\n",
-+"# CONFIG_DEBUG_FS is not set\n",
-+"# CONFIG_DEBUG_KERNEL is not set\n",
-+"# CONFIG_SLUB_DEBUG_ON is not set\n",
-+"# CONFIG_SLUB_STATS is not set\n",
-+"CONFIG_DEBUG_BUGVERBOSE=y\n",
-+"CONFIG_DEBUG_MEMORY_INIT=y\n",
-+"# CONFIG_RCU_CPU_STALL_DETECTOR is not set\n",
-+"# CONFIG_SYSCTL_SYSCALL_CHECK is not set\n",
-+"# CONFIG_SAMPLES is not set\n",
-+"# CONFIG_DEBUG_STACK_USAGE is not set\n",
-+""
-+};
-+
-+static int __init print_config(char *line, int *add)
-+{
-+ int i;
-+ for (i = 0; i < sizeof(config)/sizeof(config[0]); i++)
-+ printf("%s", config[i]);
-+ exit(0);
-+}
-+
-+__uml_setup("--showconfig", print_config,
-+"--showconfig\n"
-+" Prints the config file that this UML binary was generated from.\n\n"
-+);
-+
-diff -NurpP --minimal linux-2.6.35.2/arch/um/kernel/config.tmp linux-2.6.35.2-vs2.3.0.36.31/arch/um/kernel/config.tmp
---- linux-2.6.35.2/arch/um/kernel/config.tmp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/um/kernel/config.tmp 2010-08-02 17:05:05.000000000 +0200
-@@ -0,0 +1,390 @@
-+"#\n",
-+"# Automatically generated make config: don't edit\n",
-+"# Linux kernel version: 2.6.33-vs2.3.0.36.29.1\n",
-+"# Wed Mar 10 20:29:46 2010\n",
-+"#\n",
-+"CONFIG_DEFCONFIG_LIST=\"arch/$ARCH/defconfig\"\n",
-+"CONFIG_GENERIC_HARDIRQS=y\n",
-+"CONFIG_UML=y\n",
-+"CONFIG_MMU=y\n",
-+"CONFIG_NO_IOMEM=y\n",
-+"# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set\n",
-+"CONFIG_LOCKDEP_SUPPORT=y\n",
-+"# CONFIG_STACKTRACE_SUPPORT is not set\n",
-+"CONFIG_GENERIC_CALIBRATE_DELAY=y\n",
-+"CONFIG_GENERIC_BUG=y\n",
-+"CONFIG_GENERIC_TIME=y\n",
-+"CONFIG_GENERIC_CLOCKEVENTS=y\n",
-+"CONFIG_IRQ_RELEASE_METHOD=y\n",
-+"CONFIG_HZ=100\n",
-+"\n",
-+"#\n",
-+"# UML-specific options\n",
-+"#\n",
-+"\n",
-+"#\n",
-+"# Host processor type and features\n",
-+"#\n",
-+"# CONFIG_M386 is not set\n",
-+"# CONFIG_M486 is not set\n",
-+"# CONFIG_M586 is not set\n",
-+"# CONFIG_M586TSC is not set\n",
-+"# CONFIG_M586MMX is not set\n",
-+"# CONFIG_M686 is not set\n",
-+"# CONFIG_MPENTIUMII is not set\n",
-+"# CONFIG_MPENTIUMIII is not set\n",
-+"# CONFIG_MPENTIUMM is not set\n",
-+"# CONFIG_MPENTIUM4 is not set\n",
-+"# CONFIG_MK6 is not set\n",
-+"# CONFIG_MK7 is not set\n",
-+"CONFIG_MK8=y\n",
-+"# CONFIG_MCRUSOE is not set\n",
-+"# CONFIG_MEFFICEON is not set\n",
-+"# CONFIG_MWINCHIPC6 is not set\n",
-+"# CONFIG_MWINCHIP3D is not set\n",
-+"# CONFIG_MGEODEGX1 is not set\n",
-+"# CONFIG_MGEODE_LX is not set\n",
-+"# CONFIG_MCYRIXIII is not set\n",
-+"# CONFIG_MVIAC3_2 is not set\n",
-+"# CONFIG_MVIAC7 is not set\n",
-+"# CONFIG_MPSC is not set\n",
-+"# CONFIG_MCORE2 is not set\n",
-+"# CONFIG_MATOM is not set\n",
-+"# CONFIG_GENERIC_CPU is not set\n",
-+"CONFIG_X86_CPU=y\n",
-+"CONFIG_X86_INTERNODE_CACHE_SHIFT=6\n",
-+"# CONFIG_X86_CMPXCHG is not set\n",
-+"CONFIG_X86_L1_CACHE_SHIFT=6\n",
-+"CONFIG_X86_WP_WORKS_OK=y\n",
-+"CONFIG_X86_INTEL_USERCOPY=y\n",
-+"CONFIG_X86_USE_PPRO_CHECKSUM=y\n",
-+"CONFIG_X86_TSC=y\n",
-+"CONFIG_X86_CMOV=y\n",
-+"CONFIG_X86_MINIMUM_CPU_FAMILY=3\n",
-+"CONFIG_CPU_SUP_INTEL=y\n",
-+"CONFIG_CPU_SUP_AMD=y\n",
-+"CONFIG_CPU_SUP_CENTAUR=y\n",
-+"CONFIG_UML_X86=y\n",
-+"CONFIG_64BIT=y\n",
-+"# CONFIG_X86_32 is not set\n",
-+"# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set\n",
-+"CONFIG_RWSEM_GENERIC_SPINLOCK=y\n",
-+"# CONFIG_ARCH_HAS_SC_SIGNALS is not set\n",
-+"# CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA is not set\n",
-+"CONFIG_SMP_BROKEN=y\n",
-+"CONFIG_GENERIC_HWEIGHT=y\n",
-+"# CONFIG_STATIC_LINK is not set\n",
-+"CONFIG_FLATMEM=y\n",
-+"CONFIG_FLAT_NODE_MEM_MAP=y\n",
-+"CONFIG_PAGEFLAGS_EXTENDED=y\n",
-+"CONFIG_SPLIT_PTLOCK_CPUS=4\n",
-+"CONFIG_PHYS_ADDR_T_64BIT=y\n",
-+"CONFIG_ZONE_DMA_FLAG=0\n",
-+"CONFIG_VIRT_TO_BUS=y\n",
-+"# CONFIG_KSM is not set\n",
-+"CONFIG_DEFAULT_MMAP_MIN_ADDR=4096\n",
-+"# CONFIG_NO_HZ is not set\n",
-+"# CONFIG_HIGH_RES_TIMERS is not set\n",
-+"CONFIG_GENERIC_CLOCKEVENTS_BUILD=y\n",
-+"CONFIG_LD_SCRIPT_DYN=y\n",
-+"# CONFIG_BINFMT_ELF is not set\n",
-+"# CONFIG_HAVE_AOUT is not set\n",
-+"# CONFIG_BINFMT_MISC is not set\n",
-+"# CONFIG_HOSTFS is not set\n",
-+"# CONFIG_MCONSOLE is not set\n",
-+"CONFIG_KERNEL_STACK_ORDER=1\n",
-+"\n",
-+"#\n",
-+"# General setup\n",
-+"#\n",
-+"# CONFIG_EXPERIMENTAL is not set\n",
-+"CONFIG_BROKEN_ON_SMP=y\n",
-+"CONFIG_INIT_ENV_ARG_LIMIT=128\n",
-+"CONFIG_LOCALVERSION=\"\"\n",
-+"# CONFIG_LOCALVERSION_AUTO is not set\n",
-+"# CONFIG_SWAP is not set\n",
-+"CONFIG_SYSVIPC=y\n",
-+"CONFIG_SYSVIPC_SYSCTL=y\n",
-+"# CONFIG_BSD_PROCESS_ACCT is not set\n",
-+"\n",
-+"#\n",
-+"# RCU Subsystem\n",
-+"#\n",
-+"CONFIG_TREE_RCU=y\n",
-+"# CONFIG_TREE_PREEMPT_RCU is not set\n",
-+"# CONFIG_TINY_RCU is not set\n",
-+"# CONFIG_RCU_TRACE is not set\n",
-+"CONFIG_RCU_FANOUT=64\n",
-+"# CONFIG_RCU_FANOUT_EXACT is not set\n",
-+"# CONFIG_TREE_RCU_TRACE is not set\n",
-+"# CONFIG_IKCONFIG is not set\n",
-+"CONFIG_LOG_BUF_SHIFT=17\n",
-+"# CONFIG_CGROUPS is not set\n",
-+"# CONFIG_SYSFS_DEPRECATED_V2 is not set\n",
-+"# CONFIG_RELAY is not set\n",
-+"CONFIG_NAMESPACES=y\n",
-+"CONFIG_UTS_NS=y\n",
-+"CONFIG_IPC_NS=y\n",
-+"CONFIG_USER_NS=y\n",
-+"# CONFIG_BLK_DEV_INITRD is not set\n",
-+"# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set\n",
-+"CONFIG_SYSCTL=y\n",
-+"CONFIG_ANON_INODES=y\n",
-+"# CONFIG_EMBEDDED is not set\n",
-+"CONFIG_UID16=y\n",
-+"CONFIG_SYSCTL_SYSCALL=y\n",
-+"CONFIG_KALLSYMS=y\n",
-+"# CONFIG_KALLSYMS_EXTRA_PASS is not set\n",
-+"CONFIG_HOTPLUG=y\n",
-+"CONFIG_PRINTK=y\n",
-+"CONFIG_BUG=y\n",
-+"CONFIG_ELF_CORE=y\n",
-+"CONFIG_BASE_FULL=y\n",
-+"CONFIG_FUTEX=y\n",
-+"CONFIG_EPOLL=y\n",
-+"CONFIG_SIGNALFD=y\n",
-+"CONFIG_TIMERFD=y\n",
-+"CONFIG_EVENTFD=y\n",
-+"CONFIG_SHMEM=y\n",
-+"CONFIG_AIO=y\n",
-+"\n",
-+"#\n",
-+"# Kernel Performance Events And Counters\n",
-+"#\n",
-+"CONFIG_VM_EVENT_COUNTERS=y\n",
-+"CONFIG_SLUB_DEBUG=y\n",
-+"# CONFIG_COMPAT_BRK is not set\n",
-+"# CONFIG_SLAB is not set\n",
-+"CONFIG_SLUB=y\n",
-+"# CONFIG_SLOB is not set\n",
-+"# CONFIG_PROFILING is not set\n",
-+"\n",
-+"#\n",
-+"# GCOV-based kernel profiling\n",
-+"#\n",
-+"# CONFIG_SLOW_WORK is not set\n",
-+"# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set\n",
-+"CONFIG_SLABINFO=y\n",
-+"CONFIG_RT_MUTEXES=y\n",
-+"CONFIG_BASE_SMALL=0\n",
-+"# CONFIG_MODULES is not set\n",
-+"CONFIG_BLOCK=y\n",
-+"# CONFIG_BLK_DEV_BSG is not set\n",
-+"# CONFIG_BLK_DEV_INTEGRITY is not set\n",
-+"\n",
-+"#\n",
-+"# IO Schedulers\n",
-+"#\n",
-+"CONFIG_IOSCHED_NOOP=y\n",
-+"# CONFIG_IOSCHED_DEADLINE is not set\n",
-+"# CONFIG_IOSCHED_CFQ is not set\n",
-+"# CONFIG_DEFAULT_DEADLINE is not set\n",
-+"# CONFIG_DEFAULT_CFQ is not set\n",
-+"CONFIG_DEFAULT_NOOP=y\n",
-+"CONFIG_DEFAULT_IOSCHED=\"noop\"\n",
-+"# CONFIG_INLINE_SPIN_TRYLOCK is not set\n",
-+"# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set\n",
-+"# CONFIG_INLINE_SPIN_LOCK is not set\n",
-+"# CONFIG_INLINE_SPIN_LOCK_BH is not set\n",
-+"# CONFIG_INLINE_SPIN_LOCK_IRQ is not set\n",
-+"# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set\n",
-+"CONFIG_INLINE_SPIN_UNLOCK=y\n",
-+"# CONFIG_INLINE_SPIN_UNLOCK_BH is not set\n",
-+"CONFIG_INLINE_SPIN_UNLOCK_IRQ=y\n",
-+"# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set\n",
-+"# CONFIG_INLINE_READ_TRYLOCK is not set\n",
-+"# CONFIG_INLINE_READ_LOCK is not set\n",
-+"# CONFIG_INLINE_READ_LOCK_BH is not set\n",
-+"# CONFIG_INLINE_READ_LOCK_IRQ is not set\n",
-+"# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set\n",
-+"CONFIG_INLINE_READ_UNLOCK=y\n",
-+"# CONFIG_INLINE_READ_UNLOCK_BH is not set\n",
-+"CONFIG_INLINE_READ_UNLOCK_IRQ=y\n",
-+"# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set\n",
-+"# CONFIG_INLINE_WRITE_TRYLOCK is not set\n",
-+"# CONFIG_INLINE_WRITE_LOCK is not set\n",
-+"# CONFIG_INLINE_WRITE_LOCK_BH is not set\n",
-+"# CONFIG_INLINE_WRITE_LOCK_IRQ is not set\n",
-+"# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set\n",
-+"CONFIG_INLINE_WRITE_UNLOCK=y\n",
-+"# CONFIG_INLINE_WRITE_UNLOCK_BH is not set\n",
-+"CONFIG_INLINE_WRITE_UNLOCK_IRQ=y\n",
-+"# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set\n",
-+"# CONFIG_MUTEX_SPIN_ON_OWNER is not set\n",
-+"# CONFIG_FREEZER is not set\n",
-+"# CONFIG_BLK_DEV is not set\n",
-+"\n",
-+"#\n",
-+"# Character Devices\n",
-+"#\n",
-+"# CONFIG_STDERR_CONSOLE is not set\n",
-+"CONFIG_STDIO_CONSOLE=y\n",
-+"# CONFIG_SSL is not set\n",
-+"# CONFIG_NULL_CHAN is not set\n",
-+"# CONFIG_PORT_CHAN is not set\n",
-+"# CONFIG_PTY_CHAN is not set\n",
-+"# CONFIG_TTY_CHAN is not set\n",
-+"# CONFIG_XTERM_CHAN is not set\n",
-+"CONFIG_NOCONFIG_CHAN=y\n",
-+"CONFIG_CON_ZERO_CHAN=\"fd:0,fd:1\"\n",
-+"CONFIG_CON_CHAN=\"xterm\"\n",
-+"CONFIG_SSL_CHAN=\"pty\"\n",
-+"# CONFIG_UNIX98_PTYS is not set\n",
-+"# CONFIG_LEGACY_PTYS is not set\n",
-+"# CONFIG_RAW_DRIVER is not set\n",
-+"# CONFIG_WATCHDOG is not set\n",
-+"# CONFIG_UML_SOUND is not set\n",
-+"# CONFIG_SOUND is not set\n",
-+"# CONFIG_SOUND_OSS_CORE is not set\n",
-+"# CONFIG_HOSTAUDIO is not set\n",
-+"# CONFIG_HW_RANDOM is not set\n",
-+"# CONFIG_UML_RANDOM is not set\n",
-+"# CONFIG_MMAPPER is not set\n",
-+"\n",
-+"#\n",
-+"# Generic Driver Options\n",
-+"#\n",
-+"CONFIG_UEVENT_HELPER_PATH=\"/sbin/hotplug\"\n",
-+"CONFIG_STANDALONE=y\n",
-+"# CONFIG_PREVENT_FIRMWARE_BUILD is not set\n",
-+"CONFIG_FW_LOADER=y\n",
-+"# CONFIG_FIRMWARE_IN_KERNEL is not set\n",
-+"CONFIG_EXTRA_FIRMWARE=\"\"\n",
-+"# CONFIG_SYS_HYPERVISOR is not set\n",
-+"# CONFIG_NET is not set\n",
-+"\n",
-+"#\n",
-+"# File systems\n",
-+"#\n",
-+"# CONFIG_EXT2_FS is not set\n",
-+"# CONFIG_EXT3_FS is not set\n",
-+"# CONFIG_EXT4_FS is not set\n",
-+"# CONFIG_REISERFS_FS is not set\n",
-+"# CONFIG_JFS_FS is not set\n",
-+"# CONFIG_FS_POSIX_ACL is not set\n",
-+"# CONFIG_XFS_FS is not set\n",
-+"CONFIG_FILE_LOCKING=y\n",
-+"# CONFIG_FSNOTIFY is not set\n",
-+"# CONFIG_DNOTIFY is not set\n",
-+"# CONFIG_INOTIFY is not set\n",
-+"# CONFIG_INOTIFY_USER is not set\n",
-+"# CONFIG_QUOTA is not set\n",
-+"# CONFIG_AUTOFS_FS is not set\n",
-+"# CONFIG_AUTOFS4_FS is not set\n",
-+"# CONFIG_FUSE_FS is not set\n",
-+"\n",
-+"#\n",
-+"# Caches\n",
-+"#\n",
-+"\n",
-+"#\n",
-+"# CD-ROM/DVD Filesystems\n",
-+"#\n",
-+"# CONFIG_ISO9660_FS is not set\n",
-+"# CONFIG_UDF_FS is not set\n",
-+"\n",
-+"#\n",
-+"# DOS/FAT/NT Filesystems\n",
-+"#\n",
-+"# CONFIG_MSDOS_FS is not set\n",
-+"# CONFIG_VFAT_FS is not set\n",
-+"# CONFIG_NTFS_FS is not set\n",
-+"\n",
-+"#\n",
-+"# Pseudo filesystems\n",
-+"#\n",
-+"CONFIG_PROC_FS=y\n",
-+"# CONFIG_PROC_KCORE is not set\n",
-+"CONFIG_PROC_SYSCTL=y\n",
-+"CONFIG_PROC_PAGE_MONITOR=y\n",
-+"CONFIG_SYSFS=y\n",
-+"# CONFIG_TMPFS is not set\n",
-+"# CONFIG_HUGETLB_PAGE is not set\n",
-+"# CONFIG_CONFIGFS_FS is not set\n",
-+"# CONFIG_MISC_FILESYSTEMS is not set\n",
-+"\n",
-+"#\n",
-+"# Partition Types\n",
-+"#\n",
-+"# CONFIG_PARTITION_ADVANCED is not set\n",
-+"CONFIG_MSDOS_PARTITION=y\n",
-+"# CONFIG_NLS is not set\n",
-+"\n",
-+"#\n",
-+"# Linux VServer\n",
-+"#\n",
-+"# CONFIG_VSERVER_AUTO_LBACK is not set\n",
-+"# CONFIG_VSERVER_COWBL is not set\n",
-+"# CONFIG_VSERVER_PROC_SECURE is not set\n",
-+"# CONFIG_VSERVER_HARDCPU is not set\n",
-+"# CONFIG_TAGGING_NONE is not set\n",
-+"# CONFIG_TAGGING_UID16 is not set\n",
-+"# CONFIG_TAGGING_GID16 is not set\n",
-+"CONFIG_TAGGING_ID24=y\n",
-+"# CONFIG_TAGGING_INTERN is not set\n",
-+"# CONFIG_TAG_NFSD is not set\n",
-+"# CONFIG_VSERVER_PRIVACY is not set\n",
-+"CONFIG_VSERVER_CONTEXTS=768\n",
-+"# CONFIG_VSERVER_WARN is not set\n",
-+"# CONFIG_VSERVER_DEBUG is not set\n",
-+"CONFIG_VSERVER=y\n",
-+"\n",
-+"#\n",
-+"# Security options\n",
-+"#\n",
-+"# CONFIG_KEYS is not set\n",
-+"# CONFIG_SECURITY is not set\n",
-+"# CONFIG_SECURITYFS is not set\n",
-+"# CONFIG_DEFAULT_SECURITY_SELINUX is not set\n",
-+"# CONFIG_DEFAULT_SECURITY_SMACK is not set\n",
-+"# CONFIG_DEFAULT_SECURITY_TOMOYO is not set\n",
-+"CONFIG_DEFAULT_SECURITY_DAC=y\n",
-+"CONFIG_DEFAULT_SECURITY=\"\"\n",
-+"# CONFIG_CRYPTO is not set\n",
-+"# CONFIG_BINARY_PRINTF is not set\n",
-+"\n",
-+"#\n",
-+"# Library routines\n",
-+"#\n",
-+"CONFIG_GENERIC_FIND_FIRST_BIT=y\n",
-+"CONFIG_GENERIC_FIND_NEXT_BIT=y\n",
-+"CONFIG_GENERIC_FIND_LAST_BIT=y\n",
-+"# CONFIG_CRC_CCITT is not set\n",
-+"# CONFIG_CRC16 is not set\n",
-+"# CONFIG_CRC_T10DIF is not set\n",
-+"# CONFIG_CRC_ITU_T is not set\n",
-+"# CONFIG_CRC32 is not set\n",
-+"# CONFIG_CRC7 is not set\n",
-+"# CONFIG_LIBCRC32C is not set\n",
-+"CONFIG_HAS_DMA=y\n",
-+"\n",
-+"#\n",
-+"# SCSI device support\n",
-+"#\n",
-+"# CONFIG_RAID_ATTRS is not set\n",
-+"# CONFIG_SCSI is not set\n",
-+"# CONFIG_SCSI_DMA is not set\n",
-+"# CONFIG_SCSI_NETLINK is not set\n",
-+"# CONFIG_MD is not set\n",
-+"# CONFIG_NEW_LEDS is not set\n",
-+"# CONFIG_INPUT is not set\n",
-+"\n",
-+"#\n",
-+"# Kernel hacking\n",
-+"#\n",
-+"# CONFIG_PRINTK_TIME is not set\n",
-+"# CONFIG_ENABLE_WARN_DEPRECATED is not set\n",
-+"# CONFIG_ENABLE_MUST_CHECK is not set\n",
-+"CONFIG_FRAME_WARN=2048\n",
-+"# CONFIG_STRIP_ASM_SYMS is not set\n",
-+"# CONFIG_UNUSED_SYMBOLS is not set\n",
-+"# CONFIG_DEBUG_FS is not set\n",
-+"# CONFIG_DEBUG_KERNEL is not set\n",
-+"# CONFIG_SLUB_DEBUG_ON is not set\n",
-+"# CONFIG_SLUB_STATS is not set\n",
-+"CONFIG_DEBUG_BUGVERBOSE=y\n",
-+"CONFIG_DEBUG_MEMORY_INIT=y\n",
-+"# CONFIG_RCU_CPU_STALL_DETECTOR is not set\n",
-+"# CONFIG_SYSCTL_SYSCALL_CHECK is not set\n",
-+"# CONFIG_SAMPLES is not set\n",
-+"# CONFIG_DEBUG_STACK_USAGE is not set\n",
-diff -NurpP --minimal linux-2.6.35.2/arch/um/kernel/vmlinux.lds linux-2.6.35.2-vs2.3.0.36.31/arch/um/kernel/vmlinux.lds
---- linux-2.6.35.2/arch/um/kernel/vmlinux.lds 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/um/kernel/vmlinux.lds 2010-08-02 17:05:05.000000000 +0200
-@@ -0,0 +1,547 @@
-+
-+
-+/*
-+ * Automatically generated C config: don't edit
-+ * Linux kernel version: 2.6.33-vs2.3.0.36.29.1
-+ * Wed Mar 10 20:12:10 2010
-+ */
-+KERNEL_STACK_SIZE = 4096 * (1 << 1);
-+/*
-+ * Helper macros to support writing architecture specific
-+ * linker scripts.
-+ *
-+ * A minimal linker scripts has following content:
-+ * [This is a sample, architectures may have special requiriements]
-+ *
-+ * OUTPUT_FORMAT(...)
-+ * OUTPUT_ARCH(...)
-+ * ENTRY(...)
-+ * SECTIONS
-+ * {
-+ * . = START;
-+ * __init_begin = .;
-+ * HEAD_TEXT_SECTION
-+ * INIT_TEXT_SECTION(PAGE_SIZE)
-+ * INIT_DATA_SECTION(...)
-+ * PERCPU(PAGE_SIZE)
-+ * __init_end = .;
-+ *
-+ * _stext = .;
-+ * TEXT_SECTION = 0
-+ * _etext = .;
-+ *
-+ * _sdata = .;
-+ * RO_DATA_SECTION(PAGE_SIZE)
-+ * RW_DATA_SECTION(...)
-+ * _edata = .;
-+ *
-+ * EXCEPTION_TABLE(...)
-+ * NOTES
-+ *
-+ * BSS_SECTION(0, 0, 0)
-+ * _end = .;
-+ *
-+ * STABS_DEBUG
-+ * DWARF_DEBUG
-+ *
-+ * DISCARDS // must be the last
-+ * }
-+ *
-+ * [__init_begin, __init_end] is the init section that may be freed after init
-+ * [_stext, _etext] is the text section
-+ * [_sdata, _edata] is the data section
-+ *
-+ * Some of the included output section have their own set of constants.
-+ * Examples are: [__initramfs_start, __initramfs_end] for initramfs and
-+ * [__nosave_begin, __nosave_end] for the nosave data
-+ */
-+
-+
-+
-+
-+
-+
-+
-+/* Align . to a 8 byte boundary equals to maximum function alignment. */
-+
-+
-+/* The actual configuration determine if the init/exit sections
-+ * are handled as text/data or they can be discarded (which
-+ * often happens at runtime)
-+ */
-+/* .data section */
-+/*
-+ * Data section helpers
-+ */
-+/*
-+ * Read only Data
-+ */
-+/* RODATA & RO_DATA provided for backward compatibility.
-+ * All archs are supposed to use RO_DATA() */
-+/* .text section. Map to function alignment to avoid address changes
-+ * during second ld run in second ld pass when generating System.map */
-+/* sched.text is aling to function alignment to secure we have same
-+ * address even at second ld pass when generating System.map */
-+/* spinlock.text is aling to function alignment to secure we have same
-+ * address even at second ld pass when generating System.map */
-+/* Section used for early init (in .S files) */
-+/*
-+ * Exception table
-+ */
-+/*
-+ * Init task
-+ */
-+/* init and exit section handling */
-+/*
-+ * bss (Block Started by Symbol) - uninitialized data
-+ * zeroed during startup
-+ */
-+/*
-+ * DWARF debug sections.
-+ * Symbols in the DWARF debugging sections are relative to
-+ * the beginning of the section so we begin them at 0.
-+ */
-+ /* Stabs debugging sections. */
-+/*
-+ * Default discarded sections.
-+ *
-+ * Some archs want to discard exit text/data at runtime rather than
-+ * link time due to cross-section references such as alt instructions,
-+ * bug table, eh_frame, etc. DISCARDS must be the last of output
-+ * section definitions so that such archs put those in earlier section
-+ * definitions.
-+ */
-+/**
-+ * PERCPU_VADDR - define output section for percpu area
-+ * @vaddr: explicit base address (optional)
-+ * @phdr: destination PHDR (optional)
-+ *
-+ * Macro which expands to output section for percpu area. If @vaddr
-+ * is not blank, it specifies explicit base address and all percpu
-+ * symbols will be offset from the given address. If blank, @vaddr
-+ * always equals @laddr + LOAD_OFFSET.
-+ *
-+ * @phdr defines the output PHDR to use if not blank. Be warned that
-+ * output PHDR is sticky. If @phdr is specified, the next output
-+ * section in the linker script will go there too. @phdr should have
-+ * a leading colon.
-+ *
-+ * Note that this macros defines __per_cpu_load as an absolute symbol.
-+ * If there is no need to put the percpu section at a predetermined
-+ * address, use PERCPU().
-+ */
-+/**
-+ * PERCPU - define output section for percpu area, simple version
-+ * @align: required alignment
-+ *
-+ * Align to @align and outputs output section for percpu area. This
-+ * macro doesn't maniuplate @vaddr or @phdr and __per_cpu_load and
-+ * __per_cpu_start will be identical.
-+ *
-+ * This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except
-+ * that __per_cpu_load is defined as a relative symbol against
-+ * .data.percpu which is required for relocatable x86_32
-+ * configuration.
-+ */
-+/*
-+ * Definition of the high level *_SECTION macros
-+ * They will fit only a subset of the architectures
-+ */
-+/*
-+ * Writeable data.
-+ * All sections are combined in a single .data section.
-+ * The sections following CONSTRUCTORS are arranged so their
-+ * typical alignment matches.
-+ * A cacheline is typical/always less than a PAGE_SIZE so
-+ * the sections that has this restriction (or similar)
-+ * is located before the ones requiring PAGE_SIZE alignment.
-+ * NOSAVE_DATA starts and ends with a PAGE_SIZE alignment which
-+ * matches the requirment of PAGE_ALIGNED_DATA.
-+ *
-+ * use 0 as page_align if page_aligned data is not used */
-+/*
-+ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
-+ * Copyright 2003 PathScale, Inc.
-+ * Licensed under the GPL
-+ */
-+/* const.h: Macros for dealing with constants. */
-+/* Some constant macros are used in both assembler and
-+ * C code. Therefore we cannot annotate them always with
-+ * 'UL' and other type specifiers unilaterally. We
-+ * use the following macros to deal with this.
-+ *
-+ * Similarly, _AT() will cast an expression with a type in C, but
-+ * leave it unchanged in asm.
-+ */
-+/* PAGE_SHIFT determines the page size */
-+OUTPUT_FORMAT(elf64-x86-64)
-+OUTPUT_ARCH(i386:x86-64)
-+ENTRY(_start)
-+jiffies = jiffies_64;
-+SECTIONS
-+{
-+ PROVIDE (__executable_start = 0x60000000);
-+ . = 0x60000000 + SIZEOF_HEADERS;
-+ .interp : { *(.interp) }
-+ __binary_start = .;
-+ . = ALIGN(4096); /* Init code and data */
-+ _text = .;
-+ _stext = .;
-+ __init_begin = .;
-+ . = ALIGN((1 << 12)); .init.text : AT(ADDR(.init.text) - 0) { _sinittext = .; *(.init.text) *(.cpuinit.text) *(.meminit.text) _einittext = .; }
-+ . = ALIGN((1 << 12));
-+ /* Read-only sections, merged into text segment: */
-+ .hash : { *(.hash) }
-+ .gnu.hash : { *(.gnu.hash) }
-+ .dynsym : { *(.dynsym) }
-+ .dynstr : { *(.dynstr) }
-+ .gnu.version : { *(.gnu.version) }
-+ .gnu.version_d : { *(.gnu.version_d) }
-+ .gnu.version_r : { *(.gnu.version_r) }
-+ .rel.init : { *(.rel.init) }
-+ .rela.init : { *(.rela.init) }
-+ .rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
-+ .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
-+ .rel.fini : { *(.rel.fini) }
-+ .rela.fini : { *(.rela.fini) }
-+ .rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
-+ .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
-+ .rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
-+ .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
-+ .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
-+ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
-+ .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
-+ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
-+ .rel.ctors : { *(.rel.ctors) }
-+ .rela.ctors : { *(.rela.ctors) }
-+ .rel.dtors : { *(.rel.dtors) }
-+ .rela.dtors : { *(.rela.dtors) }
-+ .rel.got : { *(.rel.got) }
-+ .rela.got : { *(.rela.got) }
-+ .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
-+ .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
-+ .rel.plt : { *(.rel.plt) }
-+ .rela.plt : { *(.rela.plt) }
-+ .init : {
-+ KEEP (*(.init))
-+ } =0x90909090
-+ .plt : { *(.plt) }
-+ .text : {
-+ . = ALIGN(8); *(.text.hot) *(.text) *(.ref.text) *(.devinit.text) *(.devexit.text) *(.text.unlikely)
-+ . = ALIGN(8); __sched_text_start = .; *(.sched.text) __sched_text_end = .;
-+ . = ALIGN(8); __lock_text_start = .; *(.spinlock.text) __lock_text_end = .;
-+ *(.fixup)
-+ *(.stub .text.* .gnu.linkonce.t.*)
-+ /* .gnu.warning sections are handled specially by elf32.em. */
-+ *(.gnu.warning)
-+ . = ALIGN((1 << 12));
-+ } =0x90909090
-+ . = ALIGN((1 << 12));
-+ .syscall_stub : {
-+ __syscall_stub_start = .;
-+ *(.__syscall_stub*)
-+ __syscall_stub_end = .;
-+ }
-+ .fini : {
-+ KEEP (*(.fini))
-+ } =0x90909090
-+ .kstrtab : { *(.kstrtab) }
-+/*
-+ * Helper macros to support writing architecture specific
-+ * linker scripts.
-+ *
-+ * A minimal linker scripts has following content:
-+ * [This is a sample, architectures may have special requiriements]
-+ *
-+ * OUTPUT_FORMAT(...)
-+ * OUTPUT_ARCH(...)
-+ * ENTRY(...)
-+ * SECTIONS
-+ * {
-+ * . = START;
-+ * __init_begin = .;
-+ * HEAD_TEXT_SECTION
-+ * INIT_TEXT_SECTION(PAGE_SIZE)
-+ * INIT_DATA_SECTION(...)
-+ * PERCPU(PAGE_SIZE)
-+ * __init_end = .;
-+ *
-+ * _stext = .;
-+ * TEXT_SECTION = 0
-+ * _etext = .;
-+ *
-+ * _sdata = .;
-+ * RO_DATA_SECTION(PAGE_SIZE)
-+ * RW_DATA_SECTION(...)
-+ * _edata = .;
-+ *
-+ * EXCEPTION_TABLE(...)
-+ * NOTES
-+ *
-+ * BSS_SECTION(0, 0, 0)
-+ * _end = .;
-+ *
-+ * STABS_DEBUG
-+ * DWARF_DEBUG
-+ *
-+ * DISCARDS // must be the last
-+ * }
-+ *
-+ * [__init_begin, __init_end] is the init section that may be freed after init
-+ * [_stext, _etext] is the text section
-+ * [_sdata, _edata] is the data section
-+ *
-+ * Some of the included output section have their own set of constants.
-+ * Examples are: [__initramfs_start, __initramfs_end] for initramfs and
-+ * [__nosave_begin, __nosave_end] for the nosave data
-+ */
-+/* Align . to a 8 byte boundary equals to maximum function alignment. */
-+/* The actual configuration determine if the init/exit sections
-+ * are handled as text/data or they can be discarded (which
-+ * often happens at runtime)
-+ */
-+/* .data section */
-+/*
-+ * Data section helpers
-+ */
-+/*
-+ * Read only Data
-+ */
-+/* RODATA & RO_DATA provided for backward compatibility.
-+ * All archs are supposed to use RO_DATA() */
-+/* .text section. Map to function alignment to avoid address changes
-+ * during second ld run in second ld pass when generating System.map */
-+/* sched.text is aling to function alignment to secure we have same
-+ * address even at second ld pass when generating System.map */
-+/* spinlock.text is aling to function alignment to secure we have same
-+ * address even at second ld pass when generating System.map */
-+/* Section used for early init (in .S files) */
-+/*
-+ * Exception table
-+ */
-+/*
-+ * Init task
-+ */
-+/* init and exit section handling */
-+/*
-+ * bss (Block Started by Symbol) - uninitialized data
-+ * zeroed during startup
-+ */
-+/*
-+ * DWARF debug sections.
-+ * Symbols in the DWARF debugging sections are relative to
-+ * the beginning of the section so we begin them at 0.
-+ */
-+ /* Stabs debugging sections. */
-+/*
-+ * Default discarded sections.
-+ *
-+ * Some archs want to discard exit text/data at runtime rather than
-+ * link time due to cross-section references such as alt instructions,
-+ * bug table, eh_frame, etc. DISCARDS must be the last of output
-+ * section definitions so that such archs put those in earlier section
-+ * definitions.
-+ */
-+/**
-+ * PERCPU_VADDR - define output section for percpu area
-+ * @vaddr: explicit base address (optional)
-+ * @phdr: destination PHDR (optional)
-+ *
-+ * Macro which expands to output section for percpu area. If @vaddr
-+ * is not blank, it specifies explicit base address and all percpu
-+ * symbols will be offset from the given address. If blank, @vaddr
-+ * always equals @laddr + LOAD_OFFSET.
-+ *
-+ * @phdr defines the output PHDR to use if not blank. Be warned that
-+ * output PHDR is sticky. If @phdr is specified, the next output
-+ * section in the linker script will go there too. @phdr should have
-+ * a leading colon.
-+ *
-+ * Note that this macros defines __per_cpu_load as an absolute symbol.
-+ * If there is no need to put the percpu section at a predetermined
-+ * address, use PERCPU().
-+ */
-+/**
-+ * PERCPU - define output section for percpu area, simple version
-+ * @align: required alignment
-+ *
-+ * Align to @align and outputs output section for percpu area. This
-+ * macro doesn't maniuplate @vaddr or @phdr and __per_cpu_load and
-+ * __per_cpu_start will be identical.
-+ *
-+ * This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except
-+ * that __per_cpu_load is defined as a relative symbol against
-+ * .data.percpu which is required for relocatable x86_32
-+ * configuration.
-+ */
-+/*
-+ * Definition of the high level *_SECTION macros
-+ * They will fit only a subset of the architectures
-+ */
-+/*
-+ * Writeable data.
-+ * All sections are combined in a single .data section.
-+ * The sections following CONSTRUCTORS are arranged so their
-+ * typical alignment matches.
-+ * A cacheline is typical/always less than a PAGE_SIZE so
-+ * the sections that has this restriction (or similar)
-+ * is located before the ones requiring PAGE_SIZE alignment.
-+ * NOSAVE_DATA starts and ends with a PAGE_SIZE alignment which
-+ * matches the requirment of PAGE_ALIGNED_DATA.
-+ *
-+ * use 0 as page_align if page_aligned data is not used */
-+ .fini : { *(.fini) } =0x9090
-+ _etext = .;
-+ PROVIDE (etext = .);
-+ . = ALIGN(4096);
-+ _sdata = .;
-+ PROVIDE (sdata = .);
-+ . = ALIGN((4096)); .rodata : AT(ADDR(.rodata) - 0) { __start_rodata = .; *(.rodata) *(.rodata.*) *(__vermagic) *(__markers_strings) *(__tracepoints_strings) } .rodata1 : AT(ADDR(.rodata1) - 0) { *(.rodata1) } . = ALIGN(8); __bug_table : AT(ADDR(__bug_table) - 0) { __start___bug_table = .; *(__bug_table) __stop___bug_table = .; } .pci_fixup : AT(ADDR(.pci_fixup) - 0) { __start_pci_fixups_early = .; *(.pci_fixup_early) __end_pci_fixups_early = .; __start_pci_fixups_header = .; *(.pci_fixup_header) __end_pci_fixups_header = .; __start_pci_fixups_final = .; *(.pci_fixup_final) __end_pci_fixups_final = .; __start_pci_fixups_enable = .; *(.pci_fixup_enable) __end_pci_fixups_enable = .; __start_pci_fixups_resume = .; *(.pci_fixup_resume) __end_pci_fixups_resume = .; __start_pci_fixups_resume_early = .; *(.pci_fixup_resume_early) __end_pci_fixups_resume_early = .; __start_pci_fixups_suspend = .; *(.pci_fixup_suspend) __end_pci_fixups_suspend = .; } .builtin_fw : AT(ADDR(.builtin_fw) - 0) { __start_builtin_fw = .; *(.builtin_fw) __end_builtin_fw = .; } .rio_route : AT(ADDR(.rio_route) - 0) { __start_rio_route_ops = .; *(.rio_route_ops) __end_rio_route_ops = .; } __ksymtab : AT(ADDR(__ksymtab) - 0) { __start___ksymtab = .; *(__ksymtab) __stop___ksymtab = .; } __ksymtab_gpl : AT(ADDR(__ksymtab_gpl) - 0) { __start___ksymtab_gpl = .; *(__ksymtab_gpl) __stop___ksymtab_gpl = .; } __ksymtab_unused : AT(ADDR(__ksymtab_unused) - 0) { __start___ksymtab_unused = .; *(__ksymtab_unused) __stop___ksymtab_unused = .; } __ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - 0) { __start___ksymtab_unused_gpl = .; *(__ksymtab_unused_gpl) __stop___ksymtab_unused_gpl = .; } __ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - 0) { __start___ksymtab_gpl_future = .; *(__ksymtab_gpl_future) __stop___ksymtab_gpl_future = .; } __kcrctab : AT(ADDR(__kcrctab) - 0) { __start___kcrctab = .; *(__kcrctab) __stop___kcrctab = .; } __kcrctab_gpl : AT(ADDR(__kcrctab_gpl) - 0) { __start___kcrctab_gpl = .; *(__kcrctab_gpl) __stop___kcrctab_gpl = .; } __kcrctab_unused : AT(ADDR(__kcrctab_unused) - 0) { __start___kcrctab_unused = .; *(__kcrctab_unused) __stop___kcrctab_unused = .; } __kcrctab_unused_gpl : AT(ADDR(__kcrctab_unused_gpl) - 0) { __start___kcrctab_unused_gpl = .; *(__kcrctab_unused_gpl) __stop___kcrctab_unused_gpl = .; } __kcrctab_gpl_future : AT(ADDR(__kcrctab_gpl_future) - 0) { __start___kcrctab_gpl_future = .; *(__kcrctab_gpl_future) __stop___kcrctab_gpl_future = .; } __ksymtab_strings : AT(ADDR(__ksymtab_strings) - 0) { *(__ksymtab_strings) } __init_rodata : AT(ADDR(__init_rodata) - 0) { *(.ref.rodata) *(.devinit.rodata) *(.devexit.rodata) } __param : AT(ADDR(__param) - 0) { __start___param = .; *(__param) __stop___param = .; . = ALIGN((4096)); __end_rodata = .; } . = ALIGN((4096));
-+ .unprotected : { *(.unprotected) }
-+ . = ALIGN(4096);
-+ PROVIDE (_unprotected_end = .);
-+ . = ALIGN(4096);
-+ .note : { *(.note.*) }
-+ . = ALIGN(0); __ex_table : AT(ADDR(__ex_table) - 0) { __start___ex_table = .; *(__ex_table) __stop___ex_table = .; }
-+ . = ALIGN(8); __bug_table : AT(ADDR(__bug_table) - 0) { __start___bug_table = .; *(__bug_table) __stop___bug_table = .; }
-+ .uml.setup.init : {
-+ __uml_setup_start = .;
-+ *(.uml.setup.init)
-+ __uml_setup_end = .;
-+ }
-+ .uml.help.init : {
-+ __uml_help_start = .;
-+ *(.uml.help.init)
-+ __uml_help_end = .;
-+ }
-+ .uml.postsetup.init : {
-+ __uml_postsetup_start = .;
-+ *(.uml.postsetup.init)
-+ __uml_postsetup_end = .;
-+ }
-+ .init.setup : {
-+ . = ALIGN(0); __setup_start = .; *(.init.setup) __setup_end = .;
-+ }
-+ . = ALIGN(32); .data.percpu : AT(ADDR(.data.percpu) - 0) { __per_cpu_load = .; __per_cpu_start = .; *(.data.percpu.first) *(.data.percpu.page_aligned) *(.data.percpu) *(.data.percpu.shared_aligned) __per_cpu_end = .; }
-+ .initcall.init : {
-+ __initcall_start = .; *(.initcallearly.init) __early_initcall_end = .; *(.initcall0.init) *(.initcall0s.init) *(.initcall1.init) *(.initcall1s.init) *(.initcall2.init) *(.initcall2s.init) *(.initcall3.init) *(.initcall3s.init) *(.initcall4.init) *(.initcall4s.init) *(.initcall5.init) *(.initcall5s.init) *(.initcallrootfs.init) *(.initcall6.init) *(.initcall6s.init) *(.initcall7.init) *(.initcall7s.init) __initcall_end = .;
-+ }
-+ .con_initcall.init : {
-+ __con_initcall_start = .; *(.con_initcall.init) __con_initcall_end = .;
-+ }
-+ .uml.initcall.init : {
-+ __uml_initcall_start = .;
-+ *(.uml.initcall.init)
-+ __uml_initcall_end = .;
-+ }
-+ __init_end = .;
-+ .security_initcall.init : AT(ADDR(.security_initcall.init) - 0) { __security_initcall_start = .; *(.security_initcall.init) __security_initcall_end = .; }
-+ .exitcall : {
-+ __exitcall_begin = .;
-+ *(.exitcall.exit)
-+ __exitcall_end = .;
-+ }
-+ .uml.exitcall : {
-+ __uml_exitcall_begin = .;
-+ *(.uml.exitcall.exit)
-+ __uml_exitcall_end = .;
-+ }
-+ . = ALIGN(4);
-+ .altinstructions : {
-+ __alt_instructions = .;
-+ *(.altinstructions)
-+ __alt_instructions_end = .;
-+ }
-+ .altinstr_replacement : { *(.altinstr_replacement) }
-+ /* .exit.text is discard at runtime, not link time, to deal with references
-+ from .altinstructions and .eh_frame */
-+ .exit.text : { *(.exit.text) }
-+ .exit.data : { *(.exit.data) }
-+ .preinit_array : {
-+ __preinit_array_start = .;
-+ *(.preinit_array)
-+ __preinit_array_end = .;
-+ }
-+ .init_array : {
-+ __init_array_start = .;
-+ *(.init_array)
-+ __init_array_end = .;
-+ }
-+ .fini_array : {
-+ __fini_array_start = .;
-+ *(.fini_array)
-+ __fini_array_end = .;
-+ }
-+ . = ALIGN(4096);
-+ .init.ramfs : {
-+
-+ }
-+ init.data : { *(.init.data) *(.cpuinit.data) *(.meminit.data) *(.init.rodata) *(.cpuinit.rodata) *(.meminit.rodata) }
-+ /* Ensure the __preinit_array_start label is properly aligned. We
-+ could instead move the label definition inside the section, but
-+ the linker would then create the section even if it turns out to
-+ be empty, which isn't pretty. */
-+ . = ALIGN(32 / 8);
-+ .preinit_array : { *(.preinit_array) }
-+ .init_array : { *(.init_array) }
-+ .fini_array : { *(.fini_array) }
-+ .data : {
-+ . = ALIGN(KERNEL_STACK_SIZE); *(.data.init_task)
-+ . = ALIGN(KERNEL_STACK_SIZE);
-+ *(.data.init_irqstack)
-+ *(.data) *(.ref.data) *(.devinit.data) *(.devexit.data) . = ALIGN(8); __start___markers = .; *(__markers) __stop___markers = .; . = ALIGN(32); __start___tracepoints = .; *(__tracepoints) __stop___tracepoints = .; . = ALIGN(8); __start___verbose = .; *(__verbose) __stop___verbose = .;
-+ *(.data.* .gnu.linkonce.d.*)
-+ SORT(CONSTRUCTORS)
-+ }
-+ .data1 : { *(.data1) }
-+ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
-+ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
-+ .eh_frame : { KEEP (*(.eh_frame)) }
-+ .gcc_except_table : { *(.gcc_except_table) }
-+ .dynamic : { *(.dynamic) }
-+ .ctors : {
-+ /* gcc uses crtbegin.o to find the start of
-+ the constructors, so we make sure it is
-+ first. Because this is a wildcard, it
-+ doesn't matter if the user does not
-+ actually link against crtbegin.o; the
-+ linker won't look for a file to match a
-+ wildcard. The wildcard also means that it
-+ doesn't matter which directory crtbegin.o
-+ is in. */
-+ KEEP (*crtbegin.o(.ctors))
-+ /* We don't want to include the .ctor section from
-+ from the crtend.o file until after the sorted ctors.
-+ The .ctor section from the crtend file contains the
-+ end of ctors marker and it must be last */
-+ KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
-+ KEEP (*(SORT(.ctors.*)))
-+ KEEP (*(.ctors))
-+ }
-+ .dtors : {
-+ KEEP (*crtbegin.o(.dtors))
-+ KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
-+ KEEP (*(SORT(.dtors.*)))
-+ KEEP (*(.dtors))
-+ }
-+ .jcr : { KEEP (*(.jcr)) }
-+ .got : { *(.got.plt) *(.got) }
-+ _edata = .;
-+ PROVIDE (edata = .);
-+ .bss : {
-+ __bss_start = .;
-+ *(.dynbss)
-+ *(.bss .bss.* .gnu.linkonce.b.*)
-+ *(COMMON)
-+ /* Align here to ensure that the .bss section occupies space up to
-+ _end. Align after .bss to ensure correct alignment even if the
-+ .bss section disappears because there are no input sections. */
-+ . = ALIGN(32 / 8);
-+ . = ALIGN(32 / 8);
-+ }
-+ _end = .;
-+ PROVIDE (end = .);
-+ .stab 0 : { *(.stab) } .stabstr 0 : { *(.stabstr) } .stab.excl 0 : { *(.stab.excl) } .stab.exclstr 0 : { *(.stab.exclstr) } .stab.index 0 : { *(.stab.index) } .stab.indexstr 0 : { *(.stab.indexstr) } .comment 0 : { *(.comment) }
-+ .debug 0 : { *(.debug) } .line 0 : { *(.line) } .debug_srcinfo 0 : { *(.debug_srcinfo) } .debug_sfnames 0 : { *(.debug_sfnames) } .debug_aranges 0 : { *(.debug_aranges) } .debug_pubnames 0 : { *(.debug_pubnames) } .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) } .debug_abbrev 0 : { *(.debug_abbrev) } .debug_line 0 : { *(.debug_line) } .debug_frame 0 : { *(.debug_frame) } .debug_str 0 : { *(.debug_str) } .debug_loc 0 : { *(.debug_loc) } .debug_macinfo 0 : { *(.debug_macinfo) } .debug_weaknames 0 : { *(.debug_weaknames) } .debug_funcnames 0 : { *(.debug_funcnames) } .debug_typenames 0 : { *(.debug_typenames) } .debug_varnames 0 : { *(.debug_varnames) }
-+ /DISCARD/ : { *(.exit.text) *(.cpuexit.text) *(.memexit.text) *(.exit.data) *(.cpuexit.data) *(.cpuexit.rodata) *(.memexit.data) *(.memexit.rodata) *(.exitcall.exit) *(.discard) }
-+}
-diff -NurpP --minimal linux-2.6.35.2/arch/x86/ia32/ia32entry.S linux-2.6.35.2-vs2.3.0.36.31/arch/x86/ia32/ia32entry.S
---- linux-2.6.35.2/arch/x86/ia32/ia32entry.S 2010-07-07 18:31:11.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/x86/ia32/ia32entry.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/x86/ia32/ia32entry.S linux-2.6.35.4-vs2.3.0.36.32/arch/x86/ia32/ia32entry.S
+--- linux-2.6.35.4/arch/x86/ia32/ia32entry.S 2010-07-07 18:31:11.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/x86/ia32/ia32entry.S 2010-08-02 17:05:05.000000000 +0200
@@ -777,7 +777,7 @@ ia32_sys_call_table:
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.35.2/arch/x86/include/asm/unistd_64.h linux-2.6.35.2-vs2.3.0.36.31/arch/x86/include/asm/unistd_64.h
---- linux-2.6.35.2/arch/x86/include/asm/unistd_64.h 2010-07-07 18:31:11.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/x86/include/asm/unistd_64.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/x86/include/asm/unistd_64.h linux-2.6.35.4-vs2.3.0.36.32/arch/x86/include/asm/unistd_64.h
+--- linux-2.6.35.4/arch/x86/include/asm/unistd_64.h 2010-07-07 18:31:11.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/x86/include/asm/unistd_64.h 2010-08-02 17:05:05.000000000 +0200
@@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
#define __NR_utimes 235
__SYSCALL(__NR_utimes, sys_utimes)
#define __NR_mbind 237
__SYSCALL(__NR_mbind, sys_mbind)
#define __NR_set_mempolicy 238
-diff -NurpP --minimal linux-2.6.35.2/arch/x86/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/x86/Kconfig
---- linux-2.6.35.2/arch/x86/Kconfig 2010-08-02 16:52:11.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/x86/Kconfig 2010-08-02 17:05:05.000000000 +0200
-@@ -2123,6 +2123,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.35.4/arch/x86/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/x86/Kconfig
+--- linux-2.6.35.4/arch/x86/Kconfig 2010-09-05 01:41:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/x86/Kconfig 2010-09-06 02:59:52.000000000 +0200
+@@ -2128,6 +2128,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/x86/kernel/syscall_table_32.S linux-2.6.35.2-vs2.3.0.36.31/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.35.2/arch/x86/kernel/syscall_table_32.S 2010-07-07 18:31:12.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/x86/kernel/syscall_table_32.S 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/x86/kernel/syscall_table_32.S linux-2.6.35.4-vs2.3.0.36.32/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.35.4/arch/x86/kernel/syscall_table_32.S 2010-07-07 18:31:12.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/x86/kernel/syscall_table_32.S 2010-08-02 17:05:05.000000000 +0200
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.35.2/Documentation/vserver/debug.txt linux-2.6.35.2-vs2.3.0.36.31/Documentation/vserver/debug.txt
---- linux-2.6.35.2/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/Documentation/vserver/debug.txt 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/Documentation/vserver/debug.txt linux-2.6.35.4-vs2.3.0.36.32/Documentation/vserver/debug.txt
+--- linux-2.6.35.4/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/Documentation/vserver/debug.txt 2010-08-02 17:05:05.000000000 +0200
@@ -0,0 +1,154 @@
+
+debug_cvirt:
+ 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"
-diff -NurpP --minimal linux-2.6.35.2/drivers/block/Kconfig linux-2.6.35.2-vs2.3.0.36.31/drivers/block/Kconfig
---- linux-2.6.35.2/drivers/block/Kconfig 2010-08-02 16:52:14.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/block/Kconfig 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/block/Kconfig linux-2.6.35.4-vs2.3.0.36.32/drivers/block/Kconfig
+--- linux-2.6.35.4/drivers/block/Kconfig 2010-08-02 16:52:14.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/block/Kconfig 2010-08-02 17:05:05.000000000 +0200
@@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-2.6.35.2/drivers/block/loop.c linux-2.6.35.2-vs2.3.0.36.31/drivers/block/loop.c
---- linux-2.6.35.2/drivers/block/loop.c 2010-08-02 16:52:14.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/block/loop.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/block/loop.c linux-2.6.35.4-vs2.3.0.36.32/drivers/block/loop.c
+--- linux-2.6.35.4/drivers/block/loop.c 2010-08-02 16:52:14.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/block/loop.c 2010-08-02 17:05:05.000000000 +0200
@@ -73,6 +73,7 @@
#include <linux/highmem.h>
#include <linux/kthread.h>
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-2.6.35.2/drivers/block/Makefile linux-2.6.35.2-vs2.3.0.36.31/drivers/block/Makefile
---- linux-2.6.35.2/drivers/block/Makefile 2010-02-25 11:51:36.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/block/Makefile 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/block/Makefile linux-2.6.35.4-vs2.3.0.36.32/drivers/block/Makefile
+--- linux-2.6.35.4/drivers/block/Makefile 2010-02-25 11:51:36.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/block/Makefile 2010-08-02 17:05:05.000000000 +0200
@@ -34,6 +34,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_BLK_DEV_DRBD) += drbd/
-diff -NurpP --minimal linux-2.6.35.2/drivers/block/vroot.c linux-2.6.35.2-vs2.3.0.36.31/drivers/block/vroot.c
---- linux-2.6.35.2/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/block/vroot.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/block/vroot.c linux-2.6.35.4-vs2.3.0.36.32/drivers/block/vroot.c
+--- linux-2.6.35.4/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/block/vroot.c 2010-08-02 17:05:05.000000000 +0200
@@ -0,0 +1,282 @@
+/*
+ * linux/drivers/block/vroot.c
+
+#endif
+
-diff -NurpP --minimal linux-2.6.35.2/drivers/char/sysrq.c linux-2.6.35.2-vs2.3.0.36.31/drivers/char/sysrq.c
---- linux-2.6.35.2/drivers/char/sysrq.c 2010-08-02 16:52:15.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/char/sysrq.c 2010-08-02 17:39:50.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/char/sysrq.c linux-2.6.35.4-vs2.3.0.36.32/drivers/char/sysrq.c
+--- linux-2.6.35.4/drivers/char/sysrq.c 2010-08-02 16:52:15.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/char/sysrq.c 2010-08-02 17:39:50.000000000 +0200
@@ -42,6 +42,7 @@
#include <linux/oom.h>
#include <linux/slab.h>
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-2.6.35.2/drivers/char/tty_io.c linux-2.6.35.2-vs2.3.0.36.31/drivers/char/tty_io.c
---- linux-2.6.35.2/drivers/char/tty_io.c 2010-07-07 18:31:15.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/char/tty_io.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/char/tty_io.c linux-2.6.35.4-vs2.3.0.36.32/drivers/char/tty_io.c
+--- linux-2.6.35.4/drivers/char/tty_io.c 2010-09-05 01:41:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/char/tty_io.c 2010-09-06 02:59:52.000000000 +0200
@@ -106,6 +106,7 @@
#include <linux/kmod.h>
struct tty_ldisc *ld;
- if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN))
-+ if (((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN)) ||
-+ !vx_ccaps(VXC_TIOCSTI))
++ if (((current->signal->tty != tty) &&
++ !vx_capable(CAP_SYS_ADMIN, VXC_TIOCSTI)))
return -EPERM;
if (get_user(ch, p))
return -EFAULT;
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-2.6.35.2/drivers/gpu/drm/radeon/r100_reg_safe.h linux-2.6.35.2-vs2.3.0.36.31/drivers/gpu/drm/radeon/r100_reg_safe.h
---- linux-2.6.35.2/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/gpu/drm/radeon/r100_reg_safe.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/gpu/drm/radeon/r100_reg_safe.h linux-2.6.35.4-vs2.3.0.36.32/drivers/gpu/drm/radeon/r100_reg_safe.h
+--- linux-2.6.35.4/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/gpu/drm/radeon/r100_reg_safe.h 2010-08-02 17:05:05.000000000 +0200
@@ -0,0 +1,28 @@
+static const unsigned r100_reg_safe_bm[102] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFEF,
+};
-diff -NurpP --minimal linux-2.6.35.2/drivers/gpu/drm/radeon/r200_reg_safe.h linux-2.6.35.2-vs2.3.0.36.31/drivers/gpu/drm/radeon/r200_reg_safe.h
---- linux-2.6.35.2/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/gpu/drm/radeon/r200_reg_safe.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/gpu/drm/radeon/r200_reg_safe.h linux-2.6.35.4-vs2.3.0.36.32/drivers/gpu/drm/radeon/r200_reg_safe.h
+--- linux-2.6.35.4/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/gpu/drm/radeon/r200_reg_safe.h 2010-08-02 17:05:05.000000000 +0200
@@ -0,0 +1,28 @@
+static const unsigned r200_reg_safe_bm[102] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFE3F, 0xFFFFFFEF,
+};
-diff -NurpP --minimal linux-2.6.35.2/drivers/gpu/drm/radeon/r300_reg_safe.h linux-2.6.35.2-vs2.3.0.36.31/drivers/gpu/drm/radeon/r300_reg_safe.h
---- linux-2.6.35.2/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/gpu/drm/radeon/r300_reg_safe.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/gpu/drm/radeon/r300_reg_safe.h linux-2.6.35.4-vs2.3.0.36.32/drivers/gpu/drm/radeon/r300_reg_safe.h
+--- linux-2.6.35.4/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/gpu/drm/radeon/r300_reg_safe.h 2010-08-02 17:05:05.000000000 +0200
@@ -0,0 +1,42 @@
+static const unsigned r300_reg_safe_bm[159] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
+};
-diff -NurpP --minimal linux-2.6.35.2/drivers/gpu/drm/radeon/r420_reg_safe.h linux-2.6.35.2-vs2.3.0.36.31/drivers/gpu/drm/radeon/r420_reg_safe.h
---- linux-2.6.35.2/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/gpu/drm/radeon/r420_reg_safe.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/gpu/drm/radeon/r420_reg_safe.h linux-2.6.35.4-vs2.3.0.36.32/drivers/gpu/drm/radeon/r420_reg_safe.h
+--- linux-2.6.35.4/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/gpu/drm/radeon/r420_reg_safe.h 2010-08-02 17:05:05.000000000 +0200
@@ -0,0 +1,42 @@
+static const unsigned r420_reg_safe_bm[159] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
+};
-diff -NurpP --minimal linux-2.6.35.2/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-2.6.35.2-vs2.3.0.36.31/drivers/gpu/drm/radeon/rn50_reg_safe.h
---- linux-2.6.35.2/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/gpu/drm/radeon/rn50_reg_safe.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-2.6.35.4-vs2.3.0.36.32/drivers/gpu/drm/radeon/rn50_reg_safe.h
+--- linux-2.6.35.4/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/gpu/drm/radeon/rn50_reg_safe.h 2010-08-02 17:05:05.000000000 +0200
@@ -0,0 +1,28 @@
+static const unsigned rn50_reg_safe_bm[102] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF,
+};
-diff -NurpP --minimal linux-2.6.35.2/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-2.6.35.2-vs2.3.0.36.31/drivers/gpu/drm/radeon/rs600_reg_safe.h
---- linux-2.6.35.2/drivers/gpu/drm/radeon/rs600_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/gpu/drm/radeon/rs600_reg_safe.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-2.6.35.4-vs2.3.0.36.32/drivers/gpu/drm/radeon/rs600_reg_safe.h
+--- linux-2.6.35.4/drivers/gpu/drm/radeon/rs600_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/gpu/drm/radeon/rs600_reg_safe.h 2010-08-02 17:05:05.000000000 +0200
@@ -0,0 +1,57 @@
+static const unsigned rs600_reg_safe_bm[219] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+};
-diff -NurpP --minimal linux-2.6.35.2/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-2.6.35.2-vs2.3.0.36.31/drivers/gpu/drm/radeon/rv515_reg_safe.h
---- linux-2.6.35.2/drivers/gpu/drm/radeon/rv515_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/gpu/drm/radeon/rv515_reg_safe.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-2.6.35.4-vs2.3.0.36.32/drivers/gpu/drm/radeon/rv515_reg_safe.h
+--- linux-2.6.35.4/drivers/gpu/drm/radeon/rv515_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/gpu/drm/radeon/rv515_reg_safe.h 2010-08-02 17:05:05.000000000 +0200
@@ -0,0 +1,57 @@
+static const unsigned rv515_reg_safe_bm[219] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+};
-diff -NurpP --minimal linux-2.6.35.2/drivers/infiniband/core/addr.c linux-2.6.35.2-vs2.3.0.36.31/drivers/infiniband/core/addr.c
---- linux-2.6.35.2/drivers/infiniband/core/addr.c 2010-07-07 18:31:18.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/infiniband/core/addr.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/infiniband/core/addr.c linux-2.6.35.4-vs2.3.0.36.32/drivers/infiniband/core/addr.c
+--- linux-2.6.35.4/drivers/infiniband/core/addr.c 2010-07-07 18:31:18.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/infiniband/core/addr.c 2010-08-02 17:05:05.000000000 +0200
@@ -252,7 +252,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl.fl6_src)) {
if (ret)
goto put;
-diff -NurpP --minimal linux-2.6.35.2/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.35.2-vs2.3.0.36.31/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-2.6.35.2/drivers/infiniband/hw/ipath/ipath_user_pages.c 2010-07-07 18:31:19.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/infiniband/hw/ipath/ipath_user_pages.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.35.4-vs2.3.0.36.32/drivers/infiniband/hw/ipath/ipath_user_pages.c
+--- linux-2.6.35.4/drivers/infiniband/hw/ipath/ipath_user_pages.c 2010-07-07 18:31:19.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/infiniband/hw/ipath/ipath_user_pages.c 2010-08-02 17:05:05.000000000 +0200
@@ -35,6 +35,7 @@
#include <linux/device.h>
#include <linux/slab.h>
#include "ipath_kernel.h"
-diff -NurpP --minimal linux-2.6.35.2/drivers/md/dm.c linux-2.6.35.2-vs2.3.0.36.31/drivers/md/dm.c
---- linux-2.6.35.2/drivers/md/dm.c 2010-07-07 18:31:21.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/md/dm.c 2010-08-02 17:05:05.000000000 +0200
-@@ -19,6 +19,7 @@
+diff -NurpP --minimal linux-2.6.35.4/drivers/md/dm.c linux-2.6.35.4-vs2.3.0.36.32/drivers/md/dm.c
+--- linux-2.6.35.4/drivers/md/dm.c 2010-09-05 01:41:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/md/dm.c 2010-09-06 03:00:12.000000000 +0200
+@@ -20,6 +20,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
#include <linux/delay.h>
#include <trace/events/block.h>
-@@ -119,6 +120,7 @@ struct mapped_device {
+@@ -120,6 +121,7 @@ struct mapped_device {
rwlock_t map_lock;
atomic_t holders;
atomic_t open_count;
unsigned long flags;
-@@ -337,6 +339,7 @@ int dm_deleting_md(struct mapped_device
+@@ -338,6 +340,7 @@ int dm_deleting_md(struct mapped_device
static int dm_blk_open(struct block_device *bdev, fmode_t mode)
{
struct mapped_device *md;
spin_lock(&_minor_lock);
-@@ -345,18 +348,19 @@ static int dm_blk_open(struct block_devi
+@@ -346,18 +349,19 @@ static int dm_blk_open(struct block_devi
goto out;
if (test_bit(DMF_FREEING, &md->flags) ||
}
static int dm_blk_close(struct gendisk *disk, fmode_t mode)
-@@ -574,6 +578,14 @@ int dm_set_geometry(struct mapped_device
+@@ -575,6 +579,14 @@ int dm_set_geometry(struct mapped_device
return 0;
}
/*-----------------------------------------------------------------
* CRUD START:
* A more elegant soln is in the works that uses the queue
-@@ -1886,6 +1898,7 @@ static struct mapped_device *alloc_dev(i
+@@ -1887,6 +1899,7 @@ static struct mapped_device *alloc_dev(i
INIT_LIST_HEAD(&md->uevent_list);
spin_lock_init(&md->uevent_lock);
md->queue = blk_init_queue(dm_request_fn, NULL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-2.6.35.2/drivers/md/dm.h linux-2.6.35.2-vs2.3.0.36.31/drivers/md/dm.h
---- linux-2.6.35.2/drivers/md/dm.h 2010-07-07 18:31:21.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/md/dm.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/md/dm.h linux-2.6.35.4-vs2.3.0.36.32/drivers/md/dm.h
+--- linux-2.6.35.4/drivers/md/dm.h 2010-09-05 01:41:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/md/dm.h 2010-09-06 02:59:52.000000000 +0200
@@ -41,6 +41,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-2.6.35.2/drivers/md/dm-ioctl.c linux-2.6.35.2-vs2.3.0.36.31/drivers/md/dm-ioctl.c
---- linux-2.6.35.2/drivers/md/dm-ioctl.c 2010-07-07 18:31:21.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/md/dm-ioctl.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/md/dm-ioctl.c linux-2.6.35.4-vs2.3.0.36.32/drivers/md/dm-ioctl.c
+--- linux-2.6.35.4/drivers/md/dm-ioctl.c 2010-09-05 01:41:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/md/dm-ioctl.c 2010-09-06 02:59:52.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
dm_get(hc->md);
return hc;
}
-@@ -365,6 +368,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
+@@ -375,6 +378,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
static int remove_all(struct dm_ioctl *param, size_t param_size)
{
dm_hash_remove_all(1);
param->data_size = 0;
return 0;
-@@ -412,6 +418,8 @@ static int list_devices(struct dm_ioctl
+@@ -422,6 +428,8 @@ static int list_devices(struct dm_ioctl
*/
for (i = 0; i < NUM_BUCKETS; i++) {
list_for_each_entry (hc, _name_buckets + i, name_list) {
needed += sizeof(struct dm_name_list);
needed += strlen(hc->name) + 1;
needed += ALIGN_MASK;
-@@ -435,6 +443,8 @@ static int list_devices(struct dm_ioctl
+@@ -445,6 +453,8 @@ static int list_devices(struct dm_ioctl
*/
for (i = 0; i < NUM_BUCKETS; i++) {
list_for_each_entry (hc, _name_buckets + i, name_list) {
if (old_nl)
old_nl->next = (uint32_t) ((void *) nl -
(void *) old_nl);
-@@ -669,10 +679,11 @@ static struct hash_cell *__find_device_h
+@@ -680,10 +690,11 @@ static struct hash_cell *__find_device_h
if (!md)
goto out;
out:
return mdptr;
}
-@@ -1514,8 +1525,8 @@ static int ctl_ioctl(uint command, struc
+@@ -1526,8 +1537,8 @@ static int ctl_ioctl(uint command, struc
ioctl_fn fn = NULL;
size_t param_size;
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-2.6.35.2/drivers/net/tun.c linux-2.6.35.2-vs2.3.0.36.31/drivers/net/tun.c
---- linux-2.6.35.2/drivers/net/tun.c 2010-08-02 16:52:27.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/drivers/net/tun.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/drivers/net/tun.c linux-2.6.35.4-vs2.3.0.36.32/drivers/net/tun.c
+--- linux-2.6.35.4/drivers/net/tun.c 2010-08-02 16:52:27.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/drivers/net/tun.c 2010-08-02 17:05:05.000000000 +0200
@@ -62,6 +62,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-2.6.35.2/fs/attr.c linux-2.6.35.2-vs2.3.0.36.31/fs/attr.c
---- linux-2.6.35.2/fs/attr.c 2010-08-02 16:52:47.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/attr.c 2010-08-02 21:00:32.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/attr.c linux-2.6.35.4-vs2.3.0.36.32/fs/attr.c
+--- linux-2.6.35.4/fs/attr.c 2010-08-02 16:52:47.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/attr.c 2010-08-02 21:00:32.000000000 +0200
@@ -13,6 +13,9 @@
#include <linux/fsnotify.h>
#include <linux/fcntl.h>
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-2.6.35.2/fs/binfmt_aout.c linux-2.6.35.2-vs2.3.0.36.31/fs/binfmt_aout.c
---- linux-2.6.35.2/fs/binfmt_aout.c 2010-07-07 18:31:50.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/binfmt_aout.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/binfmt_aout.c linux-2.6.35.4-vs2.3.0.36.32/fs/binfmt_aout.c
+--- linux-2.6.35.4/fs/binfmt_aout.c 2010-07-07 18:31:50.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/binfmt_aout.c 2010-08-02 17:05:05.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/init.h>
#include <linux/coredump.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.35.2/fs/binfmt_elf.c linux-2.6.35.2-vs2.3.0.36.31/fs/binfmt_elf.c
---- linux-2.6.35.2/fs/binfmt_elf.c 2010-07-07 18:31:50.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/binfmt_elf.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/binfmt_elf.c linux-2.6.35.4-vs2.3.0.36.32/fs/binfmt_elf.c
+--- linux-2.6.35.4/fs/binfmt_elf.c 2010-07-07 18:31:50.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/binfmt_elf.c 2010-08-02 17:05:05.000000000 +0200
@@ -32,6 +32,7 @@
#include <linux/elf.h>
#include <linux/utsname.h>
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-2.6.35.2/fs/binfmt_flat.c linux-2.6.35.2-vs2.3.0.36.31/fs/binfmt_flat.c
---- linux-2.6.35.2/fs/binfmt_flat.c 2010-08-02 16:52:47.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/binfmt_flat.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/binfmt_flat.c linux-2.6.35.4-vs2.3.0.36.32/fs/binfmt_flat.c
+--- linux-2.6.35.4/fs/binfmt_flat.c 2010-08-02 16:52:47.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/binfmt_flat.c 2010-08-02 17:05:05.000000000 +0200
@@ -35,6 +35,7 @@
#include <linux/init.h>
#include <linux/flat.h>
#include <asm/byteorder.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.35.2/fs/binfmt_som.c linux-2.6.35.2-vs2.3.0.36.31/fs/binfmt_som.c
---- linux-2.6.35.2/fs/binfmt_som.c 2010-02-25 11:52:04.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/binfmt_som.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/binfmt_som.c linux-2.6.35.4-vs2.3.0.36.32/fs/binfmt_som.c
+--- linux-2.6.35.4/fs/binfmt_som.c 2010-02-25 11:52:04.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/binfmt_som.c 2010-08-02 17:05:05.000000000 +0200
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.35.2/fs/block_dev.c linux-2.6.35.2-vs2.3.0.36.31/fs/block_dev.c
---- linux-2.6.35.2/fs/block_dev.c 2010-08-14 18:16:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/block_dev.c 2010-08-14 18:19:32.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/block_dev.c linux-2.6.35.4-vs2.3.0.36.32/fs/block_dev.c
+--- linux-2.6.35.4/fs/block_dev.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/block_dev.c 2010-08-14 18:19:32.000000000 +0200
@@ -26,6 +26,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-2.6.35.2/fs/btrfs/ctree.h linux-2.6.35.2-vs2.3.0.36.31/fs/btrfs/ctree.h
---- linux-2.6.35.2/fs/btrfs/ctree.h 2010-08-02 16:52:47.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/btrfs/ctree.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/btrfs/ctree.h linux-2.6.35.4-vs2.3.0.36.32/fs/btrfs/ctree.h
+--- linux-2.6.35.4/fs/btrfs/ctree.h 2010-08-02 16:52:47.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/btrfs/ctree.h 2010-08-02 17:05:05.000000000 +0200
@@ -551,11 +551,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
/* file.c */
int btrfs_sync_file(struct file *file, int datasync);
-diff -NurpP --minimal linux-2.6.35.2/fs/btrfs/disk-io.c linux-2.6.35.2-vs2.3.0.36.31/fs/btrfs/disk-io.c
---- linux-2.6.35.2/fs/btrfs/disk-io.c 2010-08-02 16:52:47.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/btrfs/disk-io.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/btrfs/disk-io.c linux-2.6.35.4-vs2.3.0.36.32/fs/btrfs/disk-io.c
+--- linux-2.6.35.4/fs/btrfs/disk-io.c 2010-08-02 16:52:47.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/btrfs/disk-io.c 2010-08-02 17:05:05.000000000 +0200
@@ -1707,6 +1707,9 @@ struct btrfs_root *open_ctree(struct sup
goto fail_iput;
}
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-2.6.35.2/fs/btrfs/inode.c linux-2.6.35.2-vs2.3.0.36.31/fs/btrfs/inode.c
---- linux-2.6.35.2/fs/btrfs/inode.c 2010-08-02 16:52:47.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/btrfs/inode.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/btrfs/inode.c linux-2.6.35.4-vs2.3.0.36.32/fs/btrfs/inode.c
+--- linux-2.6.35.4/fs/btrfs/inode.c 2010-08-02 16:52:47.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/btrfs/inode.c 2010-08-02 17:05:05.000000000 +0200
@@ -37,6 +37,8 @@
#include <linux/posix_acl.h>
#include <linux/falloc.h>
};
static const struct inode_operations btrfs_special_inode_operations = {
.getattr = btrfs_getattr,
-diff -NurpP --minimal linux-2.6.35.2/fs/btrfs/ioctl.c linux-2.6.35.2-vs2.3.0.36.31/fs/btrfs/ioctl.c
---- linux-2.6.35.2/fs/btrfs/ioctl.c 2010-08-02 16:52:47.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/btrfs/ioctl.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/btrfs/ioctl.c linux-2.6.35.4-vs2.3.0.36.32/fs/btrfs/ioctl.c
+--- linux-2.6.35.4/fs/btrfs/ioctl.c 2010-08-02 16:52:47.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/btrfs/ioctl.c 2010-08-02 17:05:05.000000000 +0200
@@ -68,10 +68,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-2.6.35.2/fs/btrfs/super.c linux-2.6.35.2-vs2.3.0.36.31/fs/btrfs/super.c
---- linux-2.6.35.2/fs/btrfs/super.c 2010-08-02 16:52:47.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/btrfs/super.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/btrfs/super.c linux-2.6.35.4-vs2.3.0.36.32/fs/btrfs/super.c
+--- linux-2.6.35.4/fs/btrfs/super.c 2010-08-02 16:52:47.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/btrfs/super.c 2010-08-02 17:05:05.000000000 +0200
@@ -68,7 +68,7 @@ enum {
Opt_nodatacow, Opt_max_inline, Opt_alloc_start, Opt_nobarrier, Opt_ssd,
Opt_nossd, Opt_ssd_spread, Opt_thread_pool, Opt_noacl, Opt_compress,
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-2.6.35.2/fs/char_dev.c linux-2.6.35.2-vs2.3.0.36.31/fs/char_dev.c
---- linux-2.6.35.2/fs/char_dev.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/char_dev.c 2010-08-02 17:05:05.000000000 +0200
-@@ -20,6 +20,8 @@
+diff -NurpP --minimal linux-2.6.35.4/fs/char_dev.c linux-2.6.35.4-vs2.3.0.36.32/fs/char_dev.c
+--- linux-2.6.35.4/fs/char_dev.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/char_dev.c 2010-09-06 03:00:30.000000000 +0200
+@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
#include <linux/tty.h>
#include "internal.h"
-@@ -368,14 +370,21 @@ static int chrdev_open(struct inode *ino
+@@ -369,14 +371,21 @@ static int chrdev_open(struct inode *ino
struct cdev *p;
struct cdev *new = NULL;
int ret = 0;
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-2.6.35.2/fs/dcache.c linux-2.6.35.2-vs2.3.0.36.31/fs/dcache.c
---- linux-2.6.35.2/fs/dcache.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/dcache.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/dcache.c linux-2.6.35.4-vs2.3.0.36.32/fs/dcache.c
+--- linux-2.6.35.4/fs/dcache.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/dcache.c 2010-08-02 17:05:05.000000000 +0200
@@ -33,6 +33,7 @@
#include <linux/bootmem.h>
#include <linux/fs_struct.h>
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-2.6.35.2/fs/devpts/inode.c linux-2.6.35.2-vs2.3.0.36.31/fs/devpts/inode.c
---- linux-2.6.35.2/fs/devpts/inode.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/devpts/inode.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/devpts/inode.c linux-2.6.35.4-vs2.3.0.36.32/fs/devpts/inode.c
+--- linux-2.6.35.4/fs/devpts/inode.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/devpts/inode.c 2010-08-02 17:05:05.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-2.6.35.2/fs/exec.c linux-2.6.35.2-vs2.3.0.36.31/fs/exec.c
---- linux-2.6.35.2/fs/exec.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/exec.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/exec.c linux-2.6.35.4-vs2.3.0.36.32/fs/exec.c
+--- linux-2.6.35.4/fs/exec.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/exec.c 2010-08-02 17:05:05.000000000 +0200
@@ -1506,7 +1506,7 @@ static int format_corename(char *corenam
/* UNIX time of coredump */
case 't': {
rc = snprintf(out_ptr, out_end - out_ptr,
"%lu", tv.tv_sec);
if (rc > out_end - out_ptr)
-diff -NurpP --minimal linux-2.6.35.2/fs/ext2/balloc.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/balloc.c
---- linux-2.6.35.2/fs/ext2/balloc.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/balloc.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext2/balloc.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/balloc.c
+--- linux-2.6.35.4/fs/ext2/balloc.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/balloc.c 2010-08-02 17:05:05.000000000 +0200
@@ -702,7 +702,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-2.6.35.2/fs/ext2/ext2.h linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/ext2.h
---- linux-2.6.35.2/fs/ext2/ext2.h 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/ext2.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext2/ext2.h linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/ext2.h
+--- linux-2.6.35.4/fs/ext2/ext2.h 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/ext2.h 2010-08-02 17:05:05.000000000 +0200
@@ -130,6 +130,7 @@ extern int ext2_fiemap(struct inode *ino
int __ext2_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, unsigned flags,
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-2.6.35.2/fs/ext2/file.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/file.c
---- linux-2.6.35.2/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/file.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext2/file.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/file.c
+--- linux-2.6.35.4/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/file.c 2010-08-02 17:05:05.000000000 +0200
@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
.setattr = ext2_setattr,
.check_acl = ext2_check_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.35.2/fs/ext2/ialloc.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/ialloc.c
---- linux-2.6.35.2/fs/ext2/ialloc.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/ialloc.c 2010-08-02 18:15:12.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext2/ialloc.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/ialloc.c
+--- linux-2.6.35.4/fs/ext2/ialloc.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/ialloc.c 2010-08-02 18:15:12.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-2.6.35.2/fs/ext2/inode.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/inode.c
---- linux-2.6.35.2/fs/ext2/inode.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/inode.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext2/inode.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/inode.c
+--- linux-2.6.35.4/fs/ext2/inode.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/inode.c 2010-08-02 17:05:05.000000000 +0200
@@ -32,6 +32,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-2.6.35.2/fs/ext2/ioctl.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/ioctl.c
---- linux-2.6.35.2/fs/ext2/ioctl.c 2009-09-10 15:26:21.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/ioctl.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext2/ioctl.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/ioctl.c
+--- linux-2.6.35.4/fs/ext2/ioctl.c 2009-09-10 15:26:21.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/ioctl.c 2010-08-02 17:05:05.000000000 +0200
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
mutex_unlock(&inode->i_mutex);
-diff -NurpP --minimal linux-2.6.35.2/fs/ext2/namei.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/namei.c
---- linux-2.6.35.2/fs/ext2/namei.c 2010-07-07 18:31:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/namei.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext2/namei.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/namei.c
+--- linux-2.6.35.4/fs/ext2/namei.c 2010-07-07 18:31:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/namei.c 2010-08-02 17:05:05.000000000 +0200
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
};
const struct inode_operations ext2_special_inode_operations = {
-diff -NurpP --minimal linux-2.6.35.2/fs/ext2/super.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/super.c
---- linux-2.6.35.2/fs/ext2/super.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext2/super.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext2/super.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/super.c
+--- linux-2.6.35.4/fs/ext2/super.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext2/super.c 2010-08-02 17:05:05.000000000 +0200
@@ -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,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.35.2/fs/ext3/file.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext3/file.c
---- linux-2.6.35.2/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext3/file.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext3/file.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext3/file.c
+--- linux-2.6.35.4/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext3/file.c 2010-08-02 17:05:05.000000000 +0200
@@ -81,5 +81,6 @@ const struct inode_operations ext3_file_
#endif
.check_acl = ext3_check_acl,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.35.2/fs/ext3/ialloc.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext3/ialloc.c
---- linux-2.6.35.2/fs/ext3/ialloc.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext3/ialloc.c 2010-08-02 18:14:48.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext3/ialloc.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext3/ialloc.c
+--- linux-2.6.35.4/fs/ext3/ialloc.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext3/ialloc.c 2010-08-02 18:14:48.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-2.6.35.2/fs/ext3/inode.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext3/inode.c
---- linux-2.6.35.2/fs/ext3/inode.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext3/inode.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext3/inode.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext3/inode.c
+--- linux-2.6.35.4/fs/ext3/inode.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext3/inode.c 2010-08-02 17:05:05.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/bio.h>
#include <linux/fiemap.h>
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.35.2/fs/ext3/ioctl.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext3/ioctl.c
---- linux-2.6.35.2/fs/ext3/ioctl.c 2009-06-11 17:13:03.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext3/ioctl.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext3/ioctl.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext3/ioctl.c
+--- linux-2.6.35.4/fs/ext3/ioctl.c 2009-06-11 17:13:03.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext3/ioctl.c 2010-08-02 17:05:05.000000000 +0200
@@ -8,6 +8,7 @@
*/
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-2.6.35.2/fs/ext3/namei.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext3/namei.c
---- linux-2.6.35.2/fs/ext3/namei.c 2010-07-07 18:31:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext3/namei.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext3/namei.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext3/namei.c
+--- linux-2.6.35.4/fs/ext3/namei.c 2010-07-07 18:31:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext3/namei.c 2010-08-02 17:05:05.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
};
const struct inode_operations ext3_special_inode_operations = {
-diff -NurpP --minimal linux-2.6.35.2/fs/ext3/super.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext3/super.c
---- linux-2.6.35.2/fs/ext3/super.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext3/super.c 2010-08-02 18:14:19.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext3/super.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext3/super.c
+--- linux-2.6.35.4/fs/ext3/super.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext3/super.c 2010-08-02 18:14:19.000000000 +0200
@@ -817,7 +817,8 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.35.2/fs/ext4/ext4.h linux-2.6.35.2-vs2.3.0.36.31/fs/ext4/ext4.h
---- linux-2.6.35.2/fs/ext4/ext4.h 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext4/ext4.h 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext4/ext4.h linux-2.6.35.4-vs2.3.0.36.32/fs/ext4/ext4.h
+--- linux-2.6.35.4/fs/ext4/ext4.h 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext4/ext4.h 2010-08-02 17:05:05.000000000 +0200
@@ -318,8 +318,12 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
/* move_extent.c */
extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
__u64 start_orig, __u64 start_donor,
-diff -NurpP --minimal linux-2.6.35.2/fs/ext4/file.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext4/file.c
---- linux-2.6.35.2/fs/ext4/file.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext4/file.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext4/file.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext4/file.c
+--- linux-2.6.35.4/fs/ext4/file.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext4/file.c 2010-08-02 17:05:05.000000000 +0200
@@ -160,5 +160,6 @@ const struct inode_operations ext4_file_
.check_acl = ext4_check_acl,
.fallocate = ext4_fallocate,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-2.6.35.2/fs/ext4/ialloc.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext4/ialloc.c
---- linux-2.6.35.2/fs/ext4/ialloc.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext4/ialloc.c 2010-08-02 18:12:48.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext4/ialloc.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext4/ialloc.c
+--- linux-2.6.35.4/fs/ext4/ialloc.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext4/ialloc.c 2010-08-02 18:12:48.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-2.6.35.2/fs/ext4/inode.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext4/inode.c
---- linux-2.6.35.2/fs/ext4/inode.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext4/inode.c 2010-08-02 18:11:10.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext4/inode.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext4/inode.c
+--- linux-2.6.35.4/fs/ext4/inode.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext4/inode.c 2010-08-02 18:11:10.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/workqueue.h>
#include <linux/kernel.h>
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.35.2/fs/ext4/ioctl.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext4/ioctl.c
---- linux-2.6.35.2/fs/ext4/ioctl.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext4/ioctl.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext4/ioctl.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext4/ioctl.c
+--- linux-2.6.35.4/fs/ext4/ioctl.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext4/ioctl.c 2010-08-02 17:05:05.000000000 +0200
@@ -14,10 +14,39 @@
#include <linux/compat.h>
#include <linux/mount.h>
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-2.6.35.2/fs/ext4/namei.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext4/namei.c
---- linux-2.6.35.2/fs/ext4/namei.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext4/namei.c 2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext4/namei.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext4/namei.c
+--- linux-2.6.35.4/fs/ext4/namei.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext4/namei.c 2010-08-02 17:05:05.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-2.6.35.2/fs/ext4/super.c linux-2.6.35.2-vs2.3.0.36.31/fs/ext4/super.c
---- linux-2.6.35.2/fs/ext4/super.c 2010-08-14 18:16:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ext4/super.c 2010-08-14 18:19:32.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ext4/super.c linux-2.6.35.4-vs2.3.0.36.32/fs/ext4/super.c
+--- linux-2.6.35.4/fs/ext4/super.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ext4/super.c 2010-08-14 18:19:32.000000000 +0200
@@ -1161,6 +1161,7 @@ enum {
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.35.2/fs/fcntl.c linux-2.6.35.2-vs2.3.0.36.31/fs/fcntl.c
---- linux-2.6.35.2/fs/fcntl.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/fcntl.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/fcntl.c linux-2.6.35.4-vs2.3.0.36.32/fs/fcntl.c
+--- linux-2.6.35.4/fs/fcntl.c 2010-08-02 16:52:49.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/fcntl.c 2010-08-02 17:05:06.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/signal.h>
#include <linux/rcupdate.h>
err = security_file_fcntl(filp, cmd, arg);
if (err) {
-diff -NurpP --minimal linux-2.6.35.2/fs/file.c linux-2.6.35.2-vs2.3.0.36.31/fs/file.c
---- linux-2.6.35.2/fs/file.c 2010-07-07 18:31:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/file.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/file.c linux-2.6.35.4-vs2.3.0.36.32/fs/file.c
+--- linux-2.6.35.4/fs/file.c 2010-07-07 18:31:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/file.c 2010-08-02 17:05:06.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
#if 1
/* Sanity check */
if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-2.6.35.2/fs/file_table.c linux-2.6.35.2-vs2.3.0.36.31/fs/file_table.c
---- linux-2.6.35.2/fs/file_table.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/file_table.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/file_table.c linux-2.6.35.4-vs2.3.0.36.32/fs/file_table.c
+--- linux-2.6.35.4/fs/file_table.c 2010-08-02 16:52:49.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/file_table.c 2010-08-02 17:05:06.000000000 +0200
@@ -22,6 +22,8 @@
#include <linux/sysctl.h>
#include <linux/percpu_counter.h>
file_kill(file);
file_free(file);
}
-diff -NurpP --minimal linux-2.6.35.2/fs/fs_struct.c linux-2.6.35.2-vs2.3.0.36.31/fs/fs_struct.c
---- linux-2.6.35.2/fs/fs_struct.c 2009-06-11 17:13:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/fs_struct.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/fs_struct.c linux-2.6.35.4-vs2.3.0.36.32/fs/fs_struct.c
+--- linux-2.6.35.4/fs/fs_struct.c 2009-06-11 17:13:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/fs_struct.c 2010-08-02 17:05:06.000000000 +0200
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
}
return fs;
}
-diff -NurpP --minimal linux-2.6.35.2/fs/gfs2/file.c linux-2.6.35.2-vs2.3.0.36.31/fs/gfs2/file.c
---- linux-2.6.35.2/fs/gfs2/file.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/gfs2/file.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/gfs2/file.c linux-2.6.35.4-vs2.3.0.36.32/fs/gfs2/file.c
+--- linux-2.6.35.4/fs/gfs2/file.c 2010-08-02 16:52:49.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/gfs2/file.c 2010-08-02 17:05:06.000000000 +0200
@@ -132,6 +132,9 @@ static const u32 fsflags_to_gfs2[32] = {
[7] = GFS2_DIF_NOATIME,
[12] = GFS2_DIF_EXHASH,
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-2.6.35.2/fs/gfs2/inode.h linux-2.6.35.2-vs2.3.0.36.31/fs/gfs2/inode.h
---- linux-2.6.35.2/fs/gfs2/inode.h 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/gfs2/inode.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/gfs2/inode.h linux-2.6.35.4-vs2.3.0.36.32/fs/gfs2/inode.h
+--- linux-2.6.35.4/fs/gfs2/inode.h 2010-08-02 16:52:49.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/gfs2/inode.h 2010-08-02 17:05:06.000000000 +0200
@@ -109,6 +109,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-2.6.35.2/fs/gfs2/ops_inode.c linux-2.6.35.2-vs2.3.0.36.31/fs/gfs2/ops_inode.c
---- linux-2.6.35.2/fs/gfs2/ops_inode.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/gfs2/ops_inode.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/gfs2/ops_inode.c linux-2.6.35.4-vs2.3.0.36.32/fs/gfs2/ops_inode.c
+--- linux-2.6.35.4/fs/gfs2/ops_inode.c 2010-08-02 16:52:49.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/gfs2/ops_inode.c 2010-08-02 17:05:06.000000000 +0200
@@ -1346,6 +1346,7 @@ const struct inode_operations gfs2_file_
.listxattr = gfs2_listxattr,
.removexattr = gfs2_removexattr,
};
const struct inode_operations gfs2_symlink_iops = {
-diff -NurpP --minimal linux-2.6.35.2/fs/hfsplus/ioctl.c linux-2.6.35.2-vs2.3.0.36.31/fs/hfsplus/ioctl.c
---- linux-2.6.35.2/fs/hfsplus/ioctl.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/hfsplus/ioctl.c 2010-08-02 17:48:55.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/hfsplus/ioctl.c linux-2.6.35.4-vs2.3.0.36.32/fs/hfsplus/ioctl.c
+--- linux-2.6.35.4/fs/hfsplus/ioctl.c 2010-08-02 16:52:49.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/hfsplus/ioctl.c 2010-08-02 17:48:55.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/sched.h>
#include <linux/xattr.h>
#include <asm/uaccess.h>
#include "hfsplus_fs.h"
-diff -NurpP --minimal linux-2.6.35.2/fs/inode.c linux-2.6.35.2-vs2.3.0.36.31/fs/inode.c
---- linux-2.6.35.2/fs/inode.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/inode.c 2010-08-02 19:08:57.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/inode.c linux-2.6.35.4-vs2.3.0.36.32/fs/inode.c
+--- linux-2.6.35.4/fs/inode.c 2010-08-02 16:52:49.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/inode.c 2010-08-02 19:08:57.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/mount.h>
#include <linux/async.h>
+ inode->i_tag = dx_current_fstag(inode->i_sb);
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-2.6.35.2/fs/ioctl.c linux-2.6.35.2-vs2.3.0.36.31/fs/ioctl.c
---- linux-2.6.35.2/fs/ioctl.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ioctl.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ioctl.c linux-2.6.35.4-vs2.3.0.36.32/fs/ioctl.c
+--- linux-2.6.35.4/fs/ioctl.c 2010-08-02 16:52:49.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ioctl.c 2010-08-02 17:05:06.000000000 +0200
@@ -16,6 +16,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-2.6.35.2/fs/ioprio.c linux-2.6.35.2-vs2.3.0.36.31/fs/ioprio.c
---- linux-2.6.35.2/fs/ioprio.c 2010-07-07 18:31:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ioprio.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ioprio.c linux-2.6.35.4-vs2.3.0.36.32/fs/ioprio.c
+--- linux-2.6.35.4/fs/ioprio.c 2010-07-07 18:31:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ioprio.c 2010-08-02 17:05:06.000000000 +0200
@@ -27,6 +27,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-2.6.35.2/fs/jfs/file.c linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/file.c
---- linux-2.6.35.2/fs/jfs/file.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/file.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/jfs/file.c linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/file.c
+--- linux-2.6.35.4/fs/jfs/file.c 2010-08-02 16:52:49.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/file.c 2010-08-02 17:05:06.000000000 +0200
@@ -101,7 +101,8 @@ int jfs_setattr(struct dentry *dentry, s
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-2.6.35.2/fs/jfs/ioctl.c linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/ioctl.c
---- linux-2.6.35.2/fs/jfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/ioctl.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/jfs/ioctl.c linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/ioctl.c
+--- linux-2.6.35.4/fs/jfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/ioctl.c 2010-08-02 17:05:06.000000000 +0200
@@ -11,6 +11,7 @@
#include <linux/mount.h>
#include <linux/time.h>
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-2.6.35.2/fs/jfs/jfs_dinode.h linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/jfs_dinode.h
---- linux-2.6.35.2/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/jfs_dinode.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/jfs/jfs_dinode.h linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/jfs_dinode.h
+--- linux-2.6.35.4/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/jfs_dinode.h 2010-08-02 17:05:06.000000000 +0200
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-2.6.35.2/fs/jfs/jfs_filsys.h linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/jfs_filsys.h
---- linux-2.6.35.2/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/jfs_filsys.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/jfs/jfs_filsys.h linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/jfs_filsys.h
+--- linux-2.6.35.4/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/jfs_filsys.h 2010-08-02 17:05:06.000000000 +0200
@@ -263,6 +263,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-2.6.35.2/fs/jfs/jfs_imap.c linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/jfs_imap.c
---- linux-2.6.35.2/fs/jfs/jfs_imap.c 2010-07-07 18:31:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/jfs_imap.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/jfs/jfs_imap.c linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/jfs_imap.c
+--- linux-2.6.35.4/fs/jfs/jfs_imap.c 2010-07-07 18:31:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/jfs_imap.c 2010-08-02 17:05:06.000000000 +0200
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-2.6.35.2/fs/jfs/jfs_inode.c linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/jfs_inode.c
---- linux-2.6.35.2/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/jfs_inode.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/jfs/jfs_inode.c linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/jfs_inode.c
+--- linux-2.6.35.4/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/jfs_inode.c 2010-08-02 17:05:06.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/fs.h>
}
/*
-diff -NurpP --minimal linux-2.6.35.2/fs/jfs/jfs_inode.h linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/jfs_inode.h
---- linux-2.6.35.2/fs/jfs/jfs_inode.h 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/jfs_inode.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/jfs/jfs_inode.h linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/jfs_inode.h
+--- linux-2.6.35.4/fs/jfs/jfs_inode.h 2010-08-02 16:52:49.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/jfs_inode.h 2010-08-02 17:05:06.000000000 +0200
@@ -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);
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern int jfs_setattr(struct dentry *, struct iattr *);
-diff -NurpP --minimal linux-2.6.35.2/fs/jfs/namei.c linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/namei.c
---- linux-2.6.35.2/fs/jfs/namei.c 2010-07-07 18:31:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/namei.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/jfs/namei.c linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/namei.c
+--- linux-2.6.35.4/fs/jfs/namei.c 2010-07-07 18:31:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/namei.c 2010-08-02 17:05:06.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-2.6.35.2/fs/jfs/super.c linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/super.c
---- linux-2.6.35.2/fs/jfs/super.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/jfs/super.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/jfs/super.c linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/super.c
+--- linux-2.6.35.4/fs/jfs/super.c 2010-08-02 16:52:49.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/jfs/super.c 2010-08-02 17:05:06.000000000 +0200
@@ -200,7 +200,8 @@ static void jfs_put_super(struct super_b
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-2.6.35.2/fs/libfs.c linux-2.6.35.2-vs2.3.0.36.31/fs/libfs.c
---- linux-2.6.35.2/fs/libfs.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/libfs.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/libfs.c linux-2.6.35.4-vs2.3.0.36.32/fs/libfs.c
+--- linux-2.6.35.4/fs/libfs.c 2010-08-02 16:52:49.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/libfs.c 2010-08-02 17:05:06.000000000 +0200
@@ -124,7 +124,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(get_sb_pseudo);
EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-2.6.35.2/fs/locks.c linux-2.6.35.2-vs2.3.0.36.31/fs/locks.c
---- linux-2.6.35.2/fs/locks.c 2010-07-07 18:31:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/locks.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/locks.c linux-2.6.35.4-vs2.3.0.36.32/fs/locks.c
+--- linux-2.6.35.4/fs/locks.c 2010-07-07 18:31:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/locks.c 2010-08-02 17:05:06.000000000 +0200
@@ -127,6 +127,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
f->private++;
return 0;
-diff -NurpP --minimal linux-2.6.35.2/fs/namei.c linux-2.6.35.2-vs2.3.0.36.31/fs/namei.c
---- linux-2.6.35.2/fs/namei.c 2010-08-02 16:52:50.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/namei.c 2010-08-14 17:03:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/namei.c linux-2.6.35.4-vs2.3.0.36.32/fs/namei.c
+--- linux-2.6.35.4/fs/namei.c 2010-08-02 16:52:50.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/namei.c 2010-08-14 17:03:20.000000000 +0200
@@ -32,6 +32,14 @@
#include <linux/fcntl.h>
#include <linux/device_cgroup.h>
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-2.6.35.2/fs/namespace.c linux-2.6.35.2-vs2.3.0.36.31/fs/namespace.c
---- linux-2.6.35.2/fs/namespace.c 2010-08-14 18:16:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/namespace.c 2010-08-14 18:21:13.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/namespace.c linux-2.6.35.4-vs2.3.0.36.32/fs/namespace.c
+--- linux-2.6.35.4/fs/namespace.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/namespace.c 2010-08-14 18:21:13.000000000 +0200
@@ -29,6 +29,11 @@
#include <linux/log2.h>
#include <linux/idr.h>
kfree(ns);
}
EXPORT_SYMBOL(put_mnt_ns);
-diff -NurpP --minimal linux-2.6.35.2/fs/nfs/client.c linux-2.6.35.2-vs2.3.0.36.31/fs/nfs/client.c
---- linux-2.6.35.2/fs/nfs/client.c 2010-08-02 16:52:50.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/nfs/client.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/nfs/client.c linux-2.6.35.4-vs2.3.0.36.32/fs/nfs/client.c
+--- linux-2.6.35.4/fs/nfs/client.c 2010-08-02 16:52:50.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/nfs/client.c 2010-08-02 17:05:06.000000000 +0200
@@ -739,6 +739,9 @@ static int nfs_init_server_rpcclient(str
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
server->maxfilesize = fsinfo->maxfilesize;
/* We're airborne Set socket buffersize */
-diff -NurpP --minimal linux-2.6.35.2/fs/nfs/dir.c linux-2.6.35.2-vs2.3.0.36.31/fs/nfs/dir.c
---- linux-2.6.35.2/fs/nfs/dir.c 2010-08-02 16:52:50.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/nfs/dir.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/nfs/dir.c linux-2.6.35.4-vs2.3.0.36.32/fs/nfs/dir.c
+--- linux-2.6.35.4/fs/nfs/dir.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/nfs/dir.c 2010-09-06 02:59:52.000000000 +0200
@@ -33,6 +33,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-2.6.35.2/fs/nfs/inode.c linux-2.6.35.2-vs2.3.0.36.31/fs/nfs/inode.c
---- linux-2.6.35.2/fs/nfs/inode.c 2010-08-02 16:52:50.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/nfs/inode.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/nfs/inode.c linux-2.6.35.4-vs2.3.0.36.32/fs/nfs/inode.c
+--- linux-2.6.35.4/fs/nfs/inode.c 2010-08-02 16:52:50.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/nfs/inode.c 2010-08-02 17:05:06.000000000 +0200
@@ -37,6 +37,7 @@
#include <linux/inet.h>
#include <linux/nfs_xdr.h>
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-2.6.35.2/fs/nfs/nfs3xdr.c linux-2.6.35.2-vs2.3.0.36.31/fs/nfs/nfs3xdr.c
---- linux-2.6.35.2/fs/nfs/nfs3xdr.c 2010-08-02 16:52:50.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/nfs/nfs3xdr.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/nfs/nfs3xdr.c linux-2.6.35.4-vs2.3.0.36.32/fs/nfs/nfs3xdr.c
+--- linux-2.6.35.4/fs/nfs/nfs3xdr.c 2010-08-02 16:52:50.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/nfs/nfs3xdr.c 2010-08-02 17:05:06.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
if (args->type == NF3CHR || args->type == NF3BLK) {
*p++ = htonl(MAJOR(args->rdev));
*p++ = htonl(MINOR(args->rdev));
-diff -NurpP --minimal linux-2.6.35.2/fs/nfs/nfsroot.c linux-2.6.35.2-vs2.3.0.36.31/fs/nfs/nfsroot.c
---- linux-2.6.35.2/fs/nfs/nfsroot.c 2010-08-02 16:52:50.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/nfs/nfsroot.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/nfs/nfsroot.c linux-2.6.35.4-vs2.3.0.36.32/fs/nfs/nfsroot.c
+--- linux-2.6.35.4/fs/nfs/nfsroot.c 2010-08-02 16:52:50.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/nfs/nfsroot.c 2010-08-02 17:05:06.000000000 +0200
@@ -122,12 +122,12 @@ static int mount_port __initdata = 0; /
enum {
/* Options that take integer arguments */
default:
printk(KERN_WARNING "Root-NFS: unknown "
"option: %s\n", p);
-diff -NurpP --minimal linux-2.6.35.2/fs/nfs/super.c linux-2.6.35.2-vs2.3.0.36.31/fs/nfs/super.c
---- linux-2.6.35.2/fs/nfs/super.c 2010-08-02 16:52:50.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/nfs/super.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/nfs/super.c linux-2.6.35.4-vs2.3.0.36.32/fs/nfs/super.c
+--- linux-2.6.35.4/fs/nfs/super.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/nfs/super.c 2010-09-06 02:59:52.000000000 +0200
@@ -54,6 +54,7 @@
#include <linux/nfs_xdr.h>
#include <linux/magic.h>
{ 0, NULL, NULL }
};
const struct proc_nfs_info *nfs_infop;
-diff -NurpP --minimal linux-2.6.35.2/fs/nfsd/auth.c linux-2.6.35.2-vs2.3.0.36.31/fs/nfsd/auth.c
---- linux-2.6.35.2/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/nfsd/auth.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/nfsd/auth.c linux-2.6.35.4-vs2.3.0.36.32/fs/nfsd/auth.c
+--- linux-2.6.35.4/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/nfsd/auth.c 2010-08-02 17:05:06.000000000 +0200
@@ -1,6 +1,7 @@
/* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-2.6.35.2/fs/nfsd/nfs3xdr.c linux-2.6.35.2-vs2.3.0.36.31/fs/nfsd/nfs3xdr.c
---- linux-2.6.35.2/fs/nfsd/nfs3xdr.c 2010-02-25 11:52:05.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/nfsd/nfs3xdr.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/nfsd/nfs3xdr.c linux-2.6.35.4-vs2.3.0.36.32/fs/nfsd/nfs3xdr.c
+--- linux-2.6.35.4/fs/nfsd/nfs3xdr.c 2010-02-25 11:52:05.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/nfsd/nfs3xdr.c 2010-08-02 17:05:06.000000000 +0200
@@ -7,6 +7,7 @@
*/
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-2.6.35.2/fs/nfsd/nfs4xdr.c linux-2.6.35.2-vs2.3.0.36.31/fs/nfsd/nfs4xdr.c
---- linux-2.6.35.2/fs/nfsd/nfs4xdr.c 2010-08-02 16:52:50.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/nfsd/nfs4xdr.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/nfsd/nfs4xdr.c linux-2.6.35.4-vs2.3.0.36.32/fs/nfsd/nfs4xdr.c
+--- linux-2.6.35.4/fs/nfsd/nfs4xdr.c 2010-08-02 16:52:50.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/nfsd/nfs4xdr.c 2010-08-02 17:05:06.000000000 +0200
@@ -47,6 +47,7 @@
#include <linux/nfsd_idmap.h>
#include <linux/nfs4_acl.h>
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-2.6.35.2/fs/nfsd/nfsxdr.c linux-2.6.35.2-vs2.3.0.36.31/fs/nfsd/nfsxdr.c
---- linux-2.6.35.2/fs/nfsd/nfsxdr.c 2010-02-25 11:52:05.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/nfsd/nfsxdr.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/nfsd/nfsxdr.c linux-2.6.35.4-vs2.3.0.36.32/fs/nfsd/nfsxdr.c
+--- linux-2.6.35.4/fs/nfsd/nfsxdr.c 2010-02-25 11:52:05.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/nfsd/nfsxdr.c 2010-08-02 17:05:06.000000000 +0200
@@ -6,6 +6,7 @@
#include "xdr.h"
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-2.6.35.2/fs/ocfs2/dlmglue.c linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/dlmglue.c
---- linux-2.6.35.2/fs/ocfs2/dlmglue.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/dlmglue.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ocfs2/dlmglue.c linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/dlmglue.c
+--- linux-2.6.35.4/fs/ocfs2/dlmglue.c 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/dlmglue.c 2010-08-02 17:05:06.000000000 +0200
@@ -2114,6 +2114,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);
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
inode->i_nlink = be16_to_cpu(lvb->lvb_inlink);
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-2.6.35.2/fs/ocfs2/dlmglue.h linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/dlmglue.h
---- linux-2.6.35.2/fs/ocfs2/dlmglue.h 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/dlmglue.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ocfs2/dlmglue.h linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/dlmglue.h
+--- linux-2.6.35.4/fs/ocfs2/dlmglue.h 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/dlmglue.h 2010-08-02 17:05:06.000000000 +0200
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-2.6.35.2/fs/ocfs2/file.c linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/file.c
---- linux-2.6.35.2/fs/ocfs2/file.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/file.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ocfs2/file.c linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/file.c
+--- linux-2.6.35.4/fs/ocfs2/file.c 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/file.c 2010-08-02 17:05:06.000000000 +0200
@@ -1129,13 +1129,15 @@ int ocfs2_setattr(struct dentry *dentry,
mlog(0, "uid change: %d\n", attr->ia_uid);
if (attr->ia_valid & ATTR_GID)
if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) {
mlog(0, "can't handle attrs: 0x%x\n", attr->ia_valid);
return 0;
-diff -NurpP --minimal linux-2.6.35.2/fs/ocfs2/inode.c linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/inode.c
---- linux-2.6.35.2/fs/ocfs2/inode.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/inode.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ocfs2/inode.c linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/inode.c
+--- linux-2.6.35.4/fs/ocfs2/inode.c 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/inode.c 2010-08-02 17:05:06.000000000 +0200
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
-diff -NurpP --minimal linux-2.6.35.2/fs/ocfs2/inode.h linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/inode.h
---- linux-2.6.35.2/fs/ocfs2/inode.h 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/inode.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ocfs2/inode.h linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/inode.h
+--- linux-2.6.35.4/fs/ocfs2/inode.h 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/inode.h 2010-08-02 17:05:06.000000000 +0200
@@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-2.6.35.2/fs/ocfs2/ioctl.c linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/ioctl.c
---- linux-2.6.35.2/fs/ocfs2/ioctl.c 2010-02-25 11:52:06.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/ioctl.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ocfs2/ioctl.c linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/ioctl.c
+--- linux-2.6.35.4/fs/ocfs2/ioctl.c 2010-02-25 11:52:06.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/ioctl.c 2010-08-02 17:05:06.000000000 +0200
@@ -43,7 +43,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = filp->f_path.dentry->d_inode;
-diff -NurpP --minimal linux-2.6.35.2/fs/ocfs2/namei.c linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/namei.c
---- linux-2.6.35.2/fs/ocfs2/namei.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/namei.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ocfs2/namei.c linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/namei.c
+--- linux-2.6.35.4/fs/ocfs2/namei.c 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/namei.c 2010-08-02 17:05:06.000000000 +0200
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
fe->i_mode = cpu_to_le16(inode->i_mode);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-2.6.35.2/fs/ocfs2/ocfs2_fs.h linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/ocfs2_fs.h
---- linux-2.6.35.2/fs/ocfs2/ocfs2_fs.h 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/ocfs2_fs.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ocfs2/ocfs2_fs.h linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/ocfs2_fs.h
+--- linux-2.6.35.4/fs/ocfs2/ocfs2_fs.h 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/ocfs2_fs.h 2010-08-02 17:05:06.000000000 +0200
@@ -235,18 +235,23 @@
#define OCFS2_HAS_REFCOUNT_FL (0x0010)
/*
* Extent record flags (e_node.leaf.flags)
-diff -NurpP --minimal linux-2.6.35.2/fs/ocfs2/ocfs2.h linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/ocfs2.h
---- linux-2.6.35.2/fs/ocfs2/ocfs2.h 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/ocfs2.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ocfs2/ocfs2.h linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/ocfs2.h
+--- linux-2.6.35.4/fs/ocfs2/ocfs2.h 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/ocfs2.h 2010-08-02 17:05:06.000000000 +0200
@@ -256,6 +256,7 @@ enum ocfs2_mount_options
control lists */
OCFS2_MOUNT_USRQUOTA = 1 << 10, /* We support user quotas */
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-2.6.35.2/fs/ocfs2/super.c linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/super.c
---- linux-2.6.35.2/fs/ocfs2/super.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/ocfs2/super.c 2010-08-02 18:00:11.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/ocfs2/super.c linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/super.c
+--- linux-2.6.35.4/fs/ocfs2/super.c 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/ocfs2/super.c 2010-08-02 18:00:11.000000000 +0200
@@ -180,6 +180,7 @@ enum {
Opt_grpquota,
Opt_resv_level,
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-2.6.35.2/fs/open.c linux-2.6.35.2-vs2.3.0.36.31/fs/open.c
---- linux-2.6.35.2/fs/open.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/open.c 2010-08-02 21:36:22.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/open.c linux-2.6.35.4-vs2.3.0.36.32/fs/open.c
+--- linux-2.6.35.4/fs/open.c 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/open.c 2010-08-02 21:36:22.000000000 +0200
@@ -29,6 +29,11 @@
#include <linux/falloc.h>
#include <linux/fs_struct.h>
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-2.6.35.2/fs/proc/array.c linux-2.6.35.2-vs2.3.0.36.31/fs/proc/array.c
---- linux-2.6.35.2/fs/proc/array.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/proc/array.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/proc/array.c linux-2.6.35.4-vs2.3.0.36.32/fs/proc/array.c
+--- linux-2.6.35.4/fs/proc/array.c 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/proc/array.c 2010-08-02 17:05:06.000000000 +0200
@@ -81,6 +81,8 @@
#include <linux/pid_namespace.h>
#include <linux/ptrace.h>
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",
-diff -NurpP --minimal linux-2.6.35.2/fs/proc/base.c linux-2.6.35.2-vs2.3.0.36.31/fs/proc/base.c
---- linux-2.6.35.2/fs/proc/base.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/proc/base.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/proc/base.c linux-2.6.35.4-vs2.3.0.36.32/fs/proc/base.c
+--- linux-2.6.35.4/fs/proc/base.c 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/proc/base.c 2010-08-02 17:05:06.000000000 +0200
@@ -82,6 +82,8 @@
#include <linux/pid_namespace.h>
#include <linux/fs_struct.h>
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-2.6.35.2/fs/proc/generic.c linux-2.6.35.2-vs2.3.0.36.31/fs/proc/generic.c
---- linux-2.6.35.2/fs/proc/generic.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/proc/generic.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/proc/generic.c linux-2.6.35.4-vs2.3.0.36.32/fs/proc/generic.c
+--- linux-2.6.35.4/fs/proc/generic.c 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/proc/generic.c 2010-08-02 17:05:06.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-2.6.35.2/fs/proc/inode.c linux-2.6.35.2-vs2.3.0.36.31/fs/proc/inode.c
---- linux-2.6.35.2/fs/proc/inode.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/proc/inode.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/proc/inode.c linux-2.6.35.4-vs2.3.0.36.32/fs/proc/inode.c
+--- linux-2.6.35.4/fs/proc/inode.c 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/proc/inode.c 2010-08-02 17:05:06.000000000 +0200
@@ -437,6 +437,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-2.6.35.2/fs/proc/internal.h linux-2.6.35.2-vs2.3.0.36.31/fs/proc/internal.h
---- linux-2.6.35.2/fs/proc/internal.h 2010-02-25 11:52:06.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/proc/internal.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/proc/internal.h linux-2.6.35.4-vs2.3.0.36.32/fs/proc/internal.h
+--- linux-2.6.35.4/fs/proc/internal.h 2010-02-25 11:52:06.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/proc/internal.h 2010-08-02 17:05:06.000000000 +0200
@@ -10,6 +10,7 @@
*/
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-2.6.35.2/fs/proc/loadavg.c linux-2.6.35.2-vs2.3.0.36.31/fs/proc/loadavg.c
---- linux-2.6.35.2/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/proc/loadavg.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/proc/loadavg.c linux-2.6.35.4-vs2.3.0.36.32/fs/proc/loadavg.c
+--- linux-2.6.35.4/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/proc/loadavg.c 2010-08-02 17:05:06.000000000 +0200
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-2.6.35.2/fs/proc/meminfo.c linux-2.6.35.2-vs2.3.0.36.31/fs/proc/meminfo.c
---- linux-2.6.35.2/fs/proc/meminfo.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/proc/meminfo.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/proc/meminfo.c linux-2.6.35.4-vs2.3.0.36.32/fs/proc/meminfo.c
+--- linux-2.6.35.4/fs/proc/meminfo.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/proc/meminfo.c 2010-08-02 17:05:06.000000000 +0200
@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
allowed = ((totalram_pages - hugetlb_total_pages())
* sysctl_overcommit_ratio / 100) + total_swap_pages;
total_swapcache_pages - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-2.6.35.2/fs/proc/root.c linux-2.6.35.2-vs2.3.0.36.31/fs/proc/root.c
---- linux-2.6.35.2/fs/proc/root.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/proc/root.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/proc/root.c linux-2.6.35.4-vs2.3.0.36.32/fs/proc/root.c
+--- linux-2.6.35.4/fs/proc/root.c 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/proc/root.c 2010-08-02 17:05:06.000000000 +0200
@@ -18,9 +18,14 @@
#include <linux/bitops.h>
#include <linux/mount.h>
};
int pid_ns_prepare_proc(struct pid_namespace *ns)
-diff -NurpP --minimal linux-2.6.35.2/fs/proc/uptime.c linux-2.6.35.2-vs2.3.0.36.31/fs/proc/uptime.c
---- linux-2.6.35.2/fs/proc/uptime.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/proc/uptime.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/proc/uptime.c linux-2.6.35.4-vs2.3.0.36.32/fs/proc/uptime.c
+--- linux-2.6.35.4/fs/proc/uptime.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/proc/uptime.c 2010-08-02 17:05:06.000000000 +0200
@@ -4,22 +4,22 @@
#include <linux/sched.h>
#include <linux/seq_file.h>
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-2.6.35.2/fs/quota/dquot.c linux-2.6.35.2-vs2.3.0.36.31/fs/quota/dquot.c
---- linux-2.6.35.2/fs/quota/dquot.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/quota/dquot.c 2010-08-02 22:36:48.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/quota/dquot.c linux-2.6.35.4-vs2.3.0.36.32/fs/quota/dquot.c
+--- linux-2.6.35.4/fs/quota/dquot.c 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/quota/dquot.c 2010-08-02 22:36:48.000000000 +0200
@@ -1503,6 +1503,9 @@ int __dquot_alloc_space(struct inode *in
int reserve = flags & DQUOT_SPACE_RESERVE;
int nofail = flags & DQUOT_SPACE_NOFAIL;
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!sb_any_quota_active(inode->i_sb) || IS_NOQUOTA(inode))
-diff -NurpP --minimal linux-2.6.35.2/fs/quota/quota.c linux-2.6.35.2-vs2.3.0.36.31/fs/quota/quota.c
---- linux-2.6.35.2/fs/quota/quota.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/quota/quota.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/quota/quota.c linux-2.6.35.4-vs2.3.0.36.32/fs/quota/quota.c
+--- linux-2.6.35.4/fs/quota/quota.c 2010-08-02 16:52:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/quota/quota.c 2010-08-02 17:05:06.000000000 +0200
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-2.6.35.2/fs/reiserfs/file.c linux-2.6.35.2-vs2.3.0.36.31/fs/reiserfs/file.c
---- linux-2.6.35.2/fs/reiserfs/file.c 2010-08-02 16:52:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/reiserfs/file.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/reiserfs/file.c linux-2.6.35.4-vs2.3.0.36.32/fs/reiserfs/file.c
+--- linux-2.6.35.4/fs/reiserfs/file.c 2010-08-02 16:52:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/reiserfs/file.c 2010-08-02 17:05:06.000000000 +0200
@@ -307,4 +307,5 @@ const struct inode_operations reiserfs_f
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
.permission = reiserfs_permission,
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-2.6.35.2/fs/reiserfs/inode.c linux-2.6.35.2-vs2.3.0.36.31/fs/reiserfs/inode.c
---- linux-2.6.35.2/fs/reiserfs/inode.c 2010-08-02 16:52:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/reiserfs/inode.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/reiserfs/inode.c linux-2.6.35.4-vs2.3.0.36.32/fs/reiserfs/inode.c
+--- linux-2.6.35.4/fs/reiserfs/inode.c 2010-08-02 16:52:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/reiserfs/inode.c 2010-08-02 17:05:06.000000000 +0200
@@ -19,6 +19,7 @@
#include <linux/writeback.h>
#include <linux/quotaops.h>
mark_inode_dirty(inode);
error =
journal_end(&th, inode->i_sb, jbegin_count);
-diff -NurpP --minimal linux-2.6.35.2/fs/reiserfs/ioctl.c linux-2.6.35.2-vs2.3.0.36.31/fs/reiserfs/ioctl.c
---- linux-2.6.35.2/fs/reiserfs/ioctl.c 2010-02-25 11:52:06.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/reiserfs/ioctl.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/reiserfs/ioctl.c linux-2.6.35.4-vs2.3.0.36.32/fs/reiserfs/ioctl.c
+--- linux-2.6.35.4/fs/reiserfs/ioctl.c 2010-02-25 11:52:06.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/reiserfs/ioctl.c 2010-08-02 17:05:06.000000000 +0200
@@ -7,11 +7,27 @@
#include <linux/mount.h>
#include <linux/reiserfs_fs.h>
sd_attrs_to_i_attrs(flags, inode);
REISERFS_I(inode)->i_attrs = flags;
inode->i_ctime = CURRENT_TIME_SEC;
-diff -NurpP --minimal linux-2.6.35.2/fs/reiserfs/namei.c linux-2.6.35.2-vs2.3.0.36.31/fs/reiserfs/namei.c
---- linux-2.6.35.2/fs/reiserfs/namei.c 2010-08-02 16:52:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/reiserfs/namei.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/reiserfs/namei.c linux-2.6.35.4-vs2.3.0.36.32/fs/reiserfs/namei.c
+--- linux-2.6.35.4/fs/reiserfs/namei.c 2010-08-02 16:52:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/reiserfs/namei.c 2010-08-02 17:05:06.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/reiserfs_acl.h>
#include <linux/reiserfs_xattr.h>
};
/*
-diff -NurpP --minimal linux-2.6.35.2/fs/reiserfs/super.c linux-2.6.35.2-vs2.3.0.36.31/fs/reiserfs/super.c
---- linux-2.6.35.2/fs/reiserfs/super.c 2010-08-02 16:52:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/reiserfs/super.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/reiserfs/super.c linux-2.6.35.4-vs2.3.0.36.32/fs/reiserfs/super.c
+--- linux-2.6.35.4/fs/reiserfs/super.c 2010-08-02 16:52:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/reiserfs/super.c 2010-08-02 17:05:06.000000000 +0200
@@ -897,6 +897,14 @@ static int reiserfs_parse_options(struct
{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
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,
-diff -NurpP --minimal linux-2.6.35.2/fs/reiserfs/xattr.c linux-2.6.35.2-vs2.3.0.36.31/fs/reiserfs/xattr.c
---- linux-2.6.35.2/fs/reiserfs/xattr.c 2010-08-02 16:52:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/reiserfs/xattr.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/reiserfs/xattr.c linux-2.6.35.4-vs2.3.0.36.32/fs/reiserfs/xattr.c
+--- linux-2.6.35.4/fs/reiserfs/xattr.c 2010-08-02 16:52:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/reiserfs/xattr.c 2010-08-02 17:05:06.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/errno.h>
#include <linux/gfp.h>
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-diff -NurpP --minimal linux-2.6.35.2/fs/stat.c linux-2.6.35.2-vs2.3.0.36.31/fs/stat.c
---- linux-2.6.35.2/fs/stat.c 2010-02-25 11:52:06.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/stat.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/stat.c linux-2.6.35.4-vs2.3.0.36.32/fs/stat.c
+--- linux-2.6.35.4/fs/stat.c 2010-02-25 11:52:06.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/stat.c 2010-08-02 17:05:06.000000000 +0200
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
stat->rdev = inode->i_rdev;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-2.6.35.2/fs/statfs.c linux-2.6.35.2-vs2.3.0.36.31/fs/statfs.c
---- linux-2.6.35.2/fs/statfs.c 2010-08-02 16:52:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/statfs.c 2010-08-02 19:10:27.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/statfs.c linux-2.6.35.4-vs2.3.0.36.32/fs/statfs.c
+--- linux-2.6.35.4/fs/statfs.c 2010-08-02 16:52:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/statfs.c 2010-08-02 19:10:27.000000000 +0200
@@ -6,22 +6,28 @@
#include <linux/statfs.h>
#include <linux/security.h>
}
return retval;
}
-diff -NurpP --minimal linux-2.6.35.2/fs/super.c linux-2.6.35.2-vs2.3.0.36.31/fs/super.c
---- linux-2.6.35.2/fs/super.c 2010-08-14 18:16:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/super.c 2010-08-14 18:20:34.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/super.c linux-2.6.35.4-vs2.3.0.36.32/fs/super.c
+--- linux-2.6.35.4/fs/super.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/super.c 2010-08-14 18:20:34.000000000 +0200
@@ -30,6 +30,9 @@
#include <linux/idr.h>
#include <linux/mutex.h>
if (error)
goto out_sb;
-diff -NurpP --minimal linux-2.6.35.2/fs/sysfs/mount.c linux-2.6.35.2-vs2.3.0.36.31/fs/sysfs/mount.c
---- linux-2.6.35.2/fs/sysfs/mount.c 2010-08-02 16:52:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/sysfs/mount.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/sysfs/mount.c linux-2.6.35.4-vs2.3.0.36.32/fs/sysfs/mount.c
+--- linux-2.6.35.4/fs/sysfs/mount.c 2010-08-02 16:52:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/sysfs/mount.c 2010-08-02 17:05:06.000000000 +0200
@@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-2.6.35.2/fs/utimes.c linux-2.6.35.2-vs2.3.0.36.31/fs/utimes.c
---- linux-2.6.35.2/fs/utimes.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/utimes.c 2010-08-02 22:52:28.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/utimes.c linux-2.6.35.4-vs2.3.0.36.32/fs/utimes.c
+--- linux-2.6.35.4/fs/utimes.c 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/utimes.c 2010-08-02 22:52:28.000000000 +0200
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-2.6.35.2/fs/xattr.c linux-2.6.35.2-vs2.3.0.36.31/fs/xattr.c
---- linux-2.6.35.2/fs/xattr.c 2010-08-02 16:52:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xattr.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xattr.c linux-2.6.35.4-vs2.3.0.36.32/fs/xattr.c
+--- linux-2.6.35.4/fs/xattr.c 2010-08-02 16:52:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xattr.c 2010-08-02 17:05:06.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
/* In user.* namespace, only regular files and directories can have
* extended attributes. For sticky directories, only the owner and
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.35.2/fs/xfs/linux-2.6/xfs_ioctl.c 2010-08-02 16:52:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/linux-2.6/xfs_ioctl.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.35.4/fs/xfs/linux-2.6/xfs_ioctl.c 2010-08-02 16:52:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/linux-2.6/xfs_ioctl.c 2010-08-02 17:05:06.000000000 +0200
@@ -34,7 +34,6 @@
#include "xfs_dir2_sf.h"
#include "xfs_dinode.h"
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/linux-2.6/xfs_ioctl.h
---- linux-2.6.35.2/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 18:31:54.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/linux-2.6/xfs_ioctl.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/linux-2.6/xfs_ioctl.h
+--- linux-2.6.35.4/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 18:31:54.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/linux-2.6/xfs_ioctl.h 2010-08-02 17:05:06.000000000 +0200
@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
void __user *uhandle,
u32 hlen);
extern long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.35.2/fs/xfs/linux-2.6/xfs_iops.c 2010-08-02 16:52:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/linux-2.6/xfs_iops.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.35.4/fs/xfs/linux-2.6/xfs_iops.c 2010-08-02 16:52:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/linux-2.6/xfs_iops.c 2010-08-02 17:05:06.000000000 +0200
@@ -36,6 +36,7 @@
#include "xfs_attr_sf.h"
#include "xfs_dinode.h"
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/linux-2.6/xfs_linux.h
---- linux-2.6.35.2/fs/xfs/linux-2.6/xfs_linux.h 2010-07-07 18:31:54.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/linux-2.6/xfs_linux.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/linux-2.6/xfs_linux.h
+--- linux-2.6.35.4/fs/xfs/linux-2.6/xfs_linux.h 2010-07-07 18:31:54.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/linux-2.6/xfs_linux.h 2010-08-02 17:05:06.000000000 +0200
@@ -117,6 +117,7 @@
#define current_cpu() (raw_smp_processor_id())
#define current_test_flags(f) (current->flags & (f))
#define current_set_flags_nested(sp, f) \
(*(sp) = current->flags, current->flags |= (f))
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/linux-2.6/xfs_super.c linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/linux-2.6/xfs_super.c
---- linux-2.6.35.2/fs/xfs/linux-2.6/xfs_super.c 2010-08-02 16:52:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/linux-2.6/xfs_super.c 2010-08-02 18:00:35.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/linux-2.6/xfs_super.c linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/linux-2.6/xfs_super.c
+--- linux-2.6.35.4/fs/xfs/linux-2.6/xfs_super.c 2010-08-02 16:52:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/linux-2.6/xfs_super.c 2010-08-02 18:00:35.000000000 +0200
@@ -121,6 +121,9 @@ mempool_t *xfs_ioend_pool;
#define MNTOPT_DMI "dmi" /* DMI enabled (DMAPI / XDSM) */
#define MNTOPT_DELAYLOG "delaylog" /* Delayed loging enabled */
sb->s_magic = XFS_SB_MAGIC;
sb->s_blocksize = mp->m_sb.sb_blocksize;
sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1;
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/xfs_dinode.h linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_dinode.h
---- linux-2.6.35.2/fs/xfs/xfs_dinode.h 2009-06-11 17:13:09.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_dinode.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/xfs_dinode.h linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_dinode.h
+--- linux-2.6.35.4/fs/xfs/xfs_dinode.h 2009-06-11 17:13:09.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_dinode.h 2010-08-02 17:05:06.000000000 +0200
@@ -50,7 +50,9 @@ typedef struct xfs_dinode {
__be32 di_gid; /* owner's group id */
__be32 di_nlink; /* number of links to file */
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/xfs_fs.h linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_fs.h
---- linux-2.6.35.2/fs/xfs/xfs_fs.h 2010-07-07 18:31:54.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_fs.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/xfs_fs.h linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_fs.h
+--- linux-2.6.35.4/fs/xfs/xfs_fs.h 2010-07-07 18:31:54.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_fs.h 2010-08-02 17:05:06.000000000 +0200
@@ -67,6 +67,9 @@ struct fsxattr {
#define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
#define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
__u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/xfs_ialloc.c linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_ialloc.c
---- linux-2.6.35.2/fs/xfs/xfs_ialloc.c 2010-08-02 16:52:53.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_ialloc.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/xfs_ialloc.c linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_ialloc.c
+--- linux-2.6.35.4/fs/xfs/xfs_ialloc.c 2010-08-02 16:52:53.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_ialloc.c 2010-08-02 17:05:06.000000000 +0200
@@ -41,7 +41,6 @@
#include "xfs_error.h"
#include "xfs_bmap.h"
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/xfs_inode.c linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_inode.c
---- linux-2.6.35.2/fs/xfs/xfs_inode.c 2010-08-02 16:52:53.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_inode.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/xfs_inode.c linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_inode.c
+--- linux-2.6.35.4/fs/xfs/xfs_inode.c 2010-08-02 16:52:53.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_inode.c 2010-08-02 17:05:06.000000000 +0200
@@ -249,6 +249,7 @@ xfs_inotobp(
return 0;
}
/* Wrap, we never let the log put out DI_MAX_FLUSH */
if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/xfs_inode.h linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_inode.h
---- linux-2.6.35.2/fs/xfs/xfs_inode.h 2010-08-02 16:52:53.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_inode.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/xfs_inode.h linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_inode.h
+--- linux-2.6.35.4/fs/xfs/xfs_inode.h 2010-08-02 16:52:53.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_inode.h 2010-08-02 17:05:06.000000000 +0200
@@ -135,7 +135,9 @@ typedef struct xfs_icdinode {
__uint32_t di_gid; /* owner's group id */
__uint32_t di_nlink; /* number of links to file */
void xfs_idestroy_fork(struct xfs_inode *, int);
void xfs_idata_realloc(struct xfs_inode *, int, int);
void xfs_iroot_realloc(struct xfs_inode *, int, int);
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/xfs_itable.c linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_itable.c
---- linux-2.6.35.2/fs/xfs/xfs_itable.c 2010-08-02 16:52:53.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_itable.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/xfs_itable.c linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_itable.c
+--- linux-2.6.35.4/fs/xfs/xfs_itable.c 2010-08-02 16:52:53.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_itable.c 2010-08-02 17:05:06.000000000 +0200
@@ -100,6 +100,7 @@ xfs_bulkstat_one_int(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
buf->bs_size = dic->di_size;
/*
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/xfs_log_recover.c linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_log_recover.c
---- linux-2.6.35.2/fs/xfs/xfs_log_recover.c 2010-08-02 16:52:53.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_log_recover.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/xfs_log_recover.c linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_log_recover.c
+--- linux-2.6.35.4/fs/xfs/xfs_log_recover.c 2010-08-02 16:52:53.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_log_recover.c 2010-08-02 17:05:06.000000000 +0200
@@ -2461,7 +2461,8 @@ xlog_recover_do_inode_trans(
}
/* the rest is in on-disk format */
if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/xfs_mount.h linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_mount.h
---- linux-2.6.35.2/fs/xfs/xfs_mount.h 2010-08-02 16:52:53.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_mount.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/xfs_mount.h linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_mount.h
+--- linux-2.6.35.4/fs/xfs/xfs_mount.h 2010-08-02 16:52:53.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_mount.h 2010-08-02 17:05:06.000000000 +0200
@@ -302,6 +302,7 @@ typedef struct xfs_mount {
allocator */
#define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/xfs_vnodeops.c linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_vnodeops.c
---- linux-2.6.35.2/fs/xfs/xfs_vnodeops.c 2010-08-02 16:52:53.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_vnodeops.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/xfs_vnodeops.c linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_vnodeops.c
+--- linux-2.6.35.4/fs/xfs/xfs_vnodeops.c 2010-08-02 16:52:53.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_vnodeops.c 2010-08-02 17:05:06.000000000 +0200
@@ -55,6 +55,80 @@
#include "xfs_vnodeops.h"
#include "xfs_trace.h"
if (iuid != uid) {
if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) {
ASSERT(mask & ATTR_UID);
-diff -NurpP --minimal linux-2.6.35.2/fs/xfs/xfs_vnodeops.h linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_vnodeops.h
---- linux-2.6.35.2/fs/xfs/xfs_vnodeops.h 2010-07-07 18:31:54.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/fs/xfs/xfs_vnodeops.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/fs/xfs/xfs_vnodeops.h linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_vnodeops.h
+--- linux-2.6.35.4/fs/xfs/xfs_vnodeops.h 2010-07-07 18:31:54.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/fs/xfs/xfs_vnodeops.h 2010-08-02 17:05:06.000000000 +0200
@@ -14,6 +14,7 @@ struct xfs_inode;
struct xfs_iomap;
int xfs_setattr(struct xfs_inode *ip, struct iattr *vap, int flags);
#define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */
#define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if operation would block */
-diff -NurpP --minimal linux-2.6.35.2/include/asm-generic/tlb.h linux-2.6.35.2-vs2.3.0.36.31/include/asm-generic/tlb.h
---- linux-2.6.35.2/include/asm-generic/tlb.h 2009-09-10 15:26:24.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/asm-generic/tlb.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/asm-generic/tlb.h linux-2.6.35.4-vs2.3.0.36.32/include/asm-generic/tlb.h
+--- linux-2.6.35.4/include/asm-generic/tlb.h 2009-09-10 15:26:24.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/asm-generic/tlb.h 2010-08-02 17:05:06.000000000 +0200
@@ -14,6 +14,7 @@
#define _ASM_GENERIC__TLB_H
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.35.2/include/linux/capability.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/capability.h
---- linux-2.6.35.2/include/linux/capability.h 2010-02-25 11:52:07.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/capability.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/capability.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/capability.h
+--- linux-2.6.35.4/include/linux/capability.h 2010-02-25 11:52:07.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/capability.h 2010-08-02 17:05:06.000000000 +0200
@@ -283,6 +283,7 @@ struct cpu_vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
-diff -NurpP --minimal linux-2.6.35.2/include/linux/devpts_fs.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/devpts_fs.h
---- linux-2.6.35.2/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/devpts_fs.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/devpts_fs.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/devpts_fs.h
+--- linux-2.6.35.4/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/devpts_fs.h 2010-08-02 17:05:06.000000000 +0200
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/ext2_fs.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/ext2_fs.h
---- linux-2.6.35.2/include/linux/ext2_fs.h 2010-02-25 11:52:07.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/ext2_fs.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/ext2_fs.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/ext2_fs.h
+--- linux-2.6.35.4/include/linux/ext2_fs.h 2010-02-25 11:52:07.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/ext2_fs.h 2010-08-02 17:05:06.000000000 +0200
@@ -189,8 +189,12 @@ 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) */
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-2.6.35.2/include/linux/ext3_fs.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/ext3_fs.h
---- linux-2.6.35.2/include/linux/ext3_fs.h 2010-08-02 16:52:54.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/ext3_fs.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/ext3_fs.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/ext3_fs.h
+--- linux-2.6.35.4/include/linux/ext3_fs.h 2010-08-02 16:52:54.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/ext3_fs.h 2010-08-02 17:05:06.000000000 +0200
@@ -173,10 +173,14 @@ struct ext3_group_desc
#define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-2.6.35.2/include/linux/fs.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/fs.h
---- linux-2.6.35.2/include/linux/fs.h 2010-08-14 18:16:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/fs.h 2010-08-14 18:21:44.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/fs.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/fs.h
+--- linux-2.6.35.4/include/linux/fs.h 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/fs.h 2010-08-14 18:21:44.000000000 +0200
@@ -209,6 +209,9 @@ struct inodes_stat_t {
#define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
#define MS_I_VERSION (1<<23) /* Update inode I_version field */
extern int simple_setattr(struct dentry *, struct iattr *);
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
-diff -NurpP --minimal linux-2.6.35.2/include/linux/gfs2_ondisk.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/gfs2_ondisk.h
---- linux-2.6.35.2/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/gfs2_ondisk.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/gfs2_ondisk.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/gfs2_ondisk.h
+--- linux-2.6.35.4/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/gfs2_ondisk.h 2010-08-02 17:05:06.000000000 +0200
@@ -211,6 +211,9 @@ enum {
gfs2fl_NoAtime = 7,
gfs2fl_Sync = 8,
#define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
#define GFS2_DIF_INHERIT_DIRECTIO 0x40000000
#define GFS2_DIF_INHERIT_JDATA 0x80000000
-diff -NurpP --minimal linux-2.6.35.2/include/linux/if_tun.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/if_tun.h
---- linux-2.6.35.2/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/if_tun.h 2010-08-02 18:17:46.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/if_tun.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/if_tun.h
+--- linux-2.6.35.4/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/if_tun.h 2010-08-02 18:17:46.000000000 +0200
@@ -53,6 +53,7 @@
#define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
#define TUNGETVNETHDRSZ _IOR('T', 215, int)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-2.6.35.2/include/linux/init_task.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/init_task.h
---- linux-2.6.35.2/include/linux/init_task.h 2010-08-02 16:52:54.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/init_task.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/init_task.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/init_task.h
+--- linux-2.6.35.4/include/linux/init_task.h 2010-08-02 16:52:54.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/init_task.h 2010-08-02 17:05:06.000000000 +0200
@@ -172,6 +172,10 @@ extern struct cred init_cred;
INIT_FTRACE_GRAPH \
INIT_TRACE_RECURSION \
}
-diff -NurpP --minimal linux-2.6.35.2/include/linux/ipc.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/ipc.h
---- linux-2.6.35.2/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/ipc.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/ipc.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/ipc.h
+--- linux-2.6.35.4/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/ipc.h 2010-08-02 17:05:06.000000000 +0200
@@ -91,6 +91,7 @@ struct kern_ipc_perm
key_t key;
uid_t uid;
uid_t cuid;
gid_t cgid;
mode_t mode;
-diff -NurpP --minimal linux-2.6.35.2/include/linux/Kbuild linux-2.6.35.2-vs2.3.0.36.31/include/linux/Kbuild
---- linux-2.6.35.2/include/linux/Kbuild 2010-08-14 18:16:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/Kbuild 2010-08-14 18:19:32.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/Kbuild linux-2.6.35.4-vs2.3.0.36.32/include/linux/Kbuild
+--- linux-2.6.35.4/include/linux/Kbuild 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/Kbuild 2010-08-14 18:19:32.000000000 +0200
@@ -388,5 +388,8 @@ unifdef-y += xattr.h
unifdef-y += xfrm.h
header-y += wimax.h
header-y += wimax/
+
-diff -NurpP --minimal linux-2.6.35.2/include/linux/loop.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/loop.h
---- linux-2.6.35.2/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/loop.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/loop.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/loop.h
+--- linux-2.6.35.4/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/loop.h 2010-08-02 17:05:06.000000000 +0200
@@ -45,6 +45,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-2.6.35.2/include/linux/magic.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/magic.h
---- linux-2.6.35.2/include/linux/magic.h 2010-07-07 18:31:55.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/magic.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/magic.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/magic.h
+--- linux-2.6.35.4/include/linux/magic.h 2010-07-07 18:31:55.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/magic.h 2010-08-02 17:05:06.000000000 +0200
@@ -3,7 +3,7 @@
#define ADFS_SUPER_MAGIC 0xadf5
#define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */
#define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/major.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/major.h
---- linux-2.6.35.2/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/major.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/major.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/major.h
+--- linux-2.6.35.4/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/major.h 2010-08-02 17:05:06.000000000 +0200
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-2.6.35.2/include/linux/memcontrol.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/memcontrol.h
---- linux-2.6.35.2/include/linux/memcontrol.h 2010-08-02 16:52:54.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/memcontrol.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/memcontrol.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/memcontrol.h
+--- linux-2.6.35.4/include/linux/memcontrol.h 2010-08-02 16:52:54.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/memcontrol.h 2010-08-02 17:05:06.000000000 +0200
@@ -77,6 +77,13 @@ int task_in_mem_cgroup(struct task_struc
extern struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page);
extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
static inline
int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
{
-diff -NurpP --minimal linux-2.6.35.2/include/linux/mm_types.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/mm_types.h
---- linux-2.6.35.2/include/linux/mm_types.h 2010-07-07 18:31:55.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/mm_types.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/mm_types.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/mm_types.h
+--- linux-2.6.35.4/include/linux/mm_types.h 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/mm_types.h 2010-09-06 02:59:52.000000000 +0200
@@ -269,6 +269,7 @@ struct mm_struct {
/* Architecture-specific MM context */
/* Swap token stuff */
/*
-diff -NurpP --minimal linux-2.6.35.2/include/linux/mount.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/mount.h
---- linux-2.6.35.2/include/linux/mount.h 2010-07-07 18:31:56.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/mount.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/mount.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/mount.h
+--- linux-2.6.35.4/include/linux/mount.h 2010-07-07 18:31:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/mount.h 2010-08-02 17:05:06.000000000 +0200
@@ -47,6 +47,9 @@ struct mnt_namespace;
#define MNT_INTERNAL 0x4000
};
static inline int *get_mnt_writers_ptr(struct vfsmount *mnt)
-diff -NurpP --minimal linux-2.6.35.2/include/linux/net.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/net.h
---- linux-2.6.35.2/include/linux/net.h 2010-08-02 16:52:55.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/net.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/net.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/net.h
+--- linux-2.6.35.4/include/linux/net.h 2010-08-02 16:52:55.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/net.h 2010-08-02 17:05:06.000000000 +0200
@@ -71,6 +71,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-2.6.35.2/include/linux/nfs_mount.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/nfs_mount.h
---- linux-2.6.35.2/include/linux/nfs_mount.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/nfs_mount.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/nfs_mount.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/nfs_mount.h
+--- linux-2.6.35.4/include/linux/nfs_mount.h 2009-03-24 14:22:43.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/nfs_mount.h 2010-08-02 17:05:06.000000000 +0200
@@ -63,7 +63,8 @@ struct nfs_mount_data {
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-2.6.35.2/include/linux/nsproxy.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/nsproxy.h
---- linux-2.6.35.2/include/linux/nsproxy.h 2009-06-11 17:13:17.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/nsproxy.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/nsproxy.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/nsproxy.h
+--- linux-2.6.35.4/include/linux/nsproxy.h 2009-06-11 17:13:17.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/nsproxy.h 2010-08-02 17:05:06.000000000 +0200
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
}
#ifdef CONFIG_CGROUP_NS
-diff -NurpP --minimal linux-2.6.35.2/include/linux/pid.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/pid.h
---- linux-2.6.35.2/include/linux/pid.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/pid.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/pid.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/pid.h
+--- linux-2.6.35.4/include/linux/pid.h 2009-03-24 14:22:43.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/pid.h 2010-08-02 17:05:06.000000000 +0200
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-2.6.35.2/include/linux/proc_fs.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/proc_fs.h
---- linux-2.6.35.2/include/linux/proc_fs.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/proc_fs.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/proc_fs.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/proc_fs.h
+--- linux-2.6.35.4/include/linux/proc_fs.h 2009-12-03 20:02:56.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/proc_fs.h 2010-08-02 17:05:06.000000000 +0200
@@ -56,6 +56,7 @@ struct proc_dir_entry {
nlink_t nlink;
uid_t uid;
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-2.6.35.2/include/linux/quotaops.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/quotaops.h
---- linux-2.6.35.2/include/linux/quotaops.h 2010-08-02 16:52:55.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/quotaops.h 2010-08-02 22:35:47.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/quotaops.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/quotaops.h
+--- linux-2.6.35.4/include/linux/quotaops.h 2010-08-02 16:52:55.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/quotaops.h 2010-08-02 22:35:47.000000000 +0200
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-2.6.35.2/include/linux/reboot.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/reboot.h
---- linux-2.6.35.2/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/reboot.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/reboot.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/reboot.h
+--- linux-2.6.35.4/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/reboot.h 2010-08-02 17:05:06.000000000 +0200
@@ -33,6 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
#ifdef __KERNEL__
-diff -NurpP --minimal linux-2.6.35.2/include/linux/reiserfs_fs.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/reiserfs_fs.h
---- linux-2.6.35.2/include/linux/reiserfs_fs.h 2010-07-07 18:31:56.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/reiserfs_fs.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/reiserfs_fs.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/reiserfs_fs.h
+--- linux-2.6.35.4/include/linux/reiserfs_fs.h 2010-07-07 18:31:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/reiserfs_fs.h 2010-08-02 17:05:06.000000000 +0200
@@ -977,6 +977,11 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL FS_COMPR_FL
#define REISERFS_NOTAIL_FL FS_NOTAIL_FL
/* namei.c */
void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
-diff -NurpP --minimal linux-2.6.35.2/include/linux/reiserfs_fs_sb.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/reiserfs_fs_sb.h
---- linux-2.6.35.2/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/reiserfs_fs_sb.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/reiserfs_fs_sb.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.35.4/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/reiserfs_fs_sb.h 2010-08-02 17:05:06.000000000 +0200
@@ -476,6 +476,7 @@ enum reiserfs_mount_options {
REISERFS_EXPOSE_PRIVROOT,
REISERFS_BARRIER_NONE,
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-2.6.35.2/include/linux/sched.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/sched.h
---- linux-2.6.35.2/include/linux/sched.h 2010-08-14 18:16:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/sched.h 2010-08-14 18:19:32.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/sched.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/sched.h
+--- linux-2.6.35.4/include/linux/sched.h 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/sched.h 2010-08-14 18:19:32.000000000 +0200
@@ -1343,6 +1343,14 @@ struct task_struct {
#endif
seccomp_t seccomp;
}
-diff -NurpP --minimal linux-2.6.35.2/include/linux/shmem_fs.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/shmem_fs.h
---- linux-2.6.35.2/include/linux/shmem_fs.h 2010-02-25 11:52:08.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/shmem_fs.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/shmem_fs.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/shmem_fs.h
+--- linux-2.6.35.4/include/linux/shmem_fs.h 2010-02-25 11:52:08.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/shmem_fs.h 2010-08-02 17:05:06.000000000 +0200
@@ -8,6 +8,9 @@
#define SHMEM_NR_DIRECT 16
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-2.6.35.2/include/linux/stat.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/stat.h
---- linux-2.6.35.2/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/stat.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/stat.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/stat.h
+--- linux-2.6.35.4/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/stat.h 2010-08-02 17:05:06.000000000 +0200
@@ -66,6 +66,7 @@ struct kstat {
unsigned int nlink;
uid_t uid;
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-2.6.35.2/include/linux/sunrpc/auth.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/sunrpc/auth.h
---- linux-2.6.35.2/include/linux/sunrpc/auth.h 2010-08-02 16:52:56.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/sunrpc/auth.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/sunrpc/auth.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/sunrpc/auth.h
+--- linux-2.6.35.4/include/linux/sunrpc/auth.h 2010-08-02 16:52:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/sunrpc/auth.h 2010-08-02 17:05:06.000000000 +0200
@@ -25,6 +25,7 @@
struct auth_cred {
uid_t uid;
struct group_info *group_info;
unsigned char machine_cred : 1;
};
-diff -NurpP --minimal linux-2.6.35.2/include/linux/sunrpc/clnt.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/sunrpc/clnt.h
---- linux-2.6.35.2/include/linux/sunrpc/clnt.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/sunrpc/clnt.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/sunrpc/clnt.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/sunrpc/clnt.h
+--- linux-2.6.35.4/include/linux/sunrpc/clnt.h 2009-12-03 20:02:56.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/sunrpc/clnt.h 2010-08-02 17:05:06.000000000 +0200
@@ -49,7 +49,8 @@ struct rpc_clnt {
unsigned int cl_softrtry : 1,/* soft timeouts */
cl_discrtry : 1,/* disconnect before retry */
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/syscalls.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/syscalls.h
---- linux-2.6.35.2/include/linux/syscalls.h 2010-08-02 16:52:56.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/syscalls.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/syscalls.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/syscalls.h
+--- linux-2.6.35.4/include/linux/syscalls.h 2010-08-02 16:52:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/syscalls.h 2010-08-02 17:05:06.000000000 +0200
@@ -479,6 +479,8 @@ asmlinkage long sys_symlink(const char _
asmlinkage long sys_unlink(const char __user *pathname);
asmlinkage long sys_rename(const char __user *oldname,
asmlinkage long sys_chmod(const char __user *filename, mode_t mode);
asmlinkage long sys_fchmod(unsigned int fd, mode_t mode);
-diff -NurpP --minimal linux-2.6.35.2/include/linux/sysctl.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/sysctl.h
---- linux-2.6.35.2/include/linux/sysctl.h 2010-08-02 16:52:56.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/sysctl.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/sysctl.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/sysctl.h
+--- linux-2.6.35.4/include/linux/sysctl.h 2010-08-02 16:52:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/sysctl.h 2010-08-02 17:05:06.000000000 +0200
@@ -60,6 +60,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/sysfs.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/sysfs.h
---- linux-2.6.35.2/include/linux/sysfs.h 2010-08-02 16:52:56.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/sysfs.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/sysfs.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/sysfs.h
+--- linux-2.6.35.4/include/linux/sysfs.h 2010-08-02 16:52:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/sysfs.h 2010-08-02 17:05:06.000000000 +0200
@@ -18,6 +18,8 @@
#include <linux/lockdep.h>
#include <asm/atomic.h>
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-2.6.35.2/include/linux/time.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/time.h
---- linux-2.6.35.2/include/linux/time.h 2010-08-02 16:52:56.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/time.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/time.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/time.h
+--- linux-2.6.35.4/include/linux/time.h 2010-08-02 16:52:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/time.h 2010-08-02 17:05:06.000000000 +0200
@@ -237,6 +237,9 @@ static __always_inline void timespec_add
a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns);
a->tv_nsec = ns;
#endif /* __KERNEL__ */
#define NFDBITS __NFDBITS
-diff -NurpP --minimal linux-2.6.35.2/include/linux/types.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/types.h
---- linux-2.6.35.2/include/linux/types.h 2010-08-02 16:52:56.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/types.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/types.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/types.h
+--- linux-2.6.35.4/include/linux/types.h 2010-08-02 16:52:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/types.h 2010-08-02 17:05:06.000000000 +0200
@@ -37,6 +37,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vroot.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vroot.h
---- linux-2.6.35.2/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vroot.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vroot.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vroot.h
+--- linux-2.6.35.4/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vroot.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,51 @@
+
+/*
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_base.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_base.h
---- linux-2.6.35.2/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_base.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_base.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_base.h
+--- linux-2.6.35.4/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_base.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_context.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_context.h
---- linux-2.6.35.2/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_context.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_context.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_context.h
+--- linux-2.6.35.4/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_context.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_cowbl.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_cowbl.h
---- linux-2.6.35.2/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_cowbl.h 2010-08-02 21:01:17.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_cowbl.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_cowbl.h
+--- linux-2.6.35.4/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_cowbl.h 2010-08-02 21:01:17.000000000 +0200
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_cvirt.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_cvirt.h
---- linux-2.6.35.2/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_cvirt.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_cvirt.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_cvirt.h
+--- linux-2.6.35.4/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_cvirt.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_device.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_device.h
---- linux-2.6.35.2/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_device.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_device.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_device.h
+--- linux-2.6.35.4/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_device.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_dlimit.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_dlimit.h
---- linux-2.6.35.2/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_dlimit.h 2010-08-02 22:21:17.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_dlimit.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_dlimit.h
+--- linux-2.6.35.4/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_dlimit.h 2010-08-02 22:21:17.000000000 +0200
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/base.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/base.h
---- linux-2.6.35.2/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/base.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/base.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/base.h
+--- linux-2.6.35.4/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/base.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,170 @@
+#ifndef _VX_BASE_H
+#define _VX_BASE_H
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/cacct_cmd.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/cacct_cmd.h
---- linux-2.6.35.2/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/cacct_cmd.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/cacct_cmd.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/cacct_cmd.h
+--- linux-2.6.35.4/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/cacct_cmd.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,23 @@
+#ifndef _VX_CACCT_CMD_H
+#define _VX_CACCT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/cacct_def.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/cacct_def.h
---- linux-2.6.35.2/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/cacct_def.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/cacct_def.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/cacct_def.h
+--- linux-2.6.35.4/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/cacct_def.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,43 @@
+#ifndef _VX_CACCT_DEF_H
+#define _VX_CACCT_DEF_H
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/cacct.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/cacct.h
---- linux-2.6.35.2/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/cacct.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/cacct.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/cacct.h
+--- linux-2.6.35.4/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/cacct.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef _VX_CACCT_H
+#define _VX_CACCT_H
+};
+
+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/cacct_int.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/cacct_int.h
---- linux-2.6.35.2/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/cacct_int.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/cacct_int.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/cacct_int.h
+--- linux-2.6.35.4/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/cacct_int.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef _VX_CACCT_INT_H
+#define _VX_CACCT_INT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/check.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/check.h
---- linux-2.6.35.2/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/check.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/check.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/check.h
+--- linux-2.6.35.4/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/check.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,89 @@
+#ifndef _VS_CHECK_H
+#define _VS_CHECK_H
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/context_cmd.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/context_cmd.h
---- linux-2.6.35.2/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/context_cmd.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/context_cmd.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/context_cmd.h
+--- linux-2.6.35.4/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/context_cmd.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,145 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/context.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/context.h
---- linux-2.6.35.2/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/context.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/context.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/context.h
+--- linux-2.6.35.4/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/context.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,184 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/cvirt_cmd.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/cvirt_cmd.h
---- linux-2.6.35.2/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/cvirt_cmd.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/cvirt_cmd.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/cvirt_cmd.h
+--- linux-2.6.35.4/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/cvirt_cmd.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_CVIRT_CMD_H
+#define _VX_CVIRT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/cvirt_def.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/cvirt_def.h
---- linux-2.6.35.2/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/cvirt_def.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/cvirt_def.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/cvirt_def.h
+--- linux-2.6.35.4/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/cvirt_def.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,80 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/cvirt.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/cvirt.h
---- linux-2.6.35.2/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/cvirt.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/cvirt.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/cvirt.h
+--- linux-2.6.35.4/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/cvirt.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,20 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/debug_cmd.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/debug_cmd.h
---- linux-2.6.35.2/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/debug_cmd.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/debug_cmd.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/debug_cmd.h
+--- linux-2.6.35.4/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/debug_cmd.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,58 @@
+#ifndef _VX_DEBUG_CMD_H
+#define _VX_DEBUG_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/debug.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/debug.h
---- linux-2.6.35.2/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/debug.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/debug.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/debug.h
+--- linux-2.6.35.4/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/debug.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,127 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/device_cmd.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/device_cmd.h
---- linux-2.6.35.2/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/device_cmd.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/device_cmd.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/device_cmd.h
+--- linux-2.6.35.4/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/device_cmd.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,44 @@
+#ifndef _VX_DEVICE_CMD_H
+#define _VX_DEVICE_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/device_def.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/device_def.h
---- linux-2.6.35.2/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/device_def.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/device_def.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/device_def.h
+--- linux-2.6.35.4/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/device_def.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,17 @@
+#ifndef _VX_DEVICE_DEF_H
+#define _VX_DEVICE_DEF_H
+};
+
+#endif /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/device.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/device.h
---- linux-2.6.35.2/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/device.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/device.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/device.h
+--- linux-2.6.35.4/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/device.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef _VX_DEVICE_H
+#define _VX_DEVICE_H
+#else /* _VX_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/dlimit_cmd.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/dlimit_cmd.h
---- linux-2.6.35.2/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/dlimit_cmd.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/dlimit_cmd.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/dlimit_cmd.h
+--- linux-2.6.35.4/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/dlimit_cmd.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,109 @@
+#ifndef _VX_DLIMIT_CMD_H
+#define _VX_DLIMIT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/dlimit.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/dlimit.h
---- linux-2.6.35.2/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/dlimit.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/dlimit.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/dlimit.h
+--- linux-2.6.35.4/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/dlimit.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,54 @@
+#ifndef _VX_DLIMIT_H
+#define _VX_DLIMIT_H
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/global.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/global.h
---- linux-2.6.35.2/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/global.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/global.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/global.h
+--- linux-2.6.35.4/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/global.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,19 @@
+#ifndef _VX_GLOBAL_H
+#define _VX_GLOBAL_H
+
+
+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/history.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/history.h
---- linux-2.6.35.2/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/history.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/history.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/history.h
+--- linux-2.6.35.4/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/history.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,197 @@
+#ifndef _VX_HISTORY_H
+#define _VX_HISTORY_H
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/inode_cmd.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/inode_cmd.h
---- linux-2.6.35.2/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/inode_cmd.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/inode_cmd.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/inode_cmd.h
+--- linux-2.6.35.4/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/inode_cmd.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,59 @@
+#ifndef _VX_INODE_CMD_H
+#define _VX_INODE_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/inode.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/inode.h
---- linux-2.6.35.2/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/inode.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/inode.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/inode.h
+--- linux-2.6.35.4/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/inode.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,39 @@
+#ifndef _VX_INODE_H
+#define _VX_INODE_H
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/Kbuild linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/Kbuild
---- linux-2.6.35.2/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/Kbuild 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/Kbuild linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/Kbuild
+--- linux-2.6.35.4/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/Kbuild 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,8 @@
+
+unifdef-y += context_cmd.h network_cmd.h space_cmd.h \
+
+unifdef-y += switch.h network.h monitor.h inode.h device.h
+
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/limit_cmd.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/limit_cmd.h
---- linux-2.6.35.2/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/limit_cmd.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/limit_cmd.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/limit_cmd.h
+--- linux-2.6.35.4/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/limit_cmd.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,71 @@
+#ifndef _VX_LIMIT_CMD_H
+#define _VX_LIMIT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/limit_def.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/limit_def.h
---- linux-2.6.35.2/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/limit_def.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/limit_def.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/limit_def.h
+--- linux-2.6.35.4/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/limit_def.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,47 @@
+#ifndef _VX_LIMIT_DEF_H
+#define _VX_LIMIT_DEF_H
+#endif
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/limit.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/limit.h
---- linux-2.6.35.2/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/limit.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/limit.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/limit.h
+--- linux-2.6.35.4/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/limit.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,71 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/limit_int.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/limit_int.h
---- linux-2.6.35.2/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/limit_int.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/limit_int.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/limit_int.h
+--- linux-2.6.35.4/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/limit_int.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,198 @@
+#ifndef _VX_LIMIT_INT_H
+#define _VX_LIMIT_INT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/monitor.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/monitor.h
---- linux-2.6.35.2/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/monitor.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/monitor.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/monitor.h
+--- linux-2.6.35.4/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/monitor.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,96 @@
+#ifndef _VX_MONITOR_H
+#define _VX_MONITOR_H
+
+
+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/network_cmd.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/network_cmd.h
---- linux-2.6.35.2/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/network_cmd.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/network_cmd.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/network_cmd.h
+--- linux-2.6.35.4/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/network_cmd.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,150 @@
+#ifndef _VX_NETWORK_CMD_H
+#define _VX_NETWORK_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/network.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/network.h
---- linux-2.6.35.2/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/network.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/network.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/network.h
+--- linux-2.6.35.4/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/network.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,146 @@
+#ifndef _VX_NETWORK_H
+#define _VX_NETWORK_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/percpu.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/percpu.h
---- linux-2.6.35.2/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/percpu.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/percpu.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/percpu.h
+--- linux-2.6.35.4/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/percpu.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,14 @@
+#ifndef _VX_PERCPU_H
+#define _VX_PERCPU_H
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VX_PERCPU_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/pid.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/pid.h
---- linux-2.6.35.2/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/pid.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/pid.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/pid.h
+--- linux-2.6.35.4/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/pid.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
+}
+
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/sched_cmd.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/sched_cmd.h
---- linux-2.6.35.2/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/sched_cmd.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/sched_cmd.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/sched_cmd.h
+--- linux-2.6.35.4/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/sched_cmd.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,108 @@
+#ifndef _VX_SCHED_CMD_H
+#define _VX_SCHED_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/sched_def.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/sched_def.h
---- linux-2.6.35.2/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/sched_def.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/sched_def.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/sched_def.h
+--- linux-2.6.35.4/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/sched_def.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,68 @@
+#ifndef _VX_SCHED_DEF_H
+#define _VX_SCHED_DEF_H
+#endif
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/sched.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/sched.h
---- linux-2.6.35.2/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/sched.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/sched.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/sched.h
+--- linux-2.6.35.4/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/sched.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,26 @@
+#ifndef _VX_SCHED_H
+#define _VX_SCHED_H
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/signal_cmd.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/signal_cmd.h
---- linux-2.6.35.2/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/signal_cmd.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/signal_cmd.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/signal_cmd.h
+--- linux-2.6.35.4/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/signal_cmd.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,43 @@
+#ifndef _VX_SIGNAL_CMD_H
+#define _VX_SIGNAL_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/signal.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/signal.h
---- linux-2.6.35.2/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/signal.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/signal.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/signal.h
+--- linux-2.6.35.4/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/signal.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,14 @@
+#ifndef _VX_SIGNAL_H
+#define _VX_SIGNAL_H
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/space_cmd.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/space_cmd.h
---- linux-2.6.35.2/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/space_cmd.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/space_cmd.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/space_cmd.h
+--- linux-2.6.35.4/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/space_cmd.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,38 @@
+#ifndef _VX_SPACE_CMD_H
+#define _VX_SPACE_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/space.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/space.h
---- linux-2.6.35.2/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/space.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/space.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/space.h
+--- linux-2.6.35.4/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/space.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,12 @@
+#ifndef _VX_SPACE_H
+#define _VX_SPACE_H
+#else /* _VX_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_SPACE_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/switch.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/switch.h
---- linux-2.6.35.2/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/switch.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/switch.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/switch.h
+--- linux-2.6.35.4/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/switch.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,98 @@
+#ifndef _VX_SWITCH_H
+#define _VX_SWITCH_H
+
+#endif /* _VX_SWITCH_H */
+
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/tag_cmd.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/tag_cmd.h
---- linux-2.6.35.2/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/tag_cmd.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/tag_cmd.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/tag_cmd.h
+--- linux-2.6.35.4/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/tag_cmd.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,22 @@
+#ifndef _VX_TAG_CMD_H
+#define _VX_TAG_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vserver/tag.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/tag.h
---- linux-2.6.35.2/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vserver/tag.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vserver/tag.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/tag.h
+--- linux-2.6.35.4/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vserver/tag.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,143 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_inet6.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_inet6.h
---- linux-2.6.35.2/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_inet6.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_inet6.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_inet6.h
+--- linux-2.6.35.4/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_inet6.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,246 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_inet.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_inet.h
---- linux-2.6.35.2/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_inet.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_inet.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_inet.h
+--- linux-2.6.35.4/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_inet.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,342 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_limit.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_limit.h
---- linux-2.6.35.2/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_limit.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_limit.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_limit.h
+--- linux-2.6.35.4/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_limit.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_memory.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_memory.h
---- linux-2.6.35.2/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_memory.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_memory.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_memory.h
+--- linux-2.6.35.4/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_memory.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,58 @@
+#ifndef _VS_MEMORY_H
+#define _VS_MEMORY_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_network.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_network.h
---- linux-2.6.35.2/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_network.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_network.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_network.h
+--- linux-2.6.35.4/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_network.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_pid.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_pid.h
---- linux-2.6.35.2/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_pid.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_pid.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_pid.h
+--- linux-2.6.35.4/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_pid.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,95 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_sched.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_sched.h
---- linux-2.6.35.2/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_sched.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_sched.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_sched.h
+--- linux-2.6.35.4/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_sched.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,110 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_socket.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_socket.h
---- linux-2.6.35.2/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_socket.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_socket.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_socket.h
+--- linux-2.6.35.4/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_socket.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_tag.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_tag.h
---- linux-2.6.35.2/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_tag.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_tag.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_tag.h
+--- linux-2.6.35.4/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_tag.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/linux/vs_time.h linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_time.h
---- linux-2.6.35.2/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/linux/vs_time.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/linux/vs_time.h linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_time.h
+--- linux-2.6.35.4/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/include/linux/vs_time.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.35.2/include/net/addrconf.h linux-2.6.35.2-vs2.3.0.36.31/include/net/addrconf.h
---- linux-2.6.35.2/include/net/addrconf.h 2010-07-07 18:31:56.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/net/addrconf.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/net/addrconf.h linux-2.6.35.4-vs2.3.0.36.32/include/net/addrconf.h
+--- linux-2.6.35.4/include/net/addrconf.h 2010-07-07 18:31:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/net/addrconf.h 2010-08-02 17:05:06.000000000 +0200
@@ -84,7 +84,8 @@ extern int ipv6_dev_get_saddr(struct n
struct net_device *dev,
const struct in6_addr *daddr,
extern int ipv6_get_lladdr(struct net_device *dev,
struct in6_addr *addr,
unsigned char banned_flags);
-diff -NurpP --minimal linux-2.6.35.2/include/net/af_unix.h linux-2.6.35.2-vs2.3.0.36.31/include/net/af_unix.h
---- linux-2.6.35.2/include/net/af_unix.h 2010-08-02 16:52:56.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/net/af_unix.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/net/af_unix.h linux-2.6.35.4-vs2.3.0.36.32/include/net/af_unix.h
+--- linux-2.6.35.4/include/net/af_unix.h 2010-08-02 16:52:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/net/af_unix.h 2010-08-02 17:05:06.000000000 +0200
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
#include <net/sock.h>
extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-2.6.35.2/include/net/inet_timewait_sock.h linux-2.6.35.2-vs2.3.0.36.31/include/net/inet_timewait_sock.h
---- linux-2.6.35.2/include/net/inet_timewait_sock.h 2010-08-02 16:52:56.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/net/inet_timewait_sock.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/net/inet_timewait_sock.h linux-2.6.35.4-vs2.3.0.36.32/include/net/inet_timewait_sock.h
+--- linux-2.6.35.4/include/net/inet_timewait_sock.h 2010-08-02 16:52:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/net/inet_timewait_sock.h 2010-08-02 17:05:06.000000000 +0200
@@ -117,6 +117,10 @@ struct inet_timewait_sock {
#define tw_hash __tw_common.skc_hash
#define tw_prot __tw_common.skc_prot
int tw_timeout;
volatile unsigned char tw_substate;
/* 3 bits hole, try to pack */
-diff -NurpP --minimal linux-2.6.35.2/include/net/route.h linux-2.6.35.2-vs2.3.0.36.31/include/net/route.h
---- linux-2.6.35.2/include/net/route.h 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/net/route.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/net/route.h linux-2.6.35.4-vs2.3.0.36.32/include/net/route.h
+--- linux-2.6.35.4/include/net/route.h 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/net/route.h 2010-08-02 17:05:06.000000000 +0200
@@ -147,6 +147,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->u.dst);
}
err = __ip_route_output_key(net, rp, &fl);
if (err)
return err;
-diff -NurpP --minimal linux-2.6.35.2/include/net/sock.h linux-2.6.35.2-vs2.3.0.36.31/include/net/sock.h
---- linux-2.6.35.2/include/net/sock.h 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/include/net/sock.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/include/net/sock.h linux-2.6.35.4-vs2.3.0.36.32/include/net/sock.h
+--- linux-2.6.35.4/include/net/sock.h 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/include/net/sock.h 2010-08-02 17:05:06.000000000 +0200
@@ -150,6 +150,10 @@ struct sock_common {
#ifdef CONFIG_NET_NS
struct net *skc_net;
kmemcheck_bitfield_begin(flags);
unsigned int sk_shutdown : 2,
sk_no_check : 2,
-diff -NurpP --minimal linux-2.6.35.2/init/Kconfig linux-2.6.35.2-vs2.3.0.36.31/init/Kconfig
---- linux-2.6.35.2/init/Kconfig 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/init/Kconfig 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/init/Kconfig linux-2.6.35.4-vs2.3.0.36.32/init/Kconfig
+--- linux-2.6.35.4/init/Kconfig 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/init/Kconfig 2010-08-02 17:05:06.000000000 +0200
@@ -472,6 +472,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
menuconfig CGROUPS
boolean "Control Group support"
help
Provides a simple namespace cgroup subsystem to
provide hierarchical naming of sets of namespaces,
-diff -NurpP --minimal linux-2.6.35.2/init/main.c linux-2.6.35.2-vs2.3.0.36.31/init/main.c
---- linux-2.6.35.2/init/main.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/init/main.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/init/main.c linux-2.6.35.4-vs2.3.0.36.32/init/main.c
+--- linux-2.6.35.4/init/main.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/init/main.c 2010-08-02 17:05:06.000000000 +0200
@@ -71,6 +71,7 @@
#include <linux/shmem_fs.h>
#include <linux/slab.h>
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-2.6.35.2/ipc/mqueue.c linux-2.6.35.2-vs2.3.0.36.31/ipc/mqueue.c
---- linux-2.6.35.2/ipc/mqueue.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/ipc/mqueue.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/ipc/mqueue.c linux-2.6.35.4-vs2.3.0.36.32/ipc/mqueue.c
+--- linux-2.6.35.4/ipc/mqueue.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/ipc/mqueue.c 2010-08-02 17:05:06.000000000 +0200
@@ -33,6 +33,8 @@
#include <linux/pid.h>
#include <linux/ipc_namespace.h>
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-2.6.35.2/ipc/msg.c linux-2.6.35.2-vs2.3.0.36.31/ipc/msg.c
---- linux-2.6.35.2/ipc/msg.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/ipc/msg.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/ipc/msg.c linux-2.6.35.4-vs2.3.0.36.32/ipc/msg.c
+--- linux-2.6.35.4/ipc/msg.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/ipc/msg.c 2010-08-02 17:05:06.000000000 +0200
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-2.6.35.2/ipc/namespace.c linux-2.6.35.2-vs2.3.0.36.31/ipc/namespace.c
---- linux-2.6.35.2/ipc/namespace.c 2009-09-10 15:26:27.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/ipc/namespace.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/ipc/namespace.c linux-2.6.35.4-vs2.3.0.36.32/ipc/namespace.c
+--- linux-2.6.35.4/ipc/namespace.c 2009-09-10 15:26:27.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/ipc/namespace.c 2010-08-02 17:05:06.000000000 +0200
@@ -11,6 +11,8 @@
#include <linux/slab.h>
#include <linux/fs.h>
#include "util.h"
-diff -NurpP --minimal linux-2.6.35.2/ipc/sem.c linux-2.6.35.2-vs2.3.0.36.31/ipc/sem.c
---- linux-2.6.35.2/ipc/sem.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/ipc/sem.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/ipc/sem.c linux-2.6.35.4-vs2.3.0.36.32/ipc/sem.c
+--- linux-2.6.35.4/ipc/sem.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/ipc/sem.c 2010-08-02 17:05:06.000000000 +0200
@@ -86,6 +86,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
security_sem_free(sma);
ipc_rcu_putref(sma);
}
-diff -NurpP --minimal linux-2.6.35.2/ipc/shm.c linux-2.6.35.2-vs2.3.0.36.31/ipc/shm.c
---- linux-2.6.35.2/ipc/shm.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/ipc/shm.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/ipc/shm.c linux-2.6.35.4-vs2.3.0.36.32/ipc/shm.c
+--- linux-2.6.35.4/ipc/shm.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/ipc/shm.c 2010-08-02 17:05:06.000000000 +0200
@@ -39,6 +39,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
return error;
no_id:
-diff -NurpP --minimal linux-2.6.35.2/kernel/capability.c linux-2.6.35.2-vs2.3.0.36.31/kernel/capability.c
---- linux-2.6.35.2/kernel/capability.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/capability.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/capability.c linux-2.6.35.4-vs2.3.0.36.32/kernel/capability.c
+--- linux-2.6.35.4/kernel/capability.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/capability.c 2010-08-02 17:05:06.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
if (unlikely(!cap_valid(cap))) {
printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
BUG();
-diff -NurpP --minimal linux-2.6.35.2/kernel/compat.c linux-2.6.35.2-vs2.3.0.36.31/kernel/compat.c
---- linux-2.6.35.2/kernel/compat.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/compat.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/compat.c linux-2.6.35.4-vs2.3.0.36.32/kernel/compat.c
+--- linux-2.6.35.4/kernel/compat.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/compat.c 2010-08-02 17:05:06.000000000 +0200
@@ -900,7 +900,7 @@ asmlinkage long compat_sys_time(compat_t
compat_time_t i;
struct timeval tv;
return 0;
}
-diff -NurpP --minimal linux-2.6.35.2/kernel/exit.c linux-2.6.35.2-vs2.3.0.36.31/kernel/exit.c
---- linux-2.6.35.2/kernel/exit.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/exit.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/exit.c linux-2.6.35.4-vs2.3.0.36.32/kernel/exit.c
+--- linux-2.6.35.4/kernel/exit.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/exit.c 2010-08-02 17:05:06.000000000 +0200
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-2.6.35.2/kernel/fork.c linux-2.6.35.2-vs2.3.0.36.31/kernel/fork.c
---- linux-2.6.35.2/kernel/fork.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/fork.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/fork.c linux-2.6.35.4-vs2.3.0.36.32/kernel/fork.c
+--- linux-2.6.35.4/kernel/fork.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/fork.c 2010-09-06 02:59:52.000000000 +0200
@@ -65,6 +65,10 @@
#include <linux/perf_event.h>
#include <linux/posix-timers.h>
ftrace_graph_exit_task(tsk);
free_task_struct(tsk);
}
-@@ -489,6 +495,7 @@ static struct mm_struct * mm_init(struct
+@@ -492,6 +498,7 @@ static struct mm_struct * mm_init(struct
if (likely(!mm_alloc_pgd(mm))) {
mm->def_flags = 0;
mmu_notifier_mm_init(mm);
return mm;
}
-@@ -522,6 +529,7 @@ void __mmdrop(struct mm_struct *mm)
+@@ -525,6 +532,7 @@ void __mmdrop(struct mm_struct *mm)
mm_free_pgd(mm);
destroy_context(mm);
mmu_notifier_mm_destroy(mm);
free_mm(mm);
}
EXPORT_SYMBOL_GPL(__mmdrop);
-@@ -657,6 +665,7 @@ struct mm_struct *dup_mm(struct task_str
+@@ -660,6 +668,7 @@ struct mm_struct *dup_mm(struct task_str
goto fail_nomem;
memcpy(mm, oldmm, sizeof(*mm));
/* Initializing for Swap token stuff */
mm->token_priority = 0;
-@@ -695,6 +704,7 @@ fail_nocontext:
+@@ -698,6 +707,7 @@ fail_nocontext:
* If init_new_context() failed, we cannot use mmput() to free the mm
* because it calls destroy_context()
*/
mm_free_pgd(mm);
free_mm(mm);
return NULL;
-@@ -969,6 +979,8 @@ static struct task_struct *copy_process(
+@@ -972,6 +982,8 @@ static struct task_struct *copy_process(
int retval;
struct task_struct *p;
int cgroup_callbacks_done = 0;
if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
return ERR_PTR(-EINVAL);
-@@ -1015,7 +1027,12 @@ static struct task_struct *copy_process(
+@@ -1018,7 +1030,12 @@ static struct task_struct *copy_process(
DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
if (atomic_read(&p->real_cred->user->processes) >=
task_rlimit(p, RLIMIT_NPROC)) {
if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
-@@ -1280,6 +1297,18 @@ static struct task_struct *copy_process(
+@@ -1283,6 +1300,18 @@ static struct task_struct *copy_process(
total_forks++;
spin_unlock(¤t->sighand->siglock);
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
cgroup_post_fork(p);
-diff -NurpP --minimal linux-2.6.35.2/kernel/kthread.c linux-2.6.35.2-vs2.3.0.36.31/kernel/kthread.c
---- linux-2.6.35.2/kernel/kthread.c 2010-07-07 18:31:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/kthread.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/kthread.c linux-2.6.35.4-vs2.3.0.36.32/kernel/kthread.c
+--- linux-2.6.35.4/kernel/kthread.c 2010-07-07 18:31:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/kthread.c 2010-08-02 17:05:06.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/file.h>
#include <linux/module.h>
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-2.6.35.2/kernel/Makefile linux-2.6.35.2-vs2.3.0.36.31/kernel/Makefile
---- linux-2.6.35.2/kernel/Makefile 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/Makefile 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/Makefile linux-2.6.35.4-vs2.3.0.36.32/kernel/Makefile
+--- linux-2.6.35.4/kernel/Makefile 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/Makefile 2010-08-02 17:05:06.000000000 +0200
@@ -25,6 +25,7 @@ CFLAGS_REMOVE_sched_clock.o = -pg
CFLAGS_REMOVE_perf_event.o = -pg
endif
obj-$(CONFIG_FREEZER) += freezer.o
obj-$(CONFIG_PROFILING) += profile.o
obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
-diff -NurpP --minimal linux-2.6.35.2/kernel/nsproxy.c linux-2.6.35.2-vs2.3.0.36.31/kernel/nsproxy.c
---- linux-2.6.35.2/kernel/nsproxy.c 2010-07-07 18:31:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/nsproxy.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/nsproxy.c linux-2.6.35.4-vs2.3.0.36.32/kernel/nsproxy.c
+--- linux-2.6.35.4/kernel/nsproxy.c 2010-07-07 18:31:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/nsproxy.c 2010-08-02 17:05:06.000000000 +0200
@@ -20,6 +20,8 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current,
-diff -NurpP --minimal linux-2.6.35.2/kernel/pid.c linux-2.6.35.2-vs2.3.0.36.31/kernel/pid.c
---- linux-2.6.35.2/kernel/pid.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/pid.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/pid.c linux-2.6.35.4-vs2.3.0.36.32/kernel/pid.c
+--- linux-2.6.35.4/kernel/pid.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/pid.c 2010-08-02 17:05:06.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/pid_namespace.h>
#include <linux/init_task.h>
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, current->nsproxy->pid_ns);
-diff -NurpP --minimal linux-2.6.35.2/kernel/pid_namespace.c linux-2.6.35.2-vs2.3.0.36.31/kernel/pid_namespace.c
---- linux-2.6.35.2/kernel/pid_namespace.c 2010-07-07 18:31:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/pid_namespace.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/pid_namespace.c linux-2.6.35.4-vs2.3.0.36.32/kernel/pid_namespace.c
+--- linux-2.6.35.4/kernel/pid_namespace.c 2010-07-07 18:31:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/pid_namespace.c 2010-08-02 17:05:06.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/err.h>
#include <linux/acct.h>
kmem_cache_free(pid_ns_cachep, ns);
}
-diff -NurpP --minimal linux-2.6.35.2/kernel/posix-timers.c linux-2.6.35.2-vs2.3.0.36.31/kernel/posix-timers.c
---- linux-2.6.35.2/kernel/posix-timers.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/posix-timers.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/posix-timers.c linux-2.6.35.4-vs2.3.0.36.32/kernel/posix-timers.c
+--- linux-2.6.35.4/kernel/posix-timers.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/posix-timers.c 2010-08-02 17:05:06.000000000 +0200
@@ -46,6 +46,7 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
/* If we failed to send the signal the timer stops. */
return ret > 0;
}
-diff -NurpP --minimal linux-2.6.35.2/kernel/printk.c linux-2.6.35.2-vs2.3.0.36.31/kernel/printk.c
---- linux-2.6.35.2/kernel/printk.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/printk.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/printk.c linux-2.6.35.4-vs2.3.0.36.32/kernel/printk.c
+--- linux-2.6.35.4/kernel/printk.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/printk.c 2010-08-02 17:05:06.000000000 +0200
@@ -37,6 +37,7 @@
#include <linux/ratelimit.h>
#include <linux/kmsg_dump.h>
count = len;
if (count > log_buf_len)
count = log_buf_len;
-diff -NurpP --minimal linux-2.6.35.2/kernel/ptrace.c linux-2.6.35.2-vs2.3.0.36.31/kernel/ptrace.c
---- linux-2.6.35.2/kernel/ptrace.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/ptrace.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/ptrace.c linux-2.6.35.4-vs2.3.0.36.32/kernel/ptrace.c
+--- linux-2.6.35.4/kernel/ptrace.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/ptrace.c 2010-08-02 17:05:06.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
/*
-diff -NurpP --minimal linux-2.6.35.2/kernel/sched.c linux-2.6.35.2-vs2.3.0.36.31/kernel/sched.c
---- linux-2.6.35.2/kernel/sched.c 2010-08-14 18:16:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/sched.c 2010-08-14 18:19:32.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/sched.c linux-2.6.35.4-vs2.3.0.36.32/kernel/sched.c
+--- linux-2.6.35.4/kernel/sched.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/sched.c 2010-09-06 02:59:52.000000000 +0200
@@ -72,6 +72,8 @@
#include <linux/ctype.h>
#include <linux/ftrace.h>
account_group_system_time(p, cputime);
/* Add system time to cpustat. */
-@@ -4292,7 +4307,7 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -4300,7 +4315,7 @@ SYSCALL_DEFINE1(nice, int, increment)
nice = 19;
if (increment < 0 && !can_nice(current, nice))
retval = security_task_setnice(current, nice);
if (retval)
-diff -NurpP --minimal linux-2.6.35.2/kernel/sched_fair.c linux-2.6.35.2-vs2.3.0.36.31/kernel/sched_fair.c
---- linux-2.6.35.2/kernel/sched_fair.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/sched_fair.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/sched_fair.c linux-2.6.35.4-vs2.3.0.36.32/kernel/sched_fair.c
+--- linux-2.6.35.4/kernel/sched_fair.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/sched_fair.c 2010-08-02 17:05:06.000000000 +0200
@@ -782,6 +782,9 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
check_spread(cfs_rq, se);
if (se != cfs_rq->curr)
account_entity_dequeue(cfs_rq, se);
update_min_vruntime(cfs_rq);
-diff -NurpP --minimal linux-2.6.35.2/kernel/signal.c linux-2.6.35.2-vs2.3.0.36.31/kernel/signal.c
---- linux-2.6.35.2/kernel/signal.c 2010-08-14 18:16:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/signal.c 2010-08-14 18:19:32.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/signal.c linux-2.6.35.4-vs2.3.0.36.32/kernel/signal.c
+--- linux-2.6.35.4/kernel/signal.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/signal.c 2010-08-14 18:19:32.000000000 +0200
@@ -28,6 +28,8 @@
#include <linux/freezer.h>
#include <linux/pid_namespace.h>
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-2.6.35.2/kernel/softirq.c linux-2.6.35.2-vs2.3.0.36.31/kernel/softirq.c
---- linux-2.6.35.2/kernel/softirq.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/softirq.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/softirq.c linux-2.6.35.4-vs2.3.0.36.32/kernel/softirq.c
+--- linux-2.6.35.4/kernel/softirq.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/softirq.c 2010-08-02 17:05:06.000000000 +0200
@@ -24,6 +24,7 @@
#include <linux/ftrace.h>
#include <linux/smp.h>
#define CREATE_TRACE_POINTS
#include <trace/events/irq.h>
-diff -NurpP --minimal linux-2.6.35.2/kernel/sys.c linux-2.6.35.2-vs2.3.0.36.31/kernel/sys.c
---- linux-2.6.35.2/kernel/sys.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/sys.c 2010-08-02 17:48:19.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/sys.c linux-2.6.35.4-vs2.3.0.36.32/kernel/sys.c
+--- linux-2.6.35.4/kernel/sys.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/sys.c 2010-08-02 17:48:19.000000000 +0200
@@ -42,6 +42,7 @@
#include <linux/syscalls.h>
#include <linux/kprobes.h>
return -EPERM;
if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > sysctl_nr_open)
return -EPERM;
-diff -NurpP --minimal linux-2.6.35.2/kernel/sysctl_binary.c linux-2.6.35.2-vs2.3.0.36.31/kernel/sysctl_binary.c
---- linux-2.6.35.2/kernel/sysctl_binary.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/sysctl_binary.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/sysctl_binary.c linux-2.6.35.4-vs2.3.0.36.32/kernel/sysctl_binary.c
+--- linux-2.6.35.4/kernel/sysctl_binary.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/sysctl_binary.c 2010-08-02 17:05:06.000000000 +0200
@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
{ CTL_INT, KERN_PANIC, "panic" },
{ CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
{ CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
-diff -NurpP --minimal linux-2.6.35.2/kernel/sysctl.c linux-2.6.35.2-vs2.3.0.36.31/kernel/sysctl.c
---- linux-2.6.35.2/kernel/sysctl.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/sysctl.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/sysctl.c linux-2.6.35.4-vs2.3.0.36.32/kernel/sysctl.c
+--- linux-2.6.35.4/kernel/sysctl.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/sysctl.c 2010-08-02 17:05:06.000000000 +0200
@@ -72,6 +72,7 @@
#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
#include <linux/lockdep.h>
#ifdef CONFIG_CHR_DEV_SG
{
.procname = "sg-big-buff",
-diff -NurpP --minimal linux-2.6.35.2/kernel/time.c linux-2.6.35.2-vs2.3.0.36.31/kernel/time.c
---- linux-2.6.35.2/kernel/time.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/time.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/time.c linux-2.6.35.4-vs2.3.0.36.32/kernel/time.c
+--- linux-2.6.35.4/kernel/time.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/time.c 2010-08-02 17:05:06.000000000 +0200
@@ -62,6 +62,7 @@ EXPORT_SYMBOL(sys_tz);
SYSCALL_DEFINE1(time, time_t __user *, tloc)
{
tv->tv_sec = x.tv_sec;
tv->tv_nsec = x.tv_usec * NSEC_PER_USEC;
}
-diff -NurpP --minimal linux-2.6.35.2/kernel/timer.c linux-2.6.35.2-vs2.3.0.36.31/kernel/timer.c
---- linux-2.6.35.2/kernel/timer.c 2010-08-02 16:52:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/timer.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/timer.c linux-2.6.35.4-vs2.3.0.36.32/kernel/timer.c
+--- linux-2.6.35.4/kernel/timer.c 2010-08-02 16:52:58.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/timer.c 2010-08-02 17:05:06.000000000 +0200
@@ -40,6 +40,10 @@
#include <linux/perf_event.h>
#include <linux/sched.h>
SYSCALL_DEFINE0(getuid)
{
/* Only we change this so SMP safe */
-diff -NurpP --minimal linux-2.6.35.2/kernel/user_namespace.c linux-2.6.35.2-vs2.3.0.36.31/kernel/user_namespace.c
---- linux-2.6.35.2/kernel/user_namespace.c 2010-08-02 16:52:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/user_namespace.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/user_namespace.c linux-2.6.35.4-vs2.3.0.36.32/kernel/user_namespace.c
+--- linux-2.6.35.4/kernel/user_namespace.c 2010-08-02 16:52:58.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/user_namespace.c 2010-08-02 17:05:06.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
INIT_WORK(&ns->destroyer, free_user_ns_work);
schedule_work(&ns->destroyer);
}
-diff -NurpP --minimal linux-2.6.35.2/kernel/utsname.c linux-2.6.35.2-vs2.3.0.36.31/kernel/utsname.c
---- linux-2.6.35.2/kernel/utsname.c 2009-09-10 15:26:28.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/utsname.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/utsname.c linux-2.6.35.4-vs2.3.0.36.32/kernel/utsname.c
+--- linux-2.6.35.4/kernel/utsname.c 2009-09-10 15:26:28.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/utsname.c 2010-08-02 17:05:06.000000000 +0200
@@ -14,14 +14,17 @@
#include <linux/utsname.h>
#include <linux/err.h>
+ atomic_dec(&vs_global_uts_ns);
kfree(ns);
}
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/cacct.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/cacct.c
---- linux-2.6.35.2/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/cacct.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/cacct.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/cacct.c
+--- linux-2.6.35.4/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/cacct.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/cacct_init.h linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/cacct_init.h
---- linux-2.6.35.2/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/cacct_init.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/cacct_init.h linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/cacct_init.h
+--- linux-2.6.35.4/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/cacct_init.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,25 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/cacct_proc.h linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/cacct_proc.h
---- linux-2.6.35.2/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/cacct_proc.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/cacct_proc.h linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/cacct_proc.h
+--- linux-2.6.35.4/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/cacct_proc.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/context.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/context.c
---- linux-2.6.35.2/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/context.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/context.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/context.c
+--- linux-2.6.35.4/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/context.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,1058 @@
+/*
+ * linux/kernel/vserver/context.c
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/cvirt.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/cvirt.c
---- linux-2.6.35.2/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/cvirt.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/cvirt.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/cvirt.c
+--- linux-2.6.35.4/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/cvirt.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,304 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+
+#endif
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/cvirt_init.h linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/cvirt_init.h
---- linux-2.6.35.2/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/cvirt_init.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/cvirt_init.h linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/cvirt_init.h
+--- linux-2.6.35.4/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/cvirt_init.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,69 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/cvirt_proc.h linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/cvirt_proc.h
---- linux-2.6.35.2/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/cvirt_proc.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/cvirt_proc.h linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/cvirt_proc.h
+--- linux-2.6.35.4/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/cvirt_proc.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,135 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/debug.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/debug.c
---- linux-2.6.35.2/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/debug.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/debug.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/debug.c
+--- linux-2.6.35.4/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/debug.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/device.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/device.c
---- linux-2.6.35.2/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/device.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/device.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/device.c
+--- linux-2.6.35.4/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/device.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/dlimit.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/dlimit.c
---- linux-2.6.35.2/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/dlimit.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/dlimit.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/dlimit.c
+--- linux-2.6.35.4/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/dlimit.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,531 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/helper.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/helper.c
---- linux-2.6.35.2/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/helper.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/helper.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/helper.c
+--- linux-2.6.35.4/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/helper.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,223 @@
+/*
+ * linux/kernel/vserver/helper.c
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/history.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/history.c
---- linux-2.6.35.2/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/history.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/history.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/history.c
+--- linux-2.6.35.4/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/history.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/inet.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/inet.c
---- linux-2.6.35.2/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/inet.c 2010-08-02 18:54:03.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/inet.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/inet.c
+--- linux-2.6.35.4/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/inet.c 2010-08-02 18:54:03.000000000 +0200
@@ -0,0 +1,224 @@
+
+#include <linux/in.h>
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/init.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/init.c
---- linux-2.6.35.2/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/init.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/init.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/init.c
+--- linux-2.6.35.4/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/init.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/inode.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/inode.c
---- linux-2.6.35.2/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/inode.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/inode.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/inode.c
+--- linux-2.6.35.4/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/inode.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,433 @@
+/*
+ * linux/kernel/vserver/inode.c
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/Kconfig linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/Kconfig
---- linux-2.6.35.2/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/Kconfig 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/Kconfig linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/Kconfig
+--- linux-2.6.35.4/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/Kconfig 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,260 @@
+#
+# Linux VServer configuration
+ default y
+ select SECURITY_CAPABILITIES
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/limit.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/limit.c
---- linux-2.6.35.2/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/limit.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/limit.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/limit.c
+--- linux-2.6.35.4/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/limit.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,354 @@
+/*
+ * linux/kernel/vserver/limit.c
+ return points;
+}
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/limit_init.h linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/limit_init.h
---- linux-2.6.35.2/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/limit_init.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/limit_init.h linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/limit_init.h
+--- linux-2.6.35.4/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/limit_init.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,31 @@
+
+
+ }
+}
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/limit_proc.h linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/limit_proc.h
---- linux-2.6.35.2/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/limit_proc.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/limit_proc.h linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/limit_proc.h
+--- linux-2.6.35.4/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/limit_proc.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/Makefile linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/Makefile
---- linux-2.6.35.2/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/Makefile 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/Makefile linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/Makefile
+--- linux-2.6.35.4/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/Makefile 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,18 @@
+#
+# Makefile for the Linux vserver routines.
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/monitor.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/monitor.c
---- linux-2.6.35.2/kernel/vserver/monitor.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/monitor.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/monitor.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/monitor.c
+--- linux-2.6.35.4/kernel/vserver/monitor.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/monitor.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,138 @@
+/*
+ * kernel/vserver/monitor.c
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/network.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/network.c
---- linux-2.6.35.2/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/network.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/network.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/network.c
+--- linux-2.6.35.4/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/network.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,864 @@
+/*
+ * linux/kernel/vserver/network.c
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/proc.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/proc.c
---- linux-2.6.35.2/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/proc.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/proc.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/proc.c
+--- linux-2.6.35.4/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/proc.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,1098 @@
+/*
+ * linux/kernel/vserver/proc.c
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/sched.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/sched.c
---- linux-2.6.35.2/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/sched.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/sched.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/sched.c
+--- linux-2.6.35.4/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/sched.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,414 @@
+/*
+ * linux/kernel/vserver/sched.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/sched_init.h linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/sched_init.h
---- linux-2.6.35.2/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/sched_init.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/sched_init.h linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/sched_init.h
+--- linux-2.6.35.4/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/sched_init.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,50 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+{
+ return;
+}
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/sched_proc.h linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/sched_proc.h
---- linux-2.6.35.2/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/sched_proc.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/sched_proc.h linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/sched_proc.h
+--- linux-2.6.35.4/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/sched_proc.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,57 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/signal.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/signal.c
---- linux-2.6.35.2/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/signal.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/signal.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/signal.c
+--- linux-2.6.35.4/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/signal.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,132 @@
+/*
+ * linux/kernel/vserver/signal.c
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/space.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/space.c
---- linux-2.6.35.2/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/space.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/space.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/space.c
+--- linux-2.6.35.4/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/space.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,375 @@
+/*
+ * linux/kernel/vserver/space.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/switch.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/switch.c
---- linux-2.6.35.2/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/switch.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/switch.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/switch.c
+--- linux-2.6.35.4/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/switch.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,546 @@
+/*
+ * linux/kernel/vserver/switch.c
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/sysctl.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/sysctl.c
---- linux-2.6.35.2/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/sysctl.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/sysctl.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/sysctl.c
+--- linux-2.6.35.4/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/sysctl.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,241 @@
+/*
+ * kernel/vserver/sysctl.c
+EXPORT_SYMBOL_GPL(vx_debug_space);
+EXPORT_SYMBOL_GPL(vx_debug_misc);
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/tag.c linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/tag.c
---- linux-2.6.35.2/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/tag.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/tag.c linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/tag.c
+--- linux-2.6.35.4/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/tag.c 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
+}
+
+
-diff -NurpP --minimal linux-2.6.35.2/kernel/vserver/vci_config.h linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/vci_config.h
---- linux-2.6.35.2/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/kernel/vserver/vci_config.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/kernel/vserver/vci_config.h linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/vci_config.h
+--- linux-2.6.35.4/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/kernel/vserver/vci_config.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,85 @@
+
+/* interface version */
+ 0;
+}
+
-diff -NurpP --minimal linux-2.6.35.2/mm/filemap_xip.c linux-2.6.35.2-vs2.3.0.36.31/mm/filemap_xip.c
---- linux-2.6.35.2/mm/filemap_xip.c 2010-07-07 18:31:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/mm/filemap_xip.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/mm/filemap_xip.c linux-2.6.35.4-vs2.3.0.36.32/mm/filemap_xip.c
+--- linux-2.6.35.4/mm/filemap_xip.c 2010-07-07 18:31:58.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/mm/filemap_xip.c 2010-08-02 17:05:06.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/seqlock.h>
#include <linux/mutex.h>
#include <asm/tlbflush.h>
#include <asm/io.h>
-diff -NurpP --minimal linux-2.6.35.2/mm/fremap.c linux-2.6.35.2-vs2.3.0.36.31/mm/fremap.c
---- linux-2.6.35.2/mm/fremap.c 2010-07-07 18:31:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/mm/fremap.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/mm/fremap.c linux-2.6.35.4-vs2.3.0.36.32/mm/fremap.c
+--- linux-2.6.35.4/mm/fremap.c 2010-07-07 18:31:58.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/mm/fremap.c 2010-08-02 17:05:06.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/module.h>
#include <linux/syscalls.h>
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
-diff -NurpP --minimal linux-2.6.35.2/mm/hugetlb.c linux-2.6.35.2-vs2.3.0.36.31/mm/hugetlb.c
---- linux-2.6.35.2/mm/hugetlb.c 2010-08-02 16:52:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/mm/hugetlb.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/mm/hugetlb.c linux-2.6.35.4-vs2.3.0.36.32/mm/hugetlb.c
+--- linux-2.6.35.4/mm/hugetlb.c 2010-08-02 16:52:58.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/mm/hugetlb.c 2010-08-02 17:05:06.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/hugetlb.h>
#include "internal.h"
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-2.6.35.2/mm/memcontrol.c linux-2.6.35.2-vs2.3.0.36.31/mm/memcontrol.c
---- linux-2.6.35.2/mm/memcontrol.c 2010-08-02 16:52:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/mm/memcontrol.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/mm/memcontrol.c linux-2.6.35.4-vs2.3.0.36.32/mm/memcontrol.c
+--- linux-2.6.35.4/mm/memcontrol.c 2010-08-02 16:52:58.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/mm/memcontrol.c 2010-08-02 17:05:06.000000000 +0200
@@ -635,6 +635,31 @@ struct mem_cgroup *mem_cgroup_from_task(
struct mem_cgroup, css);
}
static struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
{
struct mem_cgroup *mem = NULL;
-diff -NurpP --minimal linux-2.6.35.2/mm/memory.c linux-2.6.35.2-vs2.3.0.36.31/mm/memory.c
---- linux-2.6.35.2/mm/memory.c 2010-08-14 18:16:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/mm/memory.c 2010-08-14 18:19:32.000000000 +0200
-@@ -3101,6 +3101,7 @@ static inline int handle_pte_fault(struc
+diff -NurpP --minimal linux-2.6.35.4/mm/memory.c linux-2.6.35.4-vs2.3.0.36.32/mm/memory.c
+--- linux-2.6.35.4/mm/memory.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/mm/memory.c 2010-09-06 02:59:52.000000000 +0200
+@@ -3107,6 +3107,7 @@ static inline int handle_pte_fault(struc
{
pte_t entry;
spinlock_t *ptl;
entry = *pte;
if (!pte_present(entry)) {
-@@ -3125,9 +3126,12 @@ static inline int handle_pte_fault(struc
+@@ -3131,9 +3132,12 @@ static inline int handle_pte_fault(struc
if (unlikely(!pte_same(*pte, entry)))
goto unlock;
if (flags & FAULT_FLAG_WRITE) {
entry = pte_mkdirty(entry);
}
entry = pte_mkyoung(entry);
-@@ -3145,7 +3149,10 @@ static inline int handle_pte_fault(struc
+@@ -3151,7 +3155,10 @@ static inline int handle_pte_fault(struc
}
unlock:
pte_unmap_unlock(pte, ptl);
}
/*
-diff -NurpP --minimal linux-2.6.35.2/mm/mlock.c linux-2.6.35.2-vs2.3.0.36.31/mm/mlock.c
---- linux-2.6.35.2/mm/mlock.c 2010-08-02 16:52:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/mm/mlock.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/mm/mlock.c linux-2.6.35.4-vs2.3.0.36.32/mm/mlock.c
+--- linux-2.6.35.4/mm/mlock.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/mm/mlock.c 2010-09-06 02:59:52.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/rmap.h>
#include <linux/mmzone.h>
#include "internal.h"
-@@ -471,7 +472,7 @@ static int do_mlock(unsigned long start,
+@@ -490,7 +491,7 @@ static int do_mlock(unsigned long start,
SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
{
unsigned long lock_limit;
int error = -ENOMEM;
-@@ -493,6 +494,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
+@@ -512,6 +513,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
/* check against resource limits */
if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
error = do_mlock(start, len, 1);
up_write(¤t->mm->mmap_sem);
return error;
}
-diff -NurpP --minimal linux-2.6.35.2/mm/mremap.c linux-2.6.35.2-vs2.3.0.36.31/mm/mremap.c
---- linux-2.6.35.2/mm/mremap.c 2010-07-07 18:31:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/mm/mremap.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/mm/mremap.c linux-2.6.35.4-vs2.3.0.36.32/mm/mremap.c
+--- linux-2.6.35.4/mm/mremap.c 2010-07-07 18:31:58.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/mm/mremap.c 2010-08-02 17:05:06.000000000 +0200
@@ -19,6 +19,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
-diff -NurpP --minimal linux-2.6.35.2/mm/oom_kill.c linux-2.6.35.2-vs2.3.0.36.31/mm/oom_kill.c
---- linux-2.6.35.2/mm/oom_kill.c 2010-08-02 16:52:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/mm/oom_kill.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/mm/oom_kill.c linux-2.6.35.4-vs2.3.0.36.32/mm/oom_kill.c
+--- linux-2.6.35.4/mm/oom_kill.c 2010-08-02 16:52:58.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/mm/oom_kill.c 2010-08-02 17:05:06.000000000 +0200
@@ -28,6 +28,9 @@
#include <linux/notifier.h>
#include <linux/memcontrol.h>
}
if (oom_kill_process(p, gfp_mask, order, points, NULL,
-diff -NurpP --minimal linux-2.6.35.2/mm/page_alloc.c linux-2.6.35.2-vs2.3.0.36.31/mm/page_alloc.c
---- linux-2.6.35.2/mm/page_alloc.c 2010-08-02 16:52:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/mm/page_alloc.c 2010-08-02 17:46:11.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/mm/page_alloc.c linux-2.6.35.4-vs2.3.0.36.32/mm/page_alloc.c
+--- linux-2.6.35.4/mm/page_alloc.c 2010-08-02 16:52:58.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/mm/page_alloc.c 2010-08-02 17:46:11.000000000 +0200
@@ -52,6 +52,8 @@
#include <linux/compaction.h>
#include <trace/events/kmem.h>
}
#endif
-diff -NurpP --minimal linux-2.6.35.2/mm/rmap.c linux-2.6.35.2-vs2.3.0.36.31/mm/rmap.c
---- linux-2.6.35.2/mm/rmap.c 2010-08-02 16:52:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/mm/rmap.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/mm/rmap.c linux-2.6.35.4-vs2.3.0.36.32/mm/rmap.c
+--- linux-2.6.35.4/mm/rmap.c 2010-08-02 16:52:58.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/mm/rmap.c 2010-08-02 17:05:06.000000000 +0200
@@ -56,6 +56,7 @@
#include <linux/memcontrol.h>
#include <linux/mmu_notifier.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.35.2/mm/shmem.c linux-2.6.35.2-vs2.3.0.36.31/mm/shmem.c
---- linux-2.6.35.2/mm/shmem.c 2010-08-02 16:52:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/mm/shmem.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/mm/shmem.c linux-2.6.35.4-vs2.3.0.36.32/mm/shmem.c
+--- linux-2.6.35.4/mm/shmem.c 2010-08-02 16:52:58.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/mm/shmem.c 2010-08-02 17:05:06.000000000 +0200
@@ -1788,7 +1788,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_POSIX_ACL
-diff -NurpP --minimal linux-2.6.35.2/mm/slab.c linux-2.6.35.2-vs2.3.0.36.31/mm/slab.c
---- linux-2.6.35.2/mm/slab.c 2010-08-02 16:52:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/mm/slab.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/mm/slab.c linux-2.6.35.4-vs2.3.0.36.32/mm/slab.c
+--- linux-2.6.35.4/mm/slab.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/mm/slab.c 2010-09-06 02:59:52.000000000 +0200
@@ -408,6 +408,8 @@ static void kmem_list3_init(struct kmem_
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
kmemcheck_slab_free(cachep, objp, obj_size(cachep));
-diff -NurpP --minimal linux-2.6.35.2/mm/slab_vs.h linux-2.6.35.2-vs2.3.0.36.31/mm/slab_vs.h
---- linux-2.6.35.2/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/mm/slab_vs.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/mm/slab_vs.h linux-2.6.35.4-vs2.3.0.36.32/mm/slab_vs.h
+--- linux-2.6.35.4/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/mm/slab_vs.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
+ atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-2.6.35.2/mm/swapfile.c linux-2.6.35.2-vs2.3.0.36.31/mm/swapfile.c
---- linux-2.6.35.2/mm/swapfile.c 2010-08-14 18:16:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/mm/swapfile.c 2010-08-14 18:19:32.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/mm/swapfile.c linux-2.6.35.4-vs2.3.0.36.32/mm/swapfile.c
+--- linux-2.6.35.4/mm/swapfile.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/mm/swapfile.c 2010-08-14 18:19:32.000000000 +0200
@@ -35,6 +35,8 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
}
/*
-diff -NurpP --minimal linux-2.6.35.2/net/core/dev.c linux-2.6.35.2-vs2.3.0.36.31/net/core/dev.c
---- linux-2.6.35.2/net/core/dev.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/core/dev.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/core/dev.c linux-2.6.35.4-vs2.3.0.36.32/net/core/dev.c
+--- linux-2.6.35.4/net/core/dev.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/core/dev.c 2010-09-06 02:59:52.000000000 +0200
@@ -129,6 +129,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
/* avoid cases where sscanf is not exact inverse of printf */
snprintf(buf, IFNAMSIZ, name, i);
-@@ -3651,6 +3662,8 @@ static int dev_ifconf(struct net *net, c
+@@ -3650,6 +3661,8 @@ static int dev_ifconf(struct net *net, c
total = 0;
for_each_netdev(net, dev) {
for (i = 0; i < NPROTO; i++) {
if (gifconf_list[i]) {
int done;
-@@ -3721,6 +3734,9 @@ static void dev_seq_printf_stats(struct
+@@ -3720,6 +3733,9 @@ static void dev_seq_printf_stats(struct
{
const struct net_device_stats *stats = dev_get_stats(dev);
seq_printf(seq, "%6s: %7lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu "
"%8lu %7lu %4lu %4lu %4lu %5lu %7lu %10lu\n",
dev->name, stats->rx_bytes, stats->rx_packets,
-diff -NurpP --minimal linux-2.6.35.2/net/core/rtnetlink.c linux-2.6.35.2-vs2.3.0.36.31/net/core/rtnetlink.c
---- linux-2.6.35.2/net/core/rtnetlink.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/core/rtnetlink.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/core/rtnetlink.c linux-2.6.35.4-vs2.3.0.36.32/net/core/rtnetlink.c
+--- linux-2.6.35.4/net/core/rtnetlink.c 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/core/rtnetlink.c 2010-08-02 17:05:06.000000000 +0200
@@ -926,6 +926,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
hlist_for_each_entry(dev, node, head, index_hlist) {
if (idx < s_idx)
skb = nlmsg_new(if_nlmsg_size(dev), GFP_KERNEL);
if (skb == NULL)
goto errout;
-diff -NurpP --minimal linux-2.6.35.2/net/core/sock.c linux-2.6.35.2-vs2.3.0.36.31/net/core/sock.c
---- linux-2.6.35.2/net/core/sock.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/core/sock.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/core/sock.c linux-2.6.35.4-vs2.3.0.36.32/net/core/sock.c
+--- linux-2.6.35.4/net/core/sock.c 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/core/sock.c 2010-08-02 17:05:06.000000000 +0200
@@ -126,6 +126,10 @@
#include <net/cls_cgroup.h>
/*
* Before updating sk_refcnt, we must commit prior changes to memory
* (Documentation/RCU/rculist_nulls.txt for details)
-diff -NurpP --minimal linux-2.6.35.2/net/ipv4/af_inet.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/af_inet.c
---- linux-2.6.35.2/net/ipv4/af_inet.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/af_inet.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv4/af_inet.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/af_inet.c
+--- linux-2.6.35.4/net/ipv4/af_inet.c 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/af_inet.c 2010-08-02 17:05:06.000000000 +0200
@@ -116,6 +116,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
sin->sin_port = inet->inet_sport;
sin->sin_addr.s_addr = addr;
}
-diff -NurpP --minimal linux-2.6.35.2/net/ipv4/devinet.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/devinet.c
---- linux-2.6.35.2/net/ipv4/devinet.c 2010-08-14 18:16:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/devinet.c 2010-08-14 18:19:32.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv4/devinet.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/devinet.c
+--- linux-2.6.35.4/net/ipv4/devinet.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/devinet.c 2010-08-14 18:19:32.000000000 +0200
@@ -417,6 +417,7 @@ struct in_device *inetdev_by_index(struc
}
EXPORT_SYMBOL(inetdev_by_index);
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-2.6.35.2/net/ipv4/fib_hash.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/fib_hash.c
---- linux-2.6.35.2/net/ipv4/fib_hash.c 2010-07-07 18:31:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/fib_hash.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv4/fib_hash.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/fib_hash.c
+--- linux-2.6.35.4/net/ipv4/fib_hash.c 2010-07-07 18:31:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/fib_hash.c 2010-08-02 17:05:06.000000000 +0200
@@ -1017,7 +1017,7 @@ static int fib_seq_show(struct seq_file
prefix = f->fn_key;
mask = FZ_MASK(iter->zone);
seq_printf(seq,
"%s\t%08X\t%08X\t%04X\t%d\t%u\t%d\t%08X\t%d\t%u\t%u%n",
fi->fib_dev ? fi->fib_dev->name : "*", prefix,
-diff -NurpP --minimal linux-2.6.35.2/net/ipv4/inet_connection_sock.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/inet_connection_sock.c
---- linux-2.6.35.2/net/ipv4/inet_connection_sock.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/inet_connection_sock.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv4/inet_connection_sock.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/inet_connection_sock.c
+--- linux-2.6.35.4/net/ipv4/inet_connection_sock.c 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/inet_connection_sock.c 2010-08-02 17:05:06.000000000 +0200
@@ -52,10 +52,40 @@ void inet_get_local_port_range(int *low,
}
EXPORT_SYMBOL(inet_get_local_port_range);
break;
}
}
-diff -NurpP --minimal linux-2.6.35.2/net/ipv4/inet_diag.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/inet_diag.c
---- linux-2.6.35.2/net/ipv4/inet_diag.c 2010-07-07 18:31:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/inet_diag.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv4/inet_diag.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/inet_diag.c
+--- linux-2.6.35.4/net/ipv4/inet_diag.c 2010-07-07 18:31:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/inet_diag.c 2010-08-02 17:05:06.000000000 +0200
@@ -33,6 +33,8 @@
#include <linux/stddef.h>
if (num < s_num)
goto next_dying;
if (r->id.idiag_sport != tw->tw_sport &&
-diff -NurpP --minimal linux-2.6.35.2/net/ipv4/inet_hashtables.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/inet_hashtables.c
---- linux-2.6.35.2/net/ipv4/inet_hashtables.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/inet_hashtables.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv4/inet_hashtables.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/inet_hashtables.c
+--- linux-2.6.35.4/net/ipv4/inet_hashtables.c 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/inet_hashtables.c 2010-08-02 17:05:06.000000000 +0200
@@ -21,6 +21,7 @@
#include <net/inet_connection_sock.h>
/*
* if the nulls value we got at the end of this lookup is
* not the expected one, we must restart lookup.
-diff -NurpP --minimal linux-2.6.35.2/net/ipv4/netfilter/nf_nat_helper.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/netfilter/nf_nat_helper.c
---- linux-2.6.35.2/net/ipv4/netfilter/nf_nat_helper.c 2010-07-07 18:31:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/netfilter/nf_nat_helper.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv4/netfilter/nf_nat_helper.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/netfilter/nf_nat_helper.c
+--- linux-2.6.35.4/net/ipv4/netfilter/nf_nat_helper.c 2010-07-07 18:31:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/netfilter/nf_nat_helper.c 2010-08-02 17:05:06.000000000 +0200
@@ -20,6 +20,7 @@
#include <net/route.h>
#include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_helper.h>
#include <net/netfilter/nf_conntrack_ecache.h>
-diff -NurpP --minimal linux-2.6.35.2/net/ipv4/netfilter.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/netfilter.c
---- linux-2.6.35.2/net/ipv4/netfilter.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/netfilter.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv4/netfilter.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/netfilter.c
+--- linux-2.6.35.4/net/ipv4/netfilter.c 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/netfilter.c 2010-08-02 17:05:06.000000000 +0200
@@ -5,7 +5,7 @@
#include <linux/ip.h>
#include <linux/skbuff.h>
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-2.6.35.2/net/ipv4/raw.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/raw.c
---- linux-2.6.35.2/net/ipv4/raw.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/raw.c 2010-08-02 18:19:23.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv4/raw.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/raw.c
+--- linux-2.6.35.4/net/ipv4/raw.c 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/raw.c 2010-08-02 18:19:23.000000000 +0200
@@ -116,7 +116,7 @@ static struct sock *__raw_v4_lookup(stru
if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
sk_wmem_alloc_get(sp),
sk_rmem_alloc_get(sp),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
-diff -NurpP --minimal linux-2.6.35.2/net/ipv4/tcp.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/tcp.c
---- linux-2.6.35.2/net/ipv4/tcp.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/tcp.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv4/tcp.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/tcp.c
+--- linux-2.6.35.4/net/ipv4/tcp.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/tcp.c 2010-09-06 02:59:52.000000000 +0200
@@ -266,6 +266,7 @@
#include <linux/crypto.h>
#include <linux/time.h>
#include <net/icmp.h>
#include <net/tcp.h>
-diff -NurpP --minimal linux-2.6.35.2/net/ipv4/tcp_ipv4.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/tcp_ipv4.c
---- linux-2.6.35.2/net/ipv4/tcp_ipv4.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/tcp_ipv4.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv4/tcp_ipv4.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/tcp_ipv4.c
+--- linux-2.6.35.4/net/ipv4/tcp_ipv4.c 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/tcp_ipv4.c 2010-08-02 17:05:06.000000000 +0200
@@ -2004,6 +2004,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
atomic_read(&tw->tw_refcnt), tw, len);
}
-diff -NurpP --minimal linux-2.6.35.2/net/ipv4/tcp_minisocks.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/tcp_minisocks.c
---- linux-2.6.35.2/net/ipv4/tcp_minisocks.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/tcp_minisocks.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv4/tcp_minisocks.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/tcp_minisocks.c
+--- linux-2.6.35.4/net/ipv4/tcp_minisocks.c 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/tcp_minisocks.c 2010-08-02 17:05:06.000000000 +0200
@@ -23,6 +23,9 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-2.6.35.2/net/ipv4/udp.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/udp.c
---- linux-2.6.35.2/net/ipv4/udp.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv4/udp.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv4/udp.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/udp.c
+--- linux-2.6.35.4/net/ipv4/udp.c 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv4/udp.c 2010-08-02 17:05:06.000000000 +0200
@@ -296,14 +296,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
sk_wmem_alloc_get(sp),
sk_rmem_alloc_get(sp),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
-diff -NurpP --minimal linux-2.6.35.2/net/ipv6/addrconf.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/addrconf.c
---- linux-2.6.35.2/net/ipv6/addrconf.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/addrconf.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv6/addrconf.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/addrconf.c
+--- linux-2.6.35.4/net/ipv6/addrconf.c 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/addrconf.c 2010-08-02 17:05:06.000000000 +0200
@@ -87,6 +87,8 @@
#include <linux/proc_fs.h>
idev = __in6_dev_get(dev);
if (!idev)
goto cont;
-diff -NurpP --minimal linux-2.6.35.2/net/ipv6/af_inet6.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/af_inet6.c
---- linux-2.6.35.2/net/ipv6/af_inet6.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/af_inet6.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv6/af_inet6.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/af_inet6.c
+--- linux-2.6.35.4/net/ipv6/af_inet6.c 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/af_inet6.c 2010-08-02 17:05:06.000000000 +0200
@@ -42,6 +42,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
if (ipv6_addr_any(&np->rcv_saddr))
ipv6_addr_copy(&sin->sin6_addr, &np->saddr);
else
-diff -NurpP --minimal linux-2.6.35.2/net/ipv6/fib6_rules.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/fib6_rules.c
---- linux-2.6.35.2/net/ipv6/fib6_rules.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/fib6_rules.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv6/fib6_rules.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/fib6_rules.c
+--- linux-2.6.35.4/net/ipv6/fib6_rules.c 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/fib6_rules.c 2010-08-02 17:05:06.000000000 +0200
@@ -89,7 +89,7 @@ static int fib6_rule_action(struct fib_r
ip6_dst_idev(&rt->u.dst)->dev,
&flp->fl6_dst,
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
-diff -NurpP --minimal linux-2.6.35.2/net/ipv6/inet6_hashtables.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/inet6_hashtables.c
---- linux-2.6.35.2/net/ipv6/inet6_hashtables.c 2010-02-25 11:52:10.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/inet6_hashtables.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv6/inet6_hashtables.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/inet6_hashtables.c
+--- linux-2.6.35.4/net/ipv6/inet6_hashtables.c 2010-02-25 11:52:10.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/inet6_hashtables.c 2010-08-02 17:05:06.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/module.h>
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-2.6.35.2/net/ipv6/ip6_output.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/ip6_output.c
---- linux-2.6.35.2/net/ipv6/ip6_output.c 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/ip6_output.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv6/ip6_output.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/ip6_output.c
+--- linux-2.6.35.4/net/ipv6/ip6_output.c 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/ip6_output.c 2010-08-02 17:05:06.000000000 +0200
@@ -930,7 +930,7 @@ static int ip6_dst_lookup_tail(struct so
err = ipv6_dev_get_saddr(net, ip6_dst_idev(*dst)->dev,
&fl->fl6_dst,
if (err)
goto out_err_release;
}
-diff -NurpP --minimal linux-2.6.35.2/net/ipv6/Kconfig linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/Kconfig
---- linux-2.6.35.2/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/Kconfig 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv6/Kconfig linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/Kconfig
+--- linux-2.6.35.4/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/Kconfig 2010-08-02 17:05:06.000000000 +0200
@@ -4,8 +4,8 @@
# IPv6 as module will cause a CRASH if you try to unload it
---help---
This is complemental support for the IP version 6.
You will still be able to do traditional IPv4 networking as well.
-diff -NurpP --minimal linux-2.6.35.2/net/ipv6/ndisc.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/ndisc.c
---- linux-2.6.35.2/net/ipv6/ndisc.c 2010-08-02 16:53:00.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/ndisc.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv6/ndisc.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/ndisc.c
+--- linux-2.6.35.4/net/ipv6/ndisc.c 2010-08-02 16:53:00.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/ndisc.c 2010-08-02 17:05:06.000000000 +0200
@@ -591,7 +591,7 @@ static void ndisc_send_na(struct net_dev
} else {
if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
return;
src_addr = &tmpaddr;
}
-diff -NurpP --minimal linux-2.6.35.2/net/ipv6/raw.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/raw.c
---- linux-2.6.35.2/net/ipv6/raw.c 2010-08-02 16:53:00.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/raw.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv6/raw.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/raw.c
+--- linux-2.6.35.4/net/ipv6/raw.c 2010-08-02 16:53:00.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/raw.c 2010-08-02 17:05:06.000000000 +0200
@@ -30,6 +30,7 @@
#include <linux/icmpv6.h>
#include <linux/netfilter.h>
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-diff -NurpP --minimal linux-2.6.35.2/net/ipv6/route.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/route.c
---- linux-2.6.35.2/net/ipv6/route.c 2010-08-02 16:53:00.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/route.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv6/route.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/route.c
+--- linux-2.6.35.4/net/ipv6/route.c 2010-08-02 16:53:00.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/route.c 2010-08-02 17:05:06.000000000 +0200
@@ -2255,7 +2255,8 @@ static int rt6_fill_node(struct net *net
struct inet6_dev *idev = ip6_dst_idev(&rt->u.dst);
struct in6_addr saddr_buf;
NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
}
-diff -NurpP --minimal linux-2.6.35.2/net/ipv6/tcp_ipv6.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/tcp_ipv6.c
---- linux-2.6.35.2/net/ipv6/tcp_ipv6.c 2010-08-02 16:53:00.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/tcp_ipv6.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv6/tcp_ipv6.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/tcp_ipv6.c
+--- linux-2.6.35.4/net/ipv6/tcp_ipv6.c 2010-08-02 16:53:00.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/tcp_ipv6.c 2010-08-02 17:05:06.000000000 +0200
@@ -69,6 +69,7 @@
#include <linux/crypto.h>
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-2.6.35.2/net/ipv6/udp.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/udp.c
---- linux-2.6.35.2/net/ipv6/udp.c 2010-08-02 16:53:00.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/udp.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv6/udp.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/udp.c
+--- linux-2.6.35.4/net/ipv6/udp.c 2010-08-02 16:53:00.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/udp.c 2010-08-02 17:05:06.000000000 +0200
@@ -48,13 +48,14 @@
#include <linux/proc_fs.h>
}
if (!ipv6_addr_any(&np->daddr)) {
if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-2.6.35.2/net/ipv6/xfrm6_policy.c linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/xfrm6_policy.c
---- linux-2.6.35.2/net/ipv6/xfrm6_policy.c 2010-08-02 16:53:00.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/ipv6/xfrm6_policy.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/ipv6/xfrm6_policy.c linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/xfrm6_policy.c
+--- linux-2.6.35.4/net/ipv6/xfrm6_policy.c 2010-08-02 16:53:00.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/ipv6/xfrm6_policy.c 2010-08-02 17:05:06.000000000 +0200
@@ -62,7 +62,7 @@ static int xfrm6_get_saddr(struct net *n
dev = ip6_dst_idev(dst)->dev;
ipv6_dev_get_saddr(dev_net(dev), dev,
dst_release(dst);
return 0;
}
-diff -NurpP --minimal linux-2.6.35.2/net/netlink/af_netlink.c linux-2.6.35.2-vs2.3.0.36.31/net/netlink/af_netlink.c
---- linux-2.6.35.2/net/netlink/af_netlink.c 2010-08-02 16:53:01.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/netlink/af_netlink.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/netlink/af_netlink.c linux-2.6.35.4-vs2.3.0.36.32/net/netlink/af_netlink.c
+--- linux-2.6.35.4/net/netlink/af_netlink.c 2010-09-05 01:41:57.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/netlink/af_netlink.c 2010-09-06 02:59:52.000000000 +0200
@@ -55,6 +55,9 @@
#include <linux/types.h>
#include <linux/audit.h>
#include <net/net_namespace.h>
#include <net/sock.h>
-@@ -1936,6 +1939,8 @@ static struct sock *netlink_seq_socket_i
+@@ -1922,6 +1925,8 @@ static struct sock *netlink_seq_socket_i
sk_for_each(s, node, &hash->table[j]) {
if (sock_net(s) != seq_file_net(seq))
continue;
if (off == pos) {
iter->link = i;
iter->hash_idx = j;
-@@ -1970,7 +1975,8 @@ static void *netlink_seq_next(struct seq
+@@ -1956,7 +1961,8 @@ static void *netlink_seq_next(struct seq
s = v;
do {
s = sk_next(s);
if (s)
return s;
-@@ -1982,7 +1988,8 @@ static void *netlink_seq_next(struct seq
+@@ -1968,7 +1974,8 @@ static void *netlink_seq_next(struct seq
for (; j <= hash->mask; j++) {
s = sk_head(&hash->table[j]);
s = sk_next(s);
if (s) {
iter->link = i;
-diff -NurpP --minimal linux-2.6.35.2/net/sctp/ipv6.c linux-2.6.35.2-vs2.3.0.36.31/net/sctp/ipv6.c
---- linux-2.6.35.2/net/sctp/ipv6.c 2010-08-02 16:53:01.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/sctp/ipv6.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/sctp/ipv6.c linux-2.6.35.4-vs2.3.0.36.32/net/sctp/ipv6.c
+--- linux-2.6.35.4/net/sctp/ipv6.c 2010-08-02 16:53:01.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/sctp/ipv6.c 2010-08-02 17:05:06.000000000 +0200
@@ -304,7 +304,8 @@ static void sctp_v6_get_saddr(struct sct
dst ? ip6_dst_idev(dst)->dev : NULL,
&daddr->v6.sin6_addr,
SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: %pI6\n",
&saddr->v6.sin6_addr);
return;
-diff -NurpP --minimal linux-2.6.35.2/net/socket.c linux-2.6.35.2-vs2.3.0.36.31/net/socket.c
---- linux-2.6.35.2/net/socket.c 2010-08-02 16:53:02.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/socket.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/socket.c linux-2.6.35.4-vs2.3.0.36.32/net/socket.c
+--- linux-2.6.35.4/net/socket.c 2010-08-02 16:53:02.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/socket.c 2010-08-02 17:05:06.000000000 +0200
@@ -98,6 +98,10 @@
#include <net/sock.h>
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-2.6.35.2/net/sunrpc/auth.c linux-2.6.35.2-vs2.3.0.36.31/net/sunrpc/auth.c
---- linux-2.6.35.2/net/sunrpc/auth.c 2010-08-02 16:53:02.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/sunrpc/auth.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/sunrpc/auth.c linux-2.6.35.4-vs2.3.0.36.32/net/sunrpc/auth.c
+--- linux-2.6.35.4/net/sunrpc/auth.c 2010-08-02 16:53:02.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/sunrpc/auth.c 2010-08-02 17:05:06.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/hash.h>
#include <linux/sunrpc/clnt.h>
};
struct rpc_cred *ret;
-diff -NurpP --minimal linux-2.6.35.2/net/sunrpc/auth_unix.c linux-2.6.35.2-vs2.3.0.36.31/net/sunrpc/auth_unix.c
---- linux-2.6.35.2/net/sunrpc/auth_unix.c 2010-07-07 18:32:01.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/sunrpc/auth_unix.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/sunrpc/auth_unix.c linux-2.6.35.4-vs2.3.0.36.32/net/sunrpc/auth_unix.c
+--- linux-2.6.35.4/net/sunrpc/auth_unix.c 2010-07-07 18:32:01.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/sunrpc/auth_unix.c 2010-08-02 17:05:06.000000000 +0200
@@ -12,12 +12,14 @@
#include <linux/module.h>
#include <linux/sunrpc/clnt.h>
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
*p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-2.6.35.2/net/sunrpc/clnt.c linux-2.6.35.2-vs2.3.0.36.31/net/sunrpc/clnt.c
---- linux-2.6.35.2/net/sunrpc/clnt.c 2010-08-02 16:53:02.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/sunrpc/clnt.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/sunrpc/clnt.c linux-2.6.35.4-vs2.3.0.36.32/net/sunrpc/clnt.c
+--- linux-2.6.35.4/net/sunrpc/clnt.c 2010-08-02 16:53:02.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/sunrpc/clnt.c 2010-08-02 17:05:06.000000000 +0200
@@ -33,6 +33,7 @@
#include <linux/utsname.h>
#include <linux/workqueue.h>
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-2.6.35.2/net/unix/af_unix.c linux-2.6.35.2-vs2.3.0.36.31/net/unix/af_unix.c
---- linux-2.6.35.2/net/unix/af_unix.c 2010-08-02 16:53:02.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/unix/af_unix.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/net/unix/af_unix.c linux-2.6.35.4-vs2.3.0.36.32/net/unix/af_unix.c
+--- linux-2.6.35.4/net/unix/af_unix.c 2010-08-02 16:53:02.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/net/unix/af_unix.c 2010-08-02 17:05:06.000000000 +0200
@@ -114,6 +114,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
sk = next_unix_socket(&iter->i, sk);
return sk;
}
-diff -NurpP --minimal linux-2.6.35.2/net/x25/af_x25.c linux-2.6.35.2-vs2.3.0.36.31/net/x25/af_x25.c
---- linux-2.6.35.2/net/x25/af_x25.c 2010-08-02 16:53:02.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/net/x25/af_x25.c 2010-08-02 17:05:06.000000000 +0200
-@@ -568,7 +568,10 @@ static int x25_create(struct net *net, s
-
- x25 = x25_sk(sk);
-
-- sock_init_data(sock, sk);
-+ sk->sk_socket = sock;
-+ sk->sk_type = sock->type;
-+ sk->sk_sleep = &sock->wait;
-+ sock->sk = sk;
-
- x25_init_timers(sk);
-
-diff -NurpP --minimal linux-2.6.35.2/scripts/checksyscalls.sh linux-2.6.35.2-vs2.3.0.36.31/scripts/checksyscalls.sh
---- linux-2.6.35.2/scripts/checksyscalls.sh 2009-09-10 15:26:31.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/scripts/checksyscalls.sh 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/scripts/checksyscalls.sh linux-2.6.35.4-vs2.3.0.36.32/scripts/checksyscalls.sh
+--- linux-2.6.35.4/scripts/checksyscalls.sh 2009-09-10 15:26:31.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/scripts/checksyscalls.sh 2010-08-02 17:05:06.000000000 +0200
@@ -194,7 +194,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
EOF
}
-diff -NurpP --minimal linux-2.6.35.2/security/commoncap.c linux-2.6.35.2-vs2.3.0.36.31/security/commoncap.c
---- linux-2.6.35.2/security/commoncap.c 2010-08-02 16:53:03.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/security/commoncap.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/security/commoncap.c linux-2.6.35.4-vs2.3.0.36.32/security/commoncap.c
+--- linux-2.6.35.4/security/commoncap.c 2010-08-02 16:53:03.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/security/commoncap.c 2010-08-02 17:05:06.000000000 +0200
@@ -28,6 +28,7 @@
#include <linux/prctl.h>
#include <linux/securebits.h>
return ret;
}
+
-diff -NurpP --minimal linux-2.6.35.2/security/selinux/av_permissions.h linux-2.6.35.2-vs2.3.0.36.31/security/selinux/av_permissions.h
---- linux-2.6.35.2/security/selinux/av_permissions.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/security/selinux/av_permissions.h 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/security/selinux/av_permissions.h linux-2.6.35.4-vs2.3.0.36.32/security/selinux/av_permissions.h
+--- linux-2.6.35.4/security/selinux/av_permissions.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/security/selinux/av_permissions.h 2010-08-02 17:05:06.000000000 +0200
@@ -0,0 +1,827 @@
+/* This file is automatically generated. Do not edit. */
+#ifndef _SELINUX_AV_PERMISSIONS_H_
+#define TUN_SOCKET__NAME_BIND 0x00200000UL
+
+#endif
-diff -NurpP --minimal linux-2.6.35.2/security/selinux/hooks.c linux-2.6.35.2-vs2.3.0.36.31/security/selinux/hooks.c
---- linux-2.6.35.2/security/selinux/hooks.c 2010-08-02 16:53:03.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/security/selinux/hooks.c 2010-08-02 17:05:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/security/selinux/hooks.c linux-2.6.35.4-vs2.3.0.36.32/security/selinux/hooks.c
+--- linux-2.6.35.4/security/selinux/hooks.c 2010-08-02 16:53:03.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/security/selinux/hooks.c 2010-08-02 17:05:06.000000000 +0200
@@ -64,7 +64,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
projects / packages / kernel.git / commitdiff