From c27c5299c5d11c4dfc4b52387af30934e91eb457 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 20 Feb 2012 22:54:19 +0000 Subject: [PATCH] - up to 3.2.7 Changed files: kernel-small_fixes.patch -> 1.54 kernel-vserver-2.3.patch -> 1.89 kernel.spec -> 1.1023 --- kernel-small_fixes.patch | 10 - kernel-vserver-2.3.patch | 2390 +++++++++++++++++++------------------- kernel.spec | 6 +- 3 files changed, 1204 insertions(+), 1202 deletions(-) diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index e0127342..90db2196 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -1,13 +1,3 @@ ---- linux-2.6.32/drivers/infiniband/Kconfig~ 2009-12-05 00:26:03.663774916 +0100 -+++ linux-2.6.32/drivers/infiniband/Kconfig 2009-12-05 00:26:05.914179759 +0100 -@@ -37,7 +37,6 @@ - config INFINIBAND_ADDR_TRANS - bool - depends on INET -- depends on !(INFINIBAND = y && IPV6 = m) - default y - - source "drivers/infiniband/hw/mthca/Kconfig" --- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100 +++ linux-2.6.33/scripts/mod/modpost.c 2010-03-07 14:26:47.242168558 +0100 @@ -15,7 +15,8 @@ diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index 18938ca0..d05fd86d 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-3.2.5/Documentation/vserver/debug.txt linux-3.2.5-vs2.3.2.6/Documentation/vserver/debug.txt ---- linux-3.2.5/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/Documentation/vserver/debug.txt 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/Documentation/vserver/debug.txt linux-3.2.6-vs2.3.2.7/Documentation/vserver/debug.txt +--- linux-3.2.6/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/Documentation/vserver/debug.txt 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -156,9 +156,9 @@ diff -NurpP --minimal linux-3.2.5/Documentation/vserver/debug.txt linux-3.2.5-vs + 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-3.2.5/arch/alpha/Kconfig linux-3.2.5-vs2.3.2.6/arch/alpha/Kconfig ---- linux-3.2.5/arch/alpha/Kconfig 2012-01-09 16:13:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/alpha/Kconfig 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/alpha/Kconfig linux-3.2.6-vs2.3.2.7/arch/alpha/Kconfig +--- linux-3.2.6/arch/alpha/Kconfig 2012-01-09 16:13:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/alpha/Kconfig 2011-12-05 19:33:02.000000000 +0100 @@ -665,6 +665,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.2.5/arch/alpha/Kconfig linux-3.2.5-vs2.3.2.6/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.2.5/arch/alpha/kernel/entry.S linux-3.2.5-vs2.3.2.6/arch/alpha/kernel/entry.S ---- linux-3.2.5/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/arch/alpha/kernel/entry.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/alpha/kernel/entry.S linux-3.2.6-vs2.3.2.7/arch/alpha/kernel/entry.S +--- linux-3.2.6/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/arch/alpha/kernel/entry.S 2011-12-05 19:33:02.000000000 +0100 @@ -860,24 +860,15 @@ sys_getxgid: .globl sys_getxpid .ent sys_getxpid @@ -203,9 +203,9 @@ diff -NurpP --minimal linux-3.2.5/arch/alpha/kernel/entry.S linux-3.2.5-vs2.3.2. ret .end sys_getxpid -diff -NurpP --minimal linux-3.2.5/arch/alpha/kernel/ptrace.c linux-3.2.5-vs2.3.2.6/arch/alpha/kernel/ptrace.c ---- linux-3.2.5/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/alpha/kernel/ptrace.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/alpha/kernel/ptrace.c linux-3.2.6-vs2.3.2.7/arch/alpha/kernel/ptrace.c +--- linux-3.2.6/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/alpha/kernel/ptrace.c 2011-12-05 19:33:02.000000000 +0100 @@ -13,6 +13,7 @@ #include #include @@ -214,9 +214,9 @@ diff -NurpP --minimal linux-3.2.5/arch/alpha/kernel/ptrace.c linux-3.2.5-vs2.3.2 #include #include -diff -NurpP --minimal linux-3.2.5/arch/alpha/kernel/systbls.S linux-3.2.5-vs2.3.2.6/arch/alpha/kernel/systbls.S ---- linux-3.2.5/arch/alpha/kernel/systbls.S 2012-01-09 16:13:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/alpha/kernel/systbls.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/alpha/kernel/systbls.S linux-3.2.6-vs2.3.2.7/arch/alpha/kernel/systbls.S +--- linux-3.2.6/arch/alpha/kernel/systbls.S 2012-01-09 16:13:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/alpha/kernel/systbls.S 2011-12-05 19:33:02.000000000 +0100 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -226,9 +226,9 @@ diff -NurpP --minimal linux-3.2.5/arch/alpha/kernel/systbls.S linux-3.2.5-vs2.3. .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ -diff -NurpP --minimal linux-3.2.5/arch/alpha/kernel/traps.c linux-3.2.5-vs2.3.2.6/arch/alpha/kernel/traps.c ---- linux-3.2.5/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/arch/alpha/kernel/traps.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/alpha/kernel/traps.c linux-3.2.6-vs2.3.2.7/arch/alpha/kernel/traps.c +--- linux-3.2.6/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/arch/alpha/kernel/traps.c 2011-12-05 19:33:02.000000000 +0100 @@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); @@ -239,9 +239,9 @@ diff -NurpP --minimal linux-3.2.5/arch/alpha/kernel/traps.c linux-3.2.5-vs2.3.2. dik_show_regs(regs, r9_15); add_taint(TAINT_DIE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-3.2.5/arch/arm/Kconfig linux-3.2.5-vs2.3.2.6/arch/arm/Kconfig ---- linux-3.2.5/arch/arm/Kconfig 2012-01-09 16:13:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/arm/Kconfig 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/arm/Kconfig linux-3.2.6-vs2.3.2.7/arch/arm/Kconfig +--- linux-3.2.6/arch/arm/Kconfig 2012-01-09 16:13:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/arm/Kconfig 2012-01-09 16:19:31.000000000 +0100 @@ -2242,6 +2242,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -251,9 +251,9 @@ diff -NurpP --minimal linux-3.2.5/arch/arm/Kconfig linux-3.2.5-vs2.3.2.6/arch/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.2.5/arch/arm/kernel/calls.S linux-3.2.5-vs2.3.2.6/arch/arm/kernel/calls.S ---- linux-3.2.5/arch/arm/kernel/calls.S 2012-01-09 16:13:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/arm/kernel/calls.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/arm/kernel/calls.S linux-3.2.6-vs2.3.2.7/arch/arm/kernel/calls.S +--- linux-3.2.6/arch/arm/kernel/calls.S 2012-01-09 16:13:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/arm/kernel/calls.S 2011-12-05 19:33:02.000000000 +0100 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -263,9 +263,9 @@ diff -NurpP --minimal linux-3.2.5/arch/arm/kernel/calls.S linux-3.2.5-vs2.3.2.6/ CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-3.2.5/arch/arm/kernel/process.c linux-3.2.5-vs2.3.2.6/arch/arm/kernel/process.c ---- linux-3.2.5/arch/arm/kernel/process.c 2012-01-09 16:13:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/arm/kernel/process.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/arm/kernel/process.c linux-3.2.6-vs2.3.2.7/arch/arm/kernel/process.c +--- linux-3.2.6/arch/arm/kernel/process.c 2012-01-09 16:13:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/arm/kernel/process.c 2011-12-05 19:33:02.000000000 +0100 @@ -320,7 +320,8 @@ void __show_regs(struct pt_regs *regs) void show_regs(struct pt_regs * regs) { @@ -276,9 +276,9 @@ diff -NurpP --minimal linux-3.2.5/arch/arm/kernel/process.c linux-3.2.5-vs2.3.2. __show_regs(regs); dump_stack(); } -diff -NurpP --minimal linux-3.2.5/arch/arm/kernel/traps.c linux-3.2.5-vs2.3.2.6/arch/arm/kernel/traps.c ---- linux-3.2.5/arch/arm/kernel/traps.c 2012-01-09 16:13:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/arm/kernel/traps.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/arm/kernel/traps.c linux-3.2.6-vs2.3.2.7/arch/arm/kernel/traps.c +--- linux-3.2.6/arch/arm/kernel/traps.c 2012-01-09 16:13:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/arm/kernel/traps.c 2011-12-05 19:33:02.000000000 +0100 @@ -244,8 +244,8 @@ static int __die(const char *str, int er print_modules(); @@ -290,9 +290,9 @@ diff -NurpP --minimal linux-3.2.5/arch/arm/kernel/traps.c linux-3.2.5-vs2.3.2.6/ if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-3.2.5/arch/cris/Kconfig linux-3.2.5-vs2.3.2.6/arch/cris/Kconfig ---- linux-3.2.5/arch/cris/Kconfig 2012-01-09 16:14:01.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/cris/Kconfig 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/cris/Kconfig linux-3.2.6-vs2.3.2.7/arch/cris/Kconfig +--- linux-3.2.6/arch/cris/Kconfig 2012-01-09 16:14:01.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/cris/Kconfig 2011-12-05 19:33:02.000000000 +0100 @@ -678,6 +678,8 @@ source "drivers/staging/Kconfig" source "arch/cris/Kconfig.debug" @@ -302,9 +302,9 @@ diff -NurpP --minimal linux-3.2.5/arch/cris/Kconfig linux-3.2.5-vs2.3.2.6/arch/c source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.2.5/arch/frv/kernel/kernel_thread.S linux-3.2.5-vs2.3.2.6/arch/frv/kernel/kernel_thread.S ---- linux-3.2.5/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/frv/kernel/kernel_thread.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/frv/kernel/kernel_thread.S linux-3.2.6-vs2.3.2.7/arch/frv/kernel/kernel_thread.S +--- linux-3.2.6/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/frv/kernel/kernel_thread.S 2011-12-05 19:33:02.000000000 +0100 @@ -37,7 +37,7 @@ kernel_thread: # start by forking the current process, but with shared VM @@ -314,9 +314,9 @@ diff -NurpP --minimal linux-3.2.5/arch/frv/kernel/kernel_thread.S linux-3.2.5-vs sethi.p #0xe4e4,gr9 ; second syscall arg [newsp] setlo #0xe4e4,gr9 setlos.p #0,gr10 ; third syscall arg [parent_tidptr] -diff -NurpP --minimal linux-3.2.5/arch/h8300/Kconfig linux-3.2.5-vs2.3.2.6/arch/h8300/Kconfig ---- linux-3.2.5/arch/h8300/Kconfig 2012-01-09 16:14:01.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/h8300/Kconfig 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/h8300/Kconfig linux-3.2.6-vs2.3.2.7/arch/h8300/Kconfig +--- linux-3.2.6/arch/h8300/Kconfig 2012-01-09 16:14:01.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/h8300/Kconfig 2011-12-05 19:33:02.000000000 +0100 @@ -213,6 +213,8 @@ source "fs/Kconfig" source "arch/h8300/Kconfig.debug" @@ -326,9 +326,9 @@ diff -NurpP --minimal linux-3.2.5/arch/h8300/Kconfig linux-3.2.5-vs2.3.2.6/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.2.5/arch/ia64/Kconfig linux-3.2.5-vs2.3.2.6/arch/ia64/Kconfig ---- linux-3.2.5/arch/ia64/Kconfig 2012-01-09 16:14:01.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/ia64/Kconfig 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/ia64/Kconfig linux-3.2.6-vs2.3.2.7/arch/ia64/Kconfig +--- linux-3.2.6/arch/ia64/Kconfig 2012-01-09 16:14:01.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/ia64/Kconfig 2011-12-05 19:33:02.000000000 +0100 @@ -657,6 +657,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -338,9 +338,9 @@ diff -NurpP --minimal linux-3.2.5/arch/ia64/Kconfig linux-3.2.5-vs2.3.2.6/arch/i source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.2.5/arch/ia64/kernel/entry.S linux-3.2.5-vs2.3.2.6/arch/ia64/kernel/entry.S ---- linux-3.2.5/arch/ia64/kernel/entry.S 2012-01-09 16:14:02.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/ia64/kernel/entry.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/ia64/kernel/entry.S linux-3.2.6-vs2.3.2.7/arch/ia64/kernel/entry.S +--- linux-3.2.6/arch/ia64/kernel/entry.S 2012-01-09 16:14:02.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/ia64/kernel/entry.S 2011-12-05 19:33:02.000000000 +0100 @@ -1714,7 +1714,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr @@ -350,9 +350,9 @@ diff -NurpP --minimal linux-3.2.5/arch/ia64/kernel/entry.S linux-3.2.5-vs2.3.2.6 data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-3.2.5/arch/ia64/kernel/process.c linux-3.2.5-vs2.3.2.6/arch/ia64/kernel/process.c ---- linux-3.2.5/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/ia64/kernel/process.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/ia64/kernel/process.c linux-3.2.6-vs2.3.2.7/arch/ia64/kernel/process.c +--- linux-3.2.6/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/ia64/kernel/process.c 2011-12-05 19:33:02.000000000 +0100 @@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs) unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; @@ -364,9 +364,9 @@ diff -NurpP --minimal linux-3.2.5/arch/ia64/kernel/process.c linux-3.2.5-vs2.3.2 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-3.2.5/arch/ia64/kernel/ptrace.c linux-3.2.5-vs2.3.2.6/arch/ia64/kernel/ptrace.c ---- linux-3.2.5/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/ia64/kernel/ptrace.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/ia64/kernel/ptrace.c linux-3.2.6-vs2.3.2.7/arch/ia64/kernel/ptrace.c +--- linux-3.2.6/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/ia64/kernel/ptrace.c 2011-12-05 19:33:02.000000000 +0100 @@ -21,6 +21,7 @@ #include #include @@ -375,9 +375,9 @@ diff -NurpP --minimal linux-3.2.5/arch/ia64/kernel/ptrace.c linux-3.2.5-vs2.3.2. #include #include -diff -NurpP --minimal linux-3.2.5/arch/ia64/kernel/traps.c linux-3.2.5-vs2.3.2.6/arch/ia64/kernel/traps.c ---- linux-3.2.5/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/arch/ia64/kernel/traps.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/ia64/kernel/traps.c linux-3.2.6-vs2.3.2.7/arch/ia64/kernel/traps.c +--- linux-3.2.6/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/arch/ia64/kernel/traps.c 2011-12-05 19:33:02.000000000 +0100 @@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re put_cpu(); @@ -402,9 +402,9 @@ diff -NurpP --minimal linux-3.2.5/arch/ia64/kernel/traps.c linux-3.2.5-vs2.3.2.6 } } } -diff -NurpP --minimal linux-3.2.5/arch/m32r/kernel/traps.c linux-3.2.5-vs2.3.2.6/arch/m32r/kernel/traps.c ---- linux-3.2.5/arch/m32r/kernel/traps.c 2011-10-24 18:44:58.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/arch/m32r/kernel/traps.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/m32r/kernel/traps.c linux-3.2.6-vs2.3.2.7/arch/m32r/kernel/traps.c +--- linux-3.2.6/arch/m32r/kernel/traps.c 2011-10-24 18:44:58.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/arch/m32r/kernel/traps.c 2011-12-05 19:33:02.000000000 +0100 @@ -196,8 +196,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); @@ -417,9 +417,9 @@ diff -NurpP --minimal linux-3.2.5/arch/m32r/kernel/traps.c linux-3.2.5-vs2.3.2.6 /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-3.2.5/arch/m68k/Kconfig linux-3.2.5-vs2.3.2.6/arch/m68k/Kconfig ---- linux-3.2.5/arch/m68k/Kconfig 2012-01-09 16:14:03.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/m68k/Kconfig 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/m68k/Kconfig linux-3.2.6-vs2.3.2.7/arch/m68k/Kconfig +--- linux-3.2.6/arch/m68k/Kconfig 2012-01-09 16:14:03.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/m68k/Kconfig 2011-12-05 19:33:02.000000000 +0100 @@ -135,6 +135,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -429,9 +429,9 @@ diff -NurpP --minimal linux-3.2.5/arch/m68k/Kconfig linux-3.2.5-vs2.3.2.6/arch/m source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.2.5/arch/mips/Kconfig linux-3.2.5-vs2.3.2.6/arch/mips/Kconfig ---- linux-3.2.5/arch/mips/Kconfig 2012-01-09 16:14:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/mips/Kconfig 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/mips/Kconfig linux-3.2.6-vs2.3.2.7/arch/mips/Kconfig +--- linux-3.2.6/arch/mips/Kconfig 2012-01-09 16:14:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/mips/Kconfig 2011-12-05 19:33:02.000000000 +0100 @@ -2478,6 +2478,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -441,9 +441,9 @@ diff -NurpP --minimal linux-3.2.5/arch/mips/Kconfig linux-3.2.5-vs2.3.2.6/arch/m source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.2.5/arch/mips/kernel/ptrace.c linux-3.2.5-vs2.3.2.6/arch/mips/kernel/ptrace.c ---- linux-3.2.5/arch/mips/kernel/ptrace.c 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/arch/mips/kernel/ptrace.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/mips/kernel/ptrace.c linux-3.2.6-vs2.3.2.7/arch/mips/kernel/ptrace.c +--- linux-3.2.6/arch/mips/kernel/ptrace.c 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/arch/mips/kernel/ptrace.c 2011-12-05 19:33:02.000000000 +0100 @@ -25,6 +25,7 @@ #include #include @@ -462,9 +462,9 @@ diff -NurpP --minimal linux-3.2.5/arch/mips/kernel/ptrace.c linux-3.2.5-vs2.3.2. 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-3.2.5/arch/mips/kernel/scall32-o32.S linux-3.2.5-vs2.3.2.6/arch/mips/kernel/scall32-o32.S ---- linux-3.2.5/arch/mips/kernel/scall32-o32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/mips/kernel/scall32-o32.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/mips/kernel/scall32-o32.S linux-3.2.6-vs2.3.2.7/arch/mips/kernel/scall32-o32.S +--- linux-3.2.6/arch/mips/kernel/scall32-o32.S 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/mips/kernel/scall32-o32.S 2011-12-05 19:33:02.000000000 +0100 @@ -523,7 +523,7 @@ einval: li v0, -ENOSYS sys sys_mq_timedreceive 5 sys sys_mq_notify 2 /* 4275 */ @@ -474,9 +474,9 @@ diff -NurpP --minimal linux-3.2.5/arch/mips/kernel/scall32-o32.S linux-3.2.5-vs2 sys sys_waitid 5 sys sys_ni_syscall 0 /* available, was setaltroot */ sys sys_add_key 5 /* 4280 */ -diff -NurpP --minimal linux-3.2.5/arch/mips/kernel/scall64-64.S linux-3.2.5-vs2.3.2.6/arch/mips/kernel/scall64-64.S ---- linux-3.2.5/arch/mips/kernel/scall64-64.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/mips/kernel/scall64-64.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/mips/kernel/scall64-64.S linux-3.2.6-vs2.3.2.7/arch/mips/kernel/scall64-64.S +--- linux-3.2.6/arch/mips/kernel/scall64-64.S 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/mips/kernel/scall64-64.S 2011-12-05 19:33:02.000000000 +0100 @@ -362,7 +362,7 @@ sys_call_table: PTR sys_mq_timedreceive PTR sys_mq_notify @@ -486,9 +486,9 @@ diff -NurpP --minimal linux-3.2.5/arch/mips/kernel/scall64-64.S linux-3.2.5-vs2. PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.2.5/arch/mips/kernel/scall64-n32.S linux-3.2.5-vs2.3.2.6/arch/mips/kernel/scall64-n32.S ---- linux-3.2.5/arch/mips/kernel/scall64-n32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/mips/kernel/scall64-n32.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/mips/kernel/scall64-n32.S linux-3.2.6-vs2.3.2.7/arch/mips/kernel/scall64-n32.S +--- linux-3.2.6/arch/mips/kernel/scall64-n32.S 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/mips/kernel/scall64-n32.S 2011-12-05 19:33:02.000000000 +0100 @@ -361,7 +361,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify @@ -498,9 +498,9 @@ diff -NurpP --minimal linux-3.2.5/arch/mips/kernel/scall64-n32.S linux-3.2.5-vs2 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.2.5/arch/mips/kernel/scall64-o32.S linux-3.2.5-vs2.3.2.6/arch/mips/kernel/scall64-o32.S ---- linux-3.2.5/arch/mips/kernel/scall64-o32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/mips/kernel/scall64-o32.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/mips/kernel/scall64-o32.S linux-3.2.6-vs2.3.2.7/arch/mips/kernel/scall64-o32.S +--- linux-3.2.6/arch/mips/kernel/scall64-o32.S 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/mips/kernel/scall64-o32.S 2011-12-05 19:33:02.000000000 +0100 @@ -480,7 +480,7 @@ sys_call_table: PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ @@ -510,9 +510,9 @@ diff -NurpP --minimal linux-3.2.5/arch/mips/kernel/scall64-o32.S linux-3.2.5-vs2 PTR sys_32_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-3.2.5/arch/mips/kernel/traps.c linux-3.2.5-vs2.3.2.6/arch/mips/kernel/traps.c ---- linux-3.2.5/arch/mips/kernel/traps.c 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/mips/kernel/traps.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/mips/kernel/traps.c linux-3.2.6-vs2.3.2.7/arch/mips/kernel/traps.c +--- linux-3.2.6/arch/mips/kernel/traps.c 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/mips/kernel/traps.c 2011-12-05 19:33:02.000000000 +0100 @@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); @@ -527,9 +527,9 @@ diff -NurpP --minimal linux-3.2.5/arch/mips/kernel/traps.c linux-3.2.5-vs2.3.2.6 if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-3.2.5/arch/parisc/Kconfig linux-3.2.5-vs2.3.2.6/arch/parisc/Kconfig ---- linux-3.2.5/arch/parisc/Kconfig 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/parisc/Kconfig 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/parisc/Kconfig linux-3.2.6-vs2.3.2.7/arch/parisc/Kconfig +--- linux-3.2.6/arch/parisc/Kconfig 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/parisc/Kconfig 2011-12-05 19:33:02.000000000 +0100 @@ -278,6 +278,8 @@ source "fs/Kconfig" source "arch/parisc/Kconfig.debug" @@ -539,9 +539,9 @@ diff -NurpP --minimal linux-3.2.5/arch/parisc/Kconfig linux-3.2.5-vs2.3.2.6/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.2.5/arch/parisc/kernel/syscall_table.S linux-3.2.5-vs2.3.2.6/arch/parisc/kernel/syscall_table.S ---- linux-3.2.5/arch/parisc/kernel/syscall_table.S 2011-10-24 18:45:00.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/arch/parisc/kernel/syscall_table.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/parisc/kernel/syscall_table.S linux-3.2.6-vs2.3.2.7/arch/parisc/kernel/syscall_table.S +--- linux-3.2.6/arch/parisc/kernel/syscall_table.S 2011-10-24 18:45:00.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/arch/parisc/kernel/syscall_table.S 2011-12-05 19:33:02.000000000 +0100 @@ -361,7 +361,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) @@ -551,9 +551,9 @@ diff -NurpP --minimal linux-3.2.5/arch/parisc/kernel/syscall_table.S linux-3.2.5 ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-3.2.5/arch/parisc/kernel/traps.c linux-3.2.5-vs2.3.2.6/arch/parisc/kernel/traps.c ---- linux-3.2.5/arch/parisc/kernel/traps.c 2011-10-24 18:45:00.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/arch/parisc/kernel/traps.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/parisc/kernel/traps.c linux-3.2.6-vs2.3.2.7/arch/parisc/kernel/traps.c +--- linux-3.2.6/arch/parisc/kernel/traps.c 2011-10-24 18:45:00.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/arch/parisc/kernel/traps.c 2011-12-05 19:33:02.000000000 +0100 @@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_ if (err == 0) return; /* STFU */ @@ -577,9 +577,9 @@ diff -NurpP --minimal linux-3.2.5/arch/parisc/kernel/traps.c linux-3.2.5-vs2.3.2 /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-3.2.5/arch/parisc/mm/fault.c linux-3.2.5-vs2.3.2.6/arch/parisc/mm/fault.c ---- linux-3.2.5/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/arch/parisc/mm/fault.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/parisc/mm/fault.c linux-3.2.6-vs2.3.2.7/arch/parisc/mm/fault.c +--- linux-3.2.6/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/arch/parisc/mm/fault.c 2011-12-05 19:33:02.000000000 +0100 @@ -237,8 +237,9 @@ bad_area: #ifdef PRINT_USER_FAULTS @@ -592,9 +592,9 @@ diff -NurpP --minimal linux-3.2.5/arch/parisc/mm/fault.c linux-3.2.5-vs2.3.2.6/a if (vma) { printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", vma->vm_start, vma->vm_end); -diff -NurpP --minimal linux-3.2.5/arch/powerpc/Kconfig linux-3.2.5-vs2.3.2.6/arch/powerpc/Kconfig ---- linux-3.2.5/arch/powerpc/Kconfig 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/powerpc/Kconfig 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/powerpc/Kconfig linux-3.2.6-vs2.3.2.7/arch/powerpc/Kconfig +--- linux-3.2.6/arch/powerpc/Kconfig 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/powerpc/Kconfig 2011-12-05 19:33:02.000000000 +0100 @@ -960,6 +960,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -604,9 +604,9 @@ diff -NurpP --minimal linux-3.2.5/arch/powerpc/Kconfig linux-3.2.5-vs2.3.2.6/arc source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-3.2.5/arch/powerpc/include/asm/unistd.h linux-3.2.5-vs2.3.2.6/arch/powerpc/include/asm/unistd.h ---- linux-3.2.5/arch/powerpc/include/asm/unistd.h 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/powerpc/include/asm/unistd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/powerpc/include/asm/unistd.h linux-3.2.6-vs2.3.2.7/arch/powerpc/include/asm/unistd.h +--- linux-3.2.6/arch/powerpc/include/asm/unistd.h 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/powerpc/include/asm/unistd.h 2011-12-05 19:33:02.000000000 +0100 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -616,9 +616,9 @@ diff -NurpP --minimal linux-3.2.5/arch/powerpc/include/asm/unistd.h linux-3.2.5- #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-3.2.5/arch/powerpc/kernel/process.c linux-3.2.5-vs2.3.2.6/arch/powerpc/kernel/process.c ---- linux-3.2.5/arch/powerpc/kernel/process.c 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/powerpc/kernel/process.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/powerpc/kernel/process.c linux-3.2.6-vs2.3.2.7/arch/powerpc/kernel/process.c +--- linux-3.2.6/arch/powerpc/kernel/process.c 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/powerpc/kernel/process.c 2011-12-05 19:33:02.000000000 +0100 @@ -640,8 +640,9 @@ void show_regs(struct pt_regs * regs) #else printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr); @@ -631,9 +631,9 @@ diff -NurpP --minimal linux-3.2.5/arch/powerpc/kernel/process.c linux-3.2.5-vs2. #ifdef CONFIG_SMP printk(" CPU: %d", raw_smp_processor_id()); -diff -NurpP --minimal linux-3.2.5/arch/powerpc/kernel/traps.c linux-3.2.5-vs2.3.2.6/arch/powerpc/kernel/traps.c ---- linux-3.2.5/arch/powerpc/kernel/traps.c 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/powerpc/kernel/traps.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/powerpc/kernel/traps.c linux-3.2.6-vs2.3.2.7/arch/powerpc/kernel/traps.c +--- linux-3.2.6/arch/powerpc/kernel/traps.c 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/powerpc/kernel/traps.c 2011-12-05 19:33:02.000000000 +0100 @@ -1082,8 +1082,9 @@ void nonrecoverable_exception(struct pt_ void trace_syscall(struct pt_regs *regs) @@ -646,9 +646,9 @@ diff -NurpP --minimal linux-3.2.5/arch/powerpc/kernel/traps.c linux-3.2.5-vs2.3. regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-3.2.5/arch/s390/Kconfig linux-3.2.5-vs2.3.2.6/arch/s390/Kconfig ---- linux-3.2.5/arch/s390/Kconfig 2012-01-09 16:14:06.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/s390/Kconfig 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/s390/Kconfig linux-3.2.6-vs2.3.2.7/arch/s390/Kconfig +--- linux-3.2.6/arch/s390/Kconfig 2012-01-09 16:14:06.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/s390/Kconfig 2011-12-05 19:33:02.000000000 +0100 @@ -641,6 +641,8 @@ source "fs/Kconfig" source "arch/s390/Kconfig.debug" @@ -658,9 +658,9 @@ diff -NurpP --minimal linux-3.2.5/arch/s390/Kconfig linux-3.2.5-vs2.3.2.6/arch/s source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.2.5/arch/s390/include/asm/tlb.h linux-3.2.5-vs2.3.2.6/arch/s390/include/asm/tlb.h ---- linux-3.2.5/arch/s390/include/asm/tlb.h 2011-07-22 11:17:41.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/arch/s390/include/asm/tlb.h 2011-12-15 01:52:28.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/s390/include/asm/tlb.h linux-3.2.6-vs2.3.2.7/arch/s390/include/asm/tlb.h +--- linux-3.2.6/arch/s390/include/asm/tlb.h 2011-07-22 11:17:41.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/arch/s390/include/asm/tlb.h 2011-12-15 01:52:28.000000000 +0100 @@ -24,6 +24,7 @@ #include #include @@ -669,9 +669,9 @@ diff -NurpP --minimal linux-3.2.5/arch/s390/include/asm/tlb.h linux-3.2.5-vs2.3. #include #include #include -diff -NurpP --minimal linux-3.2.5/arch/s390/include/asm/unistd.h linux-3.2.5-vs2.3.2.6/arch/s390/include/asm/unistd.h ---- linux-3.2.5/arch/s390/include/asm/unistd.h 2012-01-09 16:14:06.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/s390/include/asm/unistd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/s390/include/asm/unistd.h linux-3.2.6-vs2.3.2.7/arch/s390/include/asm/unistd.h +--- linux-3.2.6/arch/s390/include/asm/unistd.h 2012-01-09 16:14:06.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/s390/include/asm/unistd.h 2011-12-05 19:33:02.000000000 +0100 @@ -202,7 +202,7 @@ #define __NR_clock_gettime (__NR_timer_create+6) #define __NR_clock_getres (__NR_timer_create+7) @@ -681,9 +681,9 @@ diff -NurpP --minimal linux-3.2.5/arch/s390/include/asm/unistd.h linux-3.2.5-vs2 #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-3.2.5/arch/s390/kernel/ptrace.c linux-3.2.5-vs2.3.2.6/arch/s390/kernel/ptrace.c ---- linux-3.2.5/arch/s390/kernel/ptrace.c 2012-01-09 16:14:06.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/s390/kernel/ptrace.c 2011-12-15 01:11:29.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/s390/kernel/ptrace.c linux-3.2.6-vs2.3.2.7/arch/s390/kernel/ptrace.c +--- linux-3.2.6/arch/s390/kernel/ptrace.c 2012-01-09 16:14:06.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/s390/kernel/ptrace.c 2011-12-15 01:11:29.000000000 +0100 @@ -20,6 +20,7 @@ #include #include @@ -692,9 +692,9 @@ diff -NurpP --minimal linux-3.2.5/arch/s390/kernel/ptrace.c linux-3.2.5-vs2.3.2. #include #include #include -diff -NurpP --minimal linux-3.2.5/arch/s390/kernel/syscalls.S linux-3.2.5-vs2.3.2.6/arch/s390/kernel/syscalls.S ---- linux-3.2.5/arch/s390/kernel/syscalls.S 2012-01-09 16:14:06.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/s390/kernel/syscalls.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/s390/kernel/syscalls.S linux-3.2.6-vs2.3.2.7/arch/s390/kernel/syscalls.S +--- linux-3.2.6/arch/s390/kernel/syscalls.S 2012-01-09 16:14:06.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/s390/kernel/syscalls.S 2011-12-05 19:33:02.000000000 +0100 @@ -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) @@ -704,9 +704,9 @@ diff -NurpP --minimal linux-3.2.5/arch/s390/kernel/syscalls.S linux-3.2.5-vs2.3. 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-3.2.5/arch/sh/Kconfig linux-3.2.5-vs2.3.2.6/arch/sh/Kconfig ---- linux-3.2.5/arch/sh/Kconfig 2012-01-09 16:14:07.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/sh/Kconfig 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/sh/Kconfig linux-3.2.6-vs2.3.2.7/arch/sh/Kconfig +--- linux-3.2.6/arch/sh/Kconfig 2012-01-09 16:14:07.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/sh/Kconfig 2011-12-05 19:33:02.000000000 +0100 @@ -901,6 +901,8 @@ source "fs/Kconfig" source "arch/sh/Kconfig.debug" @@ -716,9 +716,9 @@ diff -NurpP --minimal linux-3.2.5/arch/sh/Kconfig linux-3.2.5-vs2.3.2.6/arch/sh/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.2.5/arch/sh/kernel/irq.c linux-3.2.5-vs2.3.2.6/arch/sh/kernel/irq.c ---- linux-3.2.5/arch/sh/kernel/irq.c 2011-07-22 11:17:41.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/arch/sh/kernel/irq.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/sh/kernel/irq.c linux-3.2.6-vs2.3.2.7/arch/sh/kernel/irq.c +--- linux-3.2.6/arch/sh/kernel/irq.c 2011-07-22 11:17:41.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/arch/sh/kernel/irq.c 2011-12-05 19:33:02.000000000 +0100 @@ -14,6 +14,7 @@ #include #include @@ -727,9 +727,9 @@ diff -NurpP --minimal linux-3.2.5/arch/sh/kernel/irq.c linux-3.2.5-vs2.3.2.6/arc #include #include #include -diff -NurpP --minimal linux-3.2.5/arch/sparc/Kconfig linux-3.2.5-vs2.3.2.6/arch/sparc/Kconfig ---- linux-3.2.5/arch/sparc/Kconfig 2012-01-09 16:14:07.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/sparc/Kconfig 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/sparc/Kconfig linux-3.2.6-vs2.3.2.7/arch/sparc/Kconfig +--- linux-3.2.6/arch/sparc/Kconfig 2012-01-09 16:14:07.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/sparc/Kconfig 2011-12-05 19:33:02.000000000 +0100 @@ -595,6 +595,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -739,9 +739,9 @@ diff -NurpP --minimal linux-3.2.5/arch/sparc/Kconfig linux-3.2.5-vs2.3.2.6/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.2.5/arch/sparc/include/asm/unistd.h linux-3.2.5-vs2.3.2.6/arch/sparc/include/asm/unistd.h ---- linux-3.2.5/arch/sparc/include/asm/unistd.h 2012-01-09 16:14:07.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/sparc/include/asm/unistd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/sparc/include/asm/unistd.h linux-3.2.6-vs2.3.2.7/arch/sparc/include/asm/unistd.h +--- linux-3.2.6/arch/sparc/include/asm/unistd.h 2012-01-09 16:14:07.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/sparc/include/asm/unistd.h 2011-12-05 19:33:02.000000000 +0100 @@ -335,7 +335,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -751,9 +751,9 @@ diff -NurpP --minimal linux-3.2.5/arch/sparc/include/asm/unistd.h linux-3.2.5-vs #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-3.2.5/arch/sparc/kernel/systbls_32.S linux-3.2.5-vs2.3.2.6/arch/sparc/kernel/systbls_32.S ---- linux-3.2.5/arch/sparc/kernel/systbls_32.S 2012-01-09 16:14:09.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/sparc/kernel/systbls_32.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/sparc/kernel/systbls_32.S linux-3.2.6-vs2.3.2.7/arch/sparc/kernel/systbls_32.S +--- linux-3.2.6/arch/sparc/kernel/systbls_32.S 2012-01-09 16:14:09.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/sparc/kernel/systbls_32.S 2011-12-05 19:33:02.000000000 +0100 @@ -70,7 +70,7 @@ sys_call_table: /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep @@ -763,9 +763,9 @@ diff -NurpP --minimal linux-3.2.5/arch/sparc/kernel/systbls_32.S linux-3.2.5-vs2 /*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-3.2.5/arch/sparc/kernel/systbls_64.S linux-3.2.5-vs2.3.2.6/arch/sparc/kernel/systbls_64.S ---- linux-3.2.5/arch/sparc/kernel/systbls_64.S 2012-01-09 16:14:09.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/sparc/kernel/systbls_64.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/sparc/kernel/systbls_64.S linux-3.2.6-vs2.3.2.7/arch/sparc/kernel/systbls_64.S +--- linux-3.2.6/arch/sparc/kernel/systbls_64.S 2012-01-09 16:14:09.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/sparc/kernel/systbls_64.S 2011-12-05 19:33:02.000000000 +0100 @@ -71,7 +71,7 @@ sys_call_table32: /*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep @@ -784,9 +784,9 @@ diff -NurpP --minimal linux-3.2.5/arch/sparc/kernel/systbls_64.S linux-3.2.5-vs2 /*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-3.2.5/arch/um/Kconfig.rest linux-3.2.5-vs2.3.2.6/arch/um/Kconfig.rest ---- linux-3.2.5/arch/um/Kconfig.rest 2012-01-09 16:14:09.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/um/Kconfig.rest 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/um/Kconfig.rest linux-3.2.6-vs2.3.2.7/arch/um/Kconfig.rest +--- linux-3.2.6/arch/um/Kconfig.rest 2012-01-09 16:14:09.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/um/Kconfig.rest 2011-12-05 19:33:02.000000000 +0100 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" source "fs/Kconfig" @@ -796,14 +796,14 @@ diff -NurpP --minimal linux-3.2.5/arch/um/Kconfig.rest linux-3.2.5-vs2.3.2.6/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.2.5/arch/um/include/shared/kern_constants.h linux-3.2.5-vs2.3.2.6/arch/um/include/shared/kern_constants.h ---- linux-3.2.5/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/um/include/shared/kern_constants.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/um/include/shared/kern_constants.h linux-3.2.6-vs2.3.2.7/arch/um/include/shared/kern_constants.h +--- linux-3.2.6/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/um/include/shared/kern_constants.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../include/generated/asm-offsets.h" -diff -NurpP --minimal linux-3.2.5/arch/um/include/shared/user_constants.h linux-3.2.5-vs2.3.2.6/arch/um/include/shared/user_constants.h ---- linux-3.2.5/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/um/include/shared/user_constants.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/um/include/shared/user_constants.h linux-3.2.6-vs2.3.2.7/arch/um/include/shared/user_constants.h +--- linux-3.2.6/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/um/include/shared/user_constants.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,40 @@ +/* + * DO NOT MODIFY. @@ -845,9 +845,9 @@ diff -NurpP --minimal linux-3.2.5/arch/um/include/shared/user_constants.h linux- +#define UM_PROT_WRITE 2 /* PROT_WRITE # */ +#define UM_PROT_EXEC 4 /* PROT_EXEC # */ + -diff -NurpP --minimal linux-3.2.5/arch/x86/Kconfig linux-3.2.5-vs2.3.2.6/arch/x86/Kconfig ---- linux-3.2.5/arch/x86/Kconfig 2012-01-09 16:14:10.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/x86/Kconfig 2011-12-15 01:11:29.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/x86/Kconfig linux-3.2.6-vs2.3.2.7/arch/x86/Kconfig +--- linux-3.2.6/arch/x86/Kconfig 2012-01-09 16:14:10.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/x86/Kconfig 2011-12-15 01:11:29.000000000 +0100 @@ -2170,6 +2170,8 @@ source "fs/Kconfig" source "arch/x86/Kconfig.debug" @@ -857,9 +857,9 @@ diff -NurpP --minimal linux-3.2.5/arch/x86/Kconfig linux-3.2.5-vs2.3.2.6/arch/x8 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.2.5/arch/x86/ia32/ia32entry.S linux-3.2.5-vs2.3.2.6/arch/x86/ia32/ia32entry.S ---- linux-3.2.5/arch/x86/ia32/ia32entry.S 2012-01-09 16:14:10.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/x86/ia32/ia32entry.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/x86/ia32/ia32entry.S linux-3.2.6-vs2.3.2.7/arch/x86/ia32/ia32entry.S +--- linux-3.2.6/arch/x86/ia32/ia32entry.S 2012-01-09 16:14:10.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/x86/ia32/ia32entry.S 2011-12-05 19:33:02.000000000 +0100 @@ -776,7 +776,7 @@ ia32_sys_call_table: .quad sys_tgkill /* 270 */ .quad compat_sys_utimes @@ -869,9 +869,9 @@ diff -NurpP --minimal linux-3.2.5/arch/x86/ia32/ia32entry.S linux-3.2.5-vs2.3.2. .quad sys_mbind .quad compat_sys_get_mempolicy /* 275 */ .quad sys_set_mempolicy -diff -NurpP --minimal linux-3.2.5/arch/x86/include/asm/unistd_64.h linux-3.2.5-vs2.3.2.6/arch/x86/include/asm/unistd_64.h ---- linux-3.2.5/arch/x86/include/asm/unistd_64.h 2012-01-09 16:14:11.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/x86/include/asm/unistd_64.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/x86/include/asm/unistd_64.h linux-3.2.6-vs2.3.2.7/arch/x86/include/asm/unistd_64.h +--- linux-3.2.6/arch/x86/include/asm/unistd_64.h 2012-01-09 16:14:11.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/x86/include/asm/unistd_64.h 2011-12-05 19:33:02.000000000 +0100 @@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill) #define __NR_utimes 235 __SYSCALL(__NR_utimes, sys_utimes) @@ -881,9 +881,9 @@ diff -NurpP --minimal linux-3.2.5/arch/x86/include/asm/unistd_64.h linux-3.2.5-v #define __NR_mbind 237 __SYSCALL(__NR_mbind, sys_mbind) #define __NR_set_mempolicy 238 -diff -NurpP --minimal linux-3.2.5/arch/x86/kernel/syscall_table_32.S linux-3.2.5-vs2.3.2.6/arch/x86/kernel/syscall_table_32.S ---- linux-3.2.5/arch/x86/kernel/syscall_table_32.S 2012-01-09 16:14:11.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/arch/x86/kernel/syscall_table_32.S 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/arch/x86/kernel/syscall_table_32.S linux-3.2.6-vs2.3.2.7/arch/x86/kernel/syscall_table_32.S +--- linux-3.2.6/arch/x86/kernel/syscall_table_32.S 2012-01-09 16:14:11.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/arch/x86/kernel/syscall_table_32.S 2011-12-05 19:33:02.000000000 +0100 @@ -272,7 +272,7 @@ ENTRY(sys_call_table) .long sys_tgkill /* 270 */ .long sys_utimes @@ -893,9 +893,9 @@ diff -NurpP --minimal linux-3.2.5/arch/x86/kernel/syscall_table_32.S linux-3.2.5 .long sys_mbind .long sys_get_mempolicy .long sys_set_mempolicy -diff -NurpP --minimal linux-3.2.5/drivers/block/Kconfig linux-3.2.5-vs2.3.2.6/drivers/block/Kconfig ---- linux-3.2.5/drivers/block/Kconfig 2011-10-24 18:45:08.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/drivers/block/Kconfig 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/drivers/block/Kconfig linux-3.2.6-vs2.3.2.7/drivers/block/Kconfig +--- linux-3.2.6/drivers/block/Kconfig 2011-10-24 18:45:08.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/drivers/block/Kconfig 2011-12-05 19:33:02.000000000 +0100 @@ -288,6 +288,13 @@ config BLK_DEV_CRYPTOLOOP source "drivers/block/drbd/Kconfig" @@ -910,9 +910,9 @@ diff -NurpP --minimal linux-3.2.5/drivers/block/Kconfig linux-3.2.5-vs2.3.2.6/dr config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-3.2.5/drivers/block/Makefile linux-3.2.5-vs2.3.2.6/drivers/block/Makefile ---- linux-3.2.5/drivers/block/Makefile 2011-07-22 11:17:44.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/drivers/block/Makefile 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/drivers/block/Makefile linux-3.2.6-vs2.3.2.7/drivers/block/Makefile +--- linux-3.2.6/drivers/block/Makefile 2011-07-22 11:17:44.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/drivers/block/Makefile 2011-12-05 19:33:02.000000000 +0100 @@ -34,6 +34,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o obj-$(CONFIG_BLK_DEV_SX8) += sx8.o obj-$(CONFIG_BLK_DEV_UB) += ub.o @@ -921,9 +921,9 @@ diff -NurpP --minimal linux-3.2.5/drivers/block/Makefile linux-3.2.5-vs2.3.2.6/d obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-3.2.5/drivers/block/loop.c linux-3.2.5-vs2.3.2.6/drivers/block/loop.c ---- linux-3.2.5/drivers/block/loop.c 2012-01-09 16:14:15.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/drivers/block/loop.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/drivers/block/loop.c linux-3.2.6-vs2.3.2.7/drivers/block/loop.c +--- linux-3.2.6/drivers/block/loop.c 2012-01-09 16:14:15.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/drivers/block/loop.c 2012-01-09 16:19:31.000000000 +0100 @@ -77,6 +77,7 @@ #include #include @@ -979,9 +979,9 @@ diff -NurpP --minimal linux-3.2.5/drivers/block/loop.c linux-3.2.5-vs2.3.2.6/dri mutex_lock(&lo->lo_ctl_mutex); lo->lo_refcnt++; mutex_unlock(&lo->lo_ctl_mutex); -diff -NurpP --minimal linux-3.2.5/drivers/block/vroot.c linux-3.2.5-vs2.3.2.6/drivers/block/vroot.c ---- linux-3.2.5/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/drivers/block/vroot.c 2011-12-07 00:05:16.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/drivers/block/vroot.c linux-3.2.6-vs2.3.2.7/drivers/block/vroot.c +--- linux-3.2.6/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/drivers/block/vroot.c 2011-12-07 00:05:16.000000000 +0100 @@ -0,0 +1,291 @@ +/* + * linux/drivers/block/vroot.c @@ -1274,9 +1274,21 @@ diff -NurpP --minimal linux-3.2.5/drivers/block/vroot.c linux-3.2.5-vs2.3.2.6/dr + +#endif + -diff -NurpP --minimal linux-3.2.5/drivers/infiniband/core/addr.c linux-3.2.5-vs2.3.2.6/drivers/infiniband/core/addr.c ---- linux-3.2.5/drivers/infiniband/core/addr.c 2012-01-09 16:14:19.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/drivers/infiniband/core/addr.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/drivers/infiniband/Kconfig linux-3.2.6-vs2.3.2.7/drivers/infiniband/Kconfig +--- linux-3.2.6/drivers/infiniband/Kconfig 2011-07-22 11:17:45.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/drivers/infiniband/Kconfig 2012-02-15 03:26:22.000000000 +0100 +@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM + config INFINIBAND_ADDR_TRANS + bool + depends on INET +- depends on !(INFINIBAND = y && IPV6 = m) ++ depends on !(INFINIBAND = y && IPV6 = y) + default y + + source "drivers/infiniband/hw/mthca/Kconfig" +diff -NurpP --minimal linux-3.2.6/drivers/infiniband/core/addr.c linux-3.2.6-vs2.3.2.7/drivers/infiniband/core/addr.c +--- linux-3.2.6/drivers/infiniband/core/addr.c 2012-01-09 16:14:19.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/drivers/infiniband/core/addr.c 2011-12-05 19:33:02.000000000 +0100 @@ -255,7 +255,7 @@ static int addr6_resolve(struct sockaddr if (ipv6_addr_any(&fl6.saddr)) { @@ -1286,9 +1298,9 @@ diff -NurpP --minimal linux-3.2.5/drivers/infiniband/core/addr.c linux-3.2.5-vs2 if (ret) goto put; -diff -NurpP --minimal linux-3.2.5/drivers/md/dm-ioctl.c linux-3.2.5-vs2.3.2.6/drivers/md/dm-ioctl.c ---- linux-3.2.5/drivers/md/dm-ioctl.c 2012-01-09 16:14:20.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/drivers/md/dm-ioctl.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/drivers/md/dm-ioctl.c linux-3.2.6-vs2.3.2.7/drivers/md/dm-ioctl.c +--- linux-3.2.6/drivers/md/dm-ioctl.c 2012-01-09 16:14:20.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/drivers/md/dm-ioctl.c 2011-12-05 19:33:02.000000000 +0100 @@ -16,6 +16,7 @@ #include #include @@ -1374,9 +1386,9 @@ diff -NurpP --minimal linux-3.2.5/drivers/md/dm-ioctl.c linux-3.2.5-vs2.3.2.6/dr return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-3.2.5/drivers/md/dm.c linux-3.2.5-vs2.3.2.6/drivers/md/dm.c ---- linux-3.2.5/drivers/md/dm.c 2012-01-09 16:14:21.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/drivers/md/dm.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/drivers/md/dm.c linux-3.2.6-vs2.3.2.7/drivers/md/dm.c +--- linux-3.2.6/drivers/md/dm.c 2012-01-09 16:14:21.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/drivers/md/dm.c 2011-12-05 19:33:02.000000000 +0100 @@ -20,6 +20,7 @@ #include #include @@ -1450,9 +1462,9 @@ diff -NurpP --minimal linux-3.2.5/drivers/md/dm.c linux-3.2.5-vs2.3.2.6/drivers/ md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad_queue; -diff -NurpP --minimal linux-3.2.5/drivers/md/dm.h linux-3.2.5-vs2.3.2.6/drivers/md/dm.h ---- linux-3.2.5/drivers/md/dm.h 2012-01-09 16:14:21.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/drivers/md/dm.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/drivers/md/dm.h linux-3.2.6-vs2.3.2.7/drivers/md/dm.h +--- linux-3.2.6/drivers/md/dm.h 2012-01-09 16:14:21.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/drivers/md/dm.h 2011-12-05 19:33:02.000000000 +0100 @@ -41,6 +41,8 @@ struct dm_dev_internal { struct dm_table; struct dm_md_mempools; @@ -1462,9 +1474,9 @@ diff -NurpP --minimal linux-3.2.5/drivers/md/dm.h linux-3.2.5-vs2.3.2.6/drivers/ /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-3.2.5/drivers/net/tun.c linux-3.2.5-vs2.3.2.6/drivers/net/tun.c ---- linux-3.2.5/drivers/net/tun.c 2012-01-09 16:14:35.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/drivers/net/tun.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/drivers/net/tun.c linux-3.2.6-vs2.3.2.7/drivers/net/tun.c +--- linux-3.2.6/drivers/net/tun.c 2012-01-09 16:14:35.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/drivers/net/tun.c 2011-12-05 19:33:02.000000000 +0100 @@ -64,6 +64,7 @@ #include #include @@ -1534,9 +1546,9 @@ diff -NurpP --minimal linux-3.2.5/drivers/net/tun.c linux-3.2.5-vs2.3.2.6/driver case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-3.2.5/drivers/tty/sysrq.c linux-3.2.5-vs2.3.2.6/drivers/tty/sysrq.c ---- linux-3.2.5/drivers/tty/sysrq.c 2011-05-22 16:17:44.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/drivers/tty/sysrq.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/drivers/tty/sysrq.c linux-3.2.6-vs2.3.2.7/drivers/tty/sysrq.c +--- linux-3.2.6/drivers/tty/sysrq.c 2011-05-22 16:17:44.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/drivers/tty/sysrq.c 2011-12-05 19:33:02.000000000 +0100 @@ -41,6 +41,7 @@ #include #include @@ -1588,9 +1600,9 @@ diff -NurpP --minimal linux-3.2.5/drivers/tty/sysrq.c linux-3.2.5-vs2.3.2.6/driv else retval = -1; return retval; -diff -NurpP --minimal linux-3.2.5/drivers/tty/tty_io.c linux-3.2.5-vs2.3.2.6/drivers/tty/tty_io.c ---- linux-3.2.5/drivers/tty/tty_io.c 2012-01-09 16:14:48.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/drivers/tty/tty_io.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/drivers/tty/tty_io.c linux-3.2.6-vs2.3.2.7/drivers/tty/tty_io.c +--- linux-3.2.6/drivers/tty/tty_io.c 2012-01-09 16:14:48.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/drivers/tty/tty_io.c 2011-12-05 19:33:02.000000000 +0100 @@ -105,6 +105,7 @@ #include @@ -1617,9 +1629,9 @@ diff -NurpP --minimal linux-3.2.5/drivers/tty/tty_io.c linux-3.2.5-vs2.3.2.6/dri if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-3.2.5/fs/attr.c linux-3.2.5-vs2.3.2.6/fs/attr.c ---- linux-3.2.5/fs/attr.c 2012-01-09 16:14:53.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/attr.c 2011-12-05 21:16:01.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/attr.c linux-3.2.6-vs2.3.2.7/fs/attr.c +--- linux-3.2.6/fs/attr.c 2012-01-09 16:14:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/attr.c 2011-12-05 21:16:01.000000000 +0100 @@ -14,6 +14,9 @@ #include #include @@ -1660,9 +1672,9 @@ diff -NurpP --minimal linux-3.2.5/fs/attr.c linux-3.2.5-vs2.3.2.6/fs/attr.c if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-3.2.5/fs/block_dev.c linux-3.2.5-vs2.3.2.6/fs/block_dev.c ---- linux-3.2.5/fs/block_dev.c 2012-01-09 16:14:53.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/block_dev.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/block_dev.c linux-3.2.6-vs2.3.2.7/fs/block_dev.c +--- linux-3.2.6/fs/block_dev.c 2012-01-09 16:14:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/block_dev.c 2011-12-05 19:33:02.000000000 +0100 @@ -25,6 +25,7 @@ #include #include @@ -1700,9 +1712,9 @@ diff -NurpP --minimal linux-3.2.5/fs/block_dev.c linux-3.2.5-vs2.3.2.6/fs/block_ if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-3.2.5/fs/btrfs/ctree.h linux-3.2.5-vs2.3.2.6/fs/btrfs/ctree.h ---- linux-3.2.5/fs/btrfs/ctree.h 2012-01-09 16:14:53.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/btrfs/ctree.h 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/btrfs/ctree.h linux-3.2.6-vs2.3.2.7/fs/btrfs/ctree.h +--- linux-3.2.6/fs/btrfs/ctree.h 2012-01-09 16:14:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/btrfs/ctree.h 2012-01-09 16:19:31.000000000 +0100 @@ -643,11 +643,14 @@ struct btrfs_inode_item { /* modification sequence number for NFS */ __le64 sequence; @@ -1755,9 +1767,9 @@ diff -NurpP --minimal linux-3.2.5/fs/btrfs/ctree.h linux-3.2.5-vs2.3.2.6/fs/btrf int btrfs_defrag_file(struct inode *inode, struct file *file, struct btrfs_ioctl_defrag_range_args *range, u64 newer_than, unsigned long max_pages); -diff -NurpP --minimal linux-3.2.5/fs/btrfs/disk-io.c linux-3.2.5-vs2.3.2.6/fs/btrfs/disk-io.c ---- linux-3.2.5/fs/btrfs/disk-io.c 2012-01-09 16:14:53.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/btrfs/disk-io.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/btrfs/disk-io.c linux-3.2.6-vs2.3.2.7/fs/btrfs/disk-io.c +--- linux-3.2.6/fs/btrfs/disk-io.c 2012-01-09 16:14:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/btrfs/disk-io.c 2012-01-09 16:19:31.000000000 +0100 @@ -2103,6 +2103,9 @@ struct btrfs_root *open_ctree(struct sup goto fail_alloc; } @@ -1768,9 +1780,9 @@ diff -NurpP --minimal linux-3.2.5/fs/btrfs/disk-io.c linux-3.2.5-vs2.3.2.6/fs/bt features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-3.2.5/fs/btrfs/inode.c linux-3.2.5-vs2.3.2.6/fs/btrfs/inode.c ---- linux-3.2.5/fs/btrfs/inode.c 2012-01-09 16:14:53.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/btrfs/inode.c 2012-01-09 16:19:51.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/btrfs/inode.c linux-3.2.6-vs2.3.2.7/fs/btrfs/inode.c +--- linux-3.2.6/fs/btrfs/inode.c 2012-01-09 16:14:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/btrfs/inode.c 2012-01-09 16:19:51.000000000 +0100 @@ -39,6 +39,7 @@ #include #include @@ -1835,9 +1847,9 @@ diff -NurpP --minimal linux-3.2.5/fs/btrfs/inode.c linux-3.2.5-vs2.3.2.6/fs/btrf .get_acl = btrfs_get_acl, }; -diff -NurpP --minimal linux-3.2.5/fs/btrfs/ioctl.c linux-3.2.5-vs2.3.2.6/fs/btrfs/ioctl.c ---- linux-3.2.5/fs/btrfs/ioctl.c 2012-01-09 16:14:53.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/btrfs/ioctl.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/btrfs/ioctl.c linux-3.2.6-vs2.3.2.7/fs/btrfs/ioctl.c +--- linux-3.2.6/fs/btrfs/ioctl.c 2012-01-09 16:14:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/btrfs/ioctl.c 2012-01-09 16:19:31.000000000 +0100 @@ -71,10 +71,13 @@ static unsigned int btrfs_flags_to_ioctl { unsigned int iflags = 0; @@ -2010,9 +2022,9 @@ diff -NurpP --minimal linux-3.2.5/fs/btrfs/ioctl.c linux-3.2.5-vs2.3.2.6/fs/btrf if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-3.2.5/fs/btrfs/super.c linux-3.2.5-vs2.3.2.6/fs/btrfs/super.c ---- linux-3.2.5/fs/btrfs/super.c 2012-01-09 16:14:53.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/btrfs/super.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/btrfs/super.c linux-3.2.6-vs2.3.2.7/fs/btrfs/super.c +--- linux-3.2.6/fs/btrfs/super.c 2012-01-09 16:14:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/btrfs/super.c 2012-01-09 16:19:31.000000000 +0100 @@ -165,7 +165,8 @@ enum { Opt_notreelog, Opt_ratio, Opt_flushoncommit, Opt_discard, Opt_space_cache, Opt_clear_cache, Opt_user_subvol_rm_allowed, @@ -2069,9 +2081,9 @@ diff -NurpP --minimal linux-3.2.5/fs/btrfs/super.c linux-3.2.5-vs2.3.2.6/fs/btrf if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) return 0; -diff -NurpP --minimal linux-3.2.5/fs/char_dev.c linux-3.2.5-vs2.3.2.6/fs/char_dev.c ---- linux-3.2.5/fs/char_dev.c 2011-03-15 18:07:31.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/char_dev.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/char_dev.c linux-3.2.6-vs2.3.2.7/fs/char_dev.c +--- linux-3.2.6/fs/char_dev.c 2011-03-15 18:07:31.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/char_dev.c 2011-12-05 19:33:02.000000000 +0100 @@ -21,6 +21,8 @@ #include #include @@ -2104,9 +2116,9 @@ diff -NurpP --minimal linux-3.2.5/fs/char_dev.c linux-3.2.5-vs2.3.2.6/fs/char_de if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-3.2.5/fs/dcache.c linux-3.2.5-vs2.3.2.6/fs/dcache.c ---- linux-3.2.5/fs/dcache.c 2012-02-07 01:57:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/dcache.c 2012-01-26 08:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/dcache.c linux-3.2.6-vs2.3.2.7/fs/dcache.c +--- linux-3.2.6/fs/dcache.c 2012-02-15 00:58:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/dcache.c 2012-01-26 08:52:10.000000000 +0100 @@ -37,6 +37,7 @@ #include #include @@ -2158,9 +2170,9 @@ diff -NurpP --minimal linux-3.2.5/fs/dcache.c linux-3.2.5-vs2.3.2.6/fs/dcache.c found = dentry; spin_unlock(&dentry->d_lock); break; -diff -NurpP --minimal linux-3.2.5/fs/devpts/inode.c linux-3.2.5-vs2.3.2.6/fs/devpts/inode.c ---- linux-3.2.5/fs/devpts/inode.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/devpts/inode.c 2011-12-05 21:23:19.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/devpts/inode.c linux-3.2.6-vs2.3.2.7/fs/devpts/inode.c +--- linux-3.2.6/fs/devpts/inode.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/devpts/inode.c 2011-12-05 21:23:19.000000000 +0100 @@ -25,6 +25,7 @@ #include #include @@ -2247,9 +2259,9 @@ diff -NurpP --minimal linux-3.2.5/fs/devpts/inode.c linux-3.2.5-vs2.3.2.6/fs/dev inode->i_private = tty; tty->driver_data = inode; -diff -NurpP --minimal linux-3.2.5/fs/ext2/balloc.c linux-3.2.5-vs2.3.2.6/fs/ext2/balloc.c ---- linux-3.2.5/fs/ext2/balloc.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext2/balloc.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext2/balloc.c linux-3.2.6-vs2.3.2.7/fs/ext2/balloc.c +--- linux-3.2.6/fs/ext2/balloc.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext2/balloc.c 2011-12-05 19:33:02.000000000 +0100 @@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block start = 0; end = EXT2_BLOCKS_PER_GROUP(sb); @@ -2258,9 +2270,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext2/balloc.c linux-3.2.5-vs2.3.2.6/fs/ext2 BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-3.2.5/fs/ext2/ext2.h linux-3.2.5-vs2.3.2.6/fs/ext2/ext2.h ---- linux-3.2.5/fs/ext2/ext2.h 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext2/ext2.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext2/ext2.h linux-3.2.6-vs2.3.2.7/fs/ext2/ext2.h +--- linux-3.2.6/fs/ext2/ext2.h 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext2/ext2.h 2011-12-05 19:33:02.000000000 +0100 @@ -126,6 +126,7 @@ extern void ext2_set_inode_flags(struct extern void ext2_get_inode_flags(struct ext2_inode_info *); extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, @@ -2269,18 +2281,18 @@ diff -NurpP --minimal linux-3.2.5/fs/ext2/ext2.h linux-3.2.5-vs2.3.2.6/fs/ext2/e /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.2.5/fs/ext2/file.c linux-3.2.5-vs2.3.2.6/fs/ext2/file.c ---- linux-3.2.5/fs/ext2/file.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/ext2/file.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext2/file.c linux-3.2.6-vs2.3.2.7/fs/ext2/file.c +--- linux-3.2.6/fs/ext2/file.c 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/ext2/file.c 2011-12-05 19:33:02.000000000 +0100 @@ -104,4 +104,5 @@ const struct inode_operations ext2_file_ .setattr = ext2_setattr, .get_acl = ext2_get_acl, .fiemap = ext2_fiemap, + .sync_flags = ext2_sync_flags, }; -diff -NurpP --minimal linux-3.2.5/fs/ext2/ialloc.c linux-3.2.5-vs2.3.2.6/fs/ext2/ialloc.c ---- linux-3.2.5/fs/ext2/ialloc.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext2/ialloc.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext2/ialloc.c linux-3.2.6-vs2.3.2.7/fs/ext2/ialloc.c +--- linux-3.2.6/fs/ext2/ialloc.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext2/ialloc.c 2011-12-05 19:33:02.000000000 +0100 @@ -17,6 +17,7 @@ #include #include @@ -2297,9 +2309,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext2/ialloc.c linux-3.2.5-vs2.3.2.6/fs/ext2 } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.2.5/fs/ext2/inode.c linux-3.2.5-vs2.3.2.6/fs/ext2/inode.c ---- linux-3.2.5/fs/ext2/inode.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext2/inode.c 2011-12-05 21:24:12.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext2/inode.c linux-3.2.6-vs2.3.2.7/fs/ext2/inode.c +--- linux-3.2.6/fs/ext2/inode.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext2/inode.c 2011-12-05 21:24:12.000000000 +0100 @@ -32,6 +32,7 @@ #include #include @@ -2447,9 +2459,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext2/inode.c linux-3.2.5-vs2.3.2.6/fs/ext2/ error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-3.2.5/fs/ext2/ioctl.c linux-3.2.5-vs2.3.2.6/fs/ext2/ioctl.c ---- linux-3.2.5/fs/ext2/ioctl.c 2011-05-22 16:17:51.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/ext2/ioctl.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext2/ioctl.c linux-3.2.6-vs2.3.2.7/fs/ext2/ioctl.c +--- linux-3.2.6/fs/ext2/ioctl.c 2011-05-22 16:17:51.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/ext2/ioctl.c 2011-12-05 19:33:02.000000000 +0100 @@ -17,6 +17,16 @@ #include @@ -2499,9 +2511,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext2/ioctl.c linux-3.2.5-vs2.3.2.6/fs/ext2/ flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; mutex_unlock(&inode->i_mutex); -diff -NurpP --minimal linux-3.2.5/fs/ext2/namei.c linux-3.2.5-vs2.3.2.6/fs/ext2/namei.c ---- linux-3.2.5/fs/ext2/namei.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/ext2/namei.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext2/namei.c linux-3.2.6-vs2.3.2.7/fs/ext2/namei.c +--- linux-3.2.6/fs/ext2/namei.c 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/ext2/namei.c 2011-12-05 19:33:02.000000000 +0100 @@ -32,6 +32,7 @@ #include @@ -2526,9 +2538,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext2/namei.c linux-3.2.5-vs2.3.2.6/fs/ext2/ .get_acl = ext2_get_acl, }; -diff -NurpP --minimal linux-3.2.5/fs/ext2/super.c linux-3.2.5-vs2.3.2.6/fs/ext2/super.c ---- linux-3.2.5/fs/ext2/super.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext2/super.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext2/super.c linux-3.2.6-vs2.3.2.7/fs/ext2/super.c +--- linux-3.2.6/fs/ext2/super.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext2/super.c 2011-12-05 19:33:02.000000000 +0100 @@ -394,7 +394,8 @@ enum { Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, @@ -2594,9 +2606,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext2/super.c linux-3.2.5-vs2.3.2.6/fs/ext2/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.2.5/fs/ext3/file.c linux-3.2.5-vs2.3.2.6/fs/ext3/file.c ---- linux-3.2.5/fs/ext3/file.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/ext3/file.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext3/file.c linux-3.2.6-vs2.3.2.7/fs/ext3/file.c +--- linux-3.2.6/fs/ext3/file.c 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/ext3/file.c 2011-12-05 19:33:02.000000000 +0100 @@ -80,5 +80,6 @@ const struct inode_operations ext3_file_ #endif .get_acl = ext3_get_acl, @@ -2604,9 +2616,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext3/file.c linux-3.2.5-vs2.3.2.6/fs/ext3/f + .sync_flags = ext3_sync_flags, }; -diff -NurpP --minimal linux-3.2.5/fs/ext3/ialloc.c linux-3.2.5-vs2.3.2.6/fs/ext3/ialloc.c ---- linux-3.2.5/fs/ext3/ialloc.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext3/ialloc.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext3/ialloc.c linux-3.2.6-vs2.3.2.7/fs/ext3/ialloc.c +--- linux-3.2.6/fs/ext3/ialloc.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext3/ialloc.c 2011-12-05 19:33:02.000000000 +0100 @@ -23,6 +23,7 @@ #include #include @@ -2623,9 +2635,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext3/ialloc.c linux-3.2.5-vs2.3.2.6/fs/ext3 } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.2.5/fs/ext3/inode.c linux-3.2.5-vs2.3.2.6/fs/ext3/inode.c ---- linux-3.2.5/fs/ext3/inode.c 2012-02-07 01:57:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext3/inode.c 2012-01-18 02:58:07.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext3/inode.c linux-3.2.6-vs2.3.2.7/fs/ext3/inode.c +--- linux-3.2.6/fs/ext3/inode.c 2012-02-15 00:58:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext3/inode.c 2012-01-18 02:58:07.000000000 +0100 @@ -38,6 +38,7 @@ #include #include @@ -2799,9 +2811,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext3/inode.c linux-3.2.5-vs2.3.2.6/fs/ext3/ error = ext3_mark_inode_dirty(handle, inode); ext3_journal_stop(handle); } -diff -NurpP --minimal linux-3.2.5/fs/ext3/ioctl.c linux-3.2.5-vs2.3.2.6/fs/ext3/ioctl.c ---- linux-3.2.5/fs/ext3/ioctl.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext3/ioctl.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext3/ioctl.c linux-3.2.6-vs2.3.2.7/fs/ext3/ioctl.c +--- linux-3.2.6/fs/ext3/ioctl.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext3/ioctl.c 2011-12-05 19:33:02.000000000 +0100 @@ -8,6 +8,7 @@ */ @@ -2877,9 +2889,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext3/ioctl.c linux-3.2.5-vs2.3.2.6/fs/ext3/ flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.2.5/fs/ext3/namei.c linux-3.2.5-vs2.3.2.6/fs/ext3/namei.c ---- linux-3.2.5/fs/ext3/namei.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext3/namei.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext3/namei.c linux-3.2.6-vs2.3.2.7/fs/ext3/namei.c +--- linux-3.2.6/fs/ext3/namei.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext3/namei.c 2011-12-05 19:33:02.000000000 +0100 @@ -36,6 +36,7 @@ #include #include @@ -2904,9 +2916,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext3/namei.c linux-3.2.5-vs2.3.2.6/fs/ext3/ .get_acl = ext3_get_acl, }; -diff -NurpP --minimal linux-3.2.5/fs/ext3/super.c linux-3.2.5-vs2.3.2.6/fs/ext3/super.c ---- linux-3.2.5/fs/ext3/super.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext3/super.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext3/super.c linux-3.2.6-vs2.3.2.7/fs/ext3/super.c +--- linux-3.2.6/fs/ext3/super.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext3/super.c 2011-12-05 19:33:02.000000000 +0100 @@ -831,7 +831,8 @@ enum { Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, @@ -2973,9 +2985,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext3/super.c linux-3.2.5-vs2.3.2.6/fs/ext3/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.2.5/fs/ext4/ext4.h linux-3.2.5-vs2.3.2.6/fs/ext4/ext4.h ---- linux-3.2.5/fs/ext4/ext4.h 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext4/ext4.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext4/ext4.h linux-3.2.6-vs2.3.2.7/fs/ext4/ext4.h +--- linux-3.2.6/fs/ext4/ext4.h 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext4/ext4.h 2011-12-05 19:33:02.000000000 +0100 @@ -371,8 +371,12 @@ struct flex_groups { #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ @@ -3023,9 +3035,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext4/ext4.h linux-3.2.5-vs2.3.2.6/fs/ext4/e /* 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-3.2.5/fs/ext4/file.c linux-3.2.5-vs2.3.2.6/fs/ext4/file.c ---- linux-3.2.5/fs/ext4/file.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext4/file.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext4/file.c linux-3.2.6-vs2.3.2.7/fs/ext4/file.c +--- linux-3.2.6/fs/ext4/file.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext4/file.c 2011-12-05 19:33:02.000000000 +0100 @@ -258,5 +258,6 @@ const struct inode_operations ext4_file_ #endif .get_acl = ext4_get_acl, @@ -3033,9 +3045,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext4/file.c linux-3.2.5-vs2.3.2.6/fs/ext4/f + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-3.2.5/fs/ext4/ialloc.c linux-3.2.5-vs2.3.2.6/fs/ext4/ialloc.c ---- linux-3.2.5/fs/ext4/ialloc.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext4/ialloc.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext4/ialloc.c linux-3.2.6-vs2.3.2.7/fs/ext4/ialloc.c +--- linux-3.2.6/fs/ext4/ialloc.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext4/ialloc.c 2011-12-05 19:33:02.000000000 +0100 @@ -22,6 +22,7 @@ #include #include @@ -3052,9 +3064,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext4/ialloc.c linux-3.2.5-vs2.3.2.6/fs/ext4 } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.2.5/fs/ext4/inode.c linux-3.2.5-vs2.3.2.6/fs/ext4/inode.c ---- linux-3.2.5/fs/ext4/inode.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext4/inode.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext4/inode.c linux-3.2.6-vs2.3.2.7/fs/ext4/inode.c +--- linux-3.2.6/fs/ext4/inode.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext4/inode.c 2012-01-09 16:19:31.000000000 +0100 @@ -38,6 +38,7 @@ #include #include @@ -3232,9 +3244,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext4/inode.c linux-3.2.5-vs2.3.2.6/fs/ext4/ error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-3.2.5/fs/ext4/ioctl.c linux-3.2.5-vs2.3.2.6/fs/ext4/ioctl.c ---- linux-3.2.5/fs/ext4/ioctl.c 2012-02-07 01:57:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext4/ioctl.c 2012-01-26 08:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext4/ioctl.c linux-3.2.6-vs2.3.2.7/fs/ext4/ioctl.c +--- linux-3.2.6/fs/ext4/ioctl.c 2012-02-15 00:58:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext4/ioctl.c 2012-01-26 08:52:10.000000000 +0100 @@ -14,10 +14,39 @@ #include #include @@ -3298,9 +3310,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext4/ioctl.c linux-3.2.5-vs2.3.2.6/fs/ext4/ if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-3.2.5/fs/ext4/namei.c linux-3.2.5-vs2.3.2.6/fs/ext4/namei.c ---- linux-3.2.5/fs/ext4/namei.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext4/namei.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext4/namei.c linux-3.2.6-vs2.3.2.7/fs/ext4/namei.c +--- linux-3.2.6/fs/ext4/namei.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext4/namei.c 2011-12-05 19:33:02.000000000 +0100 @@ -34,6 +34,7 @@ #include #include @@ -3325,9 +3337,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext4/namei.c linux-3.2.5-vs2.3.2.6/fs/ext4/ }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-3.2.5/fs/ext4/super.c linux-3.2.5-vs2.3.2.6/fs/ext4/super.c ---- linux-3.2.5/fs/ext4/super.c 2012-02-07 01:57:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ext4/super.c 2012-01-26 08:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ext4/super.c linux-3.2.6-vs2.3.2.7/fs/ext4/super.c +--- linux-3.2.6/fs/ext4/super.c 2012-02-15 00:58:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ext4/super.c 2012-01-26 08:52:10.000000000 +0100 @@ -1334,6 +1334,7 @@ enum { Opt_inode_readahead_blks, Opt_journal_ioprio, Opt_dioread_nolock, Opt_dioread_lock, @@ -3392,9 +3404,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ext4/super.c linux-3.2.5-vs2.3.2.6/fs/ext4/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.2.5/fs/fcntl.c linux-3.2.5-vs2.3.2.6/fs/fcntl.c ---- linux-3.2.5/fs/fcntl.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/fcntl.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/fcntl.c linux-3.2.6-vs2.3.2.7/fs/fcntl.c +--- linux-3.2.6/fs/fcntl.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/fcntl.c 2011-12-05 19:33:02.000000000 +0100 @@ -20,6 +20,7 @@ #include #include @@ -3421,9 +3433,9 @@ diff -NurpP --minimal linux-3.2.5/fs/fcntl.c linux-3.2.5-vs2.3.2.6/fs/fcntl.c if (unlikely(filp->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) { -diff -NurpP --minimal linux-3.2.5/fs/file.c linux-3.2.5-vs2.3.2.6/fs/file.c ---- linux-3.2.5/fs/file.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/file.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/file.c linux-3.2.6-vs2.3.2.7/fs/file.c +--- linux-3.2.6/fs/file.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/file.c 2011-12-05 19:33:02.000000000 +0100 @@ -21,6 +21,7 @@ #include #include @@ -3449,9 +3461,9 @@ diff -NurpP --minimal linux-3.2.5/fs/file.c linux-3.2.5-vs2.3.2.6/fs/file.c #if 1 /* Sanity check */ if (rcu_dereference_raw(fdt->fd[fd]) != NULL) { -diff -NurpP --minimal linux-3.2.5/fs/file_table.c linux-3.2.5-vs2.3.2.6/fs/file_table.c ---- linux-3.2.5/fs/file_table.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/file_table.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/file_table.c linux-3.2.6-vs2.3.2.7/fs/file_table.c +--- linux-3.2.6/fs/file_table.c 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/file_table.c 2011-12-05 19:33:02.000000000 +0100 @@ -24,6 +24,8 @@ #include #include @@ -3488,9 +3500,9 @@ diff -NurpP --minimal linux-3.2.5/fs/file_table.c linux-3.2.5-vs2.3.2.6/fs/file_ file_sb_list_del(file); file_free(file); } -diff -NurpP --minimal linux-3.2.5/fs/fs_struct.c linux-3.2.5-vs2.3.2.6/fs/fs_struct.c ---- linux-3.2.5/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/fs_struct.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/fs_struct.c linux-3.2.6-vs2.3.2.7/fs/fs_struct.c +--- linux-3.2.6/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/fs_struct.c 2011-12-05 19:33:02.000000000 +0100 @@ -4,6 +4,7 @@ #include #include @@ -3515,9 +3527,9 @@ diff -NurpP --minimal linux-3.2.5/fs/fs_struct.c linux-3.2.5-vs2.3.2.6/fs/fs_str } return fs; } -diff -NurpP --minimal linux-3.2.5/fs/gfs2/file.c linux-3.2.5-vs2.3.2.6/fs/gfs2/file.c ---- linux-3.2.5/fs/gfs2/file.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/gfs2/file.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/gfs2/file.c linux-3.2.6-vs2.3.2.7/fs/gfs2/file.c +--- linux-3.2.6/fs/gfs2/file.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/gfs2/file.c 2011-12-05 19:33:02.000000000 +0100 @@ -143,6 +143,9 @@ static const u32 fsflags_to_gfs2[32] = { [7] = GFS2_DIF_NOATIME, [12] = GFS2_DIF_EXHASH, @@ -3640,9 +3652,9 @@ diff -NurpP --minimal linux-3.2.5/fs/gfs2/file.c linux-3.2.5-vs2.3.2.6/fs/gfs2/f static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-3.2.5/fs/gfs2/inode.h linux-3.2.5-vs2.3.2.6/fs/gfs2/inode.h ---- linux-3.2.5/fs/gfs2/inode.h 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/gfs2/inode.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/gfs2/inode.h linux-3.2.6-vs2.3.2.7/fs/gfs2/inode.h +--- linux-3.2.6/fs/gfs2/inode.h 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/gfs2/inode.h 2011-12-05 19:33:02.000000000 +0100 @@ -120,6 +120,7 @@ extern const struct file_operations gfs2 extern const struct file_operations gfs2_dir_fops_nolock; @@ -3651,9 +3663,9 @@ diff -NurpP --minimal linux-3.2.5/fs/gfs2/inode.h linux-3.2.5-vs2.3.2.6/fs/gfs2/ #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-3.2.5/fs/inode.c linux-3.2.5-vs2.3.2.6/fs/inode.c ---- linux-3.2.5/fs/inode.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/inode.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/inode.c linux-3.2.6-vs2.3.2.7/fs/inode.c +--- linux-3.2.6/fs/inode.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/inode.c 2011-12-05 19:33:02.000000000 +0100 @@ -26,6 +26,7 @@ #include #include @@ -3709,9 +3721,9 @@ diff -NurpP --minimal linux-3.2.5/fs/inode.c linux-3.2.5-vs2.3.2.6/fs/inode.c } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-3.2.5/fs/ioctl.c linux-3.2.5-vs2.3.2.6/fs/ioctl.c ---- linux-3.2.5/fs/ioctl.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/ioctl.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ioctl.c linux-3.2.6-vs2.3.2.7/fs/ioctl.c +--- linux-3.2.6/fs/ioctl.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/ioctl.c 2011-12-05 19:33:02.000000000 +0100 @@ -15,6 +15,9 @@ #include #include @@ -3722,9 +3734,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ioctl.c linux-3.2.5-vs2.3.2.6/fs/ioctl.c #include -diff -NurpP --minimal linux-3.2.5/fs/ioprio.c linux-3.2.5-vs2.3.2.6/fs/ioprio.c ---- linux-3.2.5/fs/ioprio.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ioprio.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ioprio.c linux-3.2.6-vs2.3.2.7/fs/ioprio.c +--- linux-3.2.6/fs/ioprio.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ioprio.c 2011-12-05 19:33:02.000000000 +0100 @@ -28,6 +28,7 @@ #include #include @@ -3751,9 +3763,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ioprio.c linux-3.2.5-vs2.3.2.6/fs/ioprio.c tmpio = get_task_ioprio(p); if (tmpio < 0) continue; -diff -NurpP --minimal linux-3.2.5/fs/jfs/file.c linux-3.2.5-vs2.3.2.6/fs/jfs/file.c ---- linux-3.2.5/fs/jfs/file.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/jfs/file.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/jfs/file.c linux-3.2.6-vs2.3.2.7/fs/jfs/file.c +--- linux-3.2.6/fs/jfs/file.c 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/jfs/file.c 2011-12-05 19:33:02.000000000 +0100 @@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s if (is_quota_modification(inode, iattr)) dquot_initialize(inode); @@ -3772,9 +3784,9 @@ diff -NurpP --minimal linux-3.2.5/fs/jfs/file.c linux-3.2.5-vs2.3.2.6/fs/jfs/fil }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-3.2.5/fs/jfs/ioctl.c linux-3.2.5-vs2.3.2.6/fs/jfs/ioctl.c ---- linux-3.2.5/fs/jfs/ioctl.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/jfs/ioctl.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/jfs/ioctl.c linux-3.2.6-vs2.3.2.7/fs/jfs/ioctl.c +--- linux-3.2.6/fs/jfs/ioctl.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/jfs/ioctl.c 2011-12-05 19:33:02.000000000 +0100 @@ -11,6 +11,7 @@ #include #include @@ -3832,9 +3844,9 @@ diff -NurpP --minimal linux-3.2.5/fs/jfs/ioctl.c linux-3.2.5-vs2.3.2.6/fs/jfs/io flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-3.2.5/fs/jfs/jfs_dinode.h linux-3.2.5-vs2.3.2.6/fs/jfs/jfs_dinode.h ---- linux-3.2.5/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/jfs/jfs_dinode.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/jfs/jfs_dinode.h linux-3.2.6-vs2.3.2.7/fs/jfs/jfs_dinode.h +--- linux-3.2.6/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/jfs/jfs_dinode.h 2011-12-05 19:33:02.000000000 +0100 @@ -161,9 +161,13 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ @@ -3851,9 +3863,9 @@ diff -NurpP --minimal linux-3.2.5/fs/jfs/jfs_dinode.h linux-3.2.5-vs2.3.2.6/fs/j #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-3.2.5/fs/jfs/jfs_filsys.h linux-3.2.5-vs2.3.2.6/fs/jfs/jfs_filsys.h ---- linux-3.2.5/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/jfs/jfs_filsys.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/jfs/jfs_filsys.h linux-3.2.6-vs2.3.2.7/fs/jfs/jfs_filsys.h +--- linux-3.2.6/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/jfs/jfs_filsys.h 2011-12-05 19:33:02.000000000 +0100 @@ -263,6 +263,7 @@ #define JFS_NAME_MAX 255 #define JFS_PATH_MAX BPSIZE @@ -3862,9 +3874,9 @@ diff -NurpP --minimal linux-3.2.5/fs/jfs/jfs_filsys.h linux-3.2.5-vs2.3.2.6/fs/j /* * file system state (superblock state) -diff -NurpP --minimal linux-3.2.5/fs/jfs/jfs_imap.c linux-3.2.5-vs2.3.2.6/fs/jfs/jfs_imap.c ---- linux-3.2.5/fs/jfs/jfs_imap.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/jfs/jfs_imap.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/jfs/jfs_imap.c linux-3.2.6-vs2.3.2.7/fs/jfs/jfs_imap.c +--- linux-3.2.6/fs/jfs/jfs_imap.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/jfs/jfs_imap.c 2011-12-05 19:33:02.000000000 +0100 @@ -46,6 +46,7 @@ #include #include @@ -3924,9 +3936,9 @@ diff -NurpP --minimal linux-3.2.5/fs/jfs/jfs_imap.c linux-3.2.5-vs2.3.2.6/fs/jfs jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-3.2.5/fs/jfs/jfs_inode.c linux-3.2.5-vs2.3.2.6/fs/jfs/jfs_inode.c ---- linux-3.2.5/fs/jfs/jfs_inode.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/jfs/jfs_inode.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/jfs/jfs_inode.c linux-3.2.6-vs2.3.2.7/fs/jfs/jfs_inode.c +--- linux-3.2.6/fs/jfs/jfs_inode.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/jfs/jfs_inode.c 2011-12-05 19:33:02.000000000 +0100 @@ -18,6 +18,7 @@ #include @@ -4000,9 +4012,9 @@ diff -NurpP --minimal linux-3.2.5/fs/jfs/jfs_inode.c linux-3.2.5-vs2.3.2.6/fs/jf } /* -diff -NurpP --minimal linux-3.2.5/fs/jfs/jfs_inode.h linux-3.2.5-vs2.3.2.6/fs/jfs/jfs_inode.h ---- linux-3.2.5/fs/jfs/jfs_inode.h 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/jfs/jfs_inode.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/jfs/jfs_inode.h linux-3.2.6-vs2.3.2.7/fs/jfs/jfs_inode.h +--- linux-3.2.6/fs/jfs/jfs_inode.h 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/jfs/jfs_inode.h 2011-12-05 19:33:02.000000000 +0100 @@ -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); @@ -4011,9 +4023,9 @@ diff -NurpP --minimal linux-3.2.5/fs/jfs/jfs_inode.h linux-3.2.5-vs2.3.2.6/fs/jf 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-3.2.5/fs/jfs/namei.c linux-3.2.5-vs2.3.2.6/fs/jfs/namei.c ---- linux-3.2.5/fs/jfs/namei.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/jfs/namei.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/jfs/namei.c linux-3.2.6-vs2.3.2.7/fs/jfs/namei.c +--- linux-3.2.6/fs/jfs/namei.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/jfs/namei.c 2011-12-05 19:33:02.000000000 +0100 @@ -22,6 +22,7 @@ #include #include @@ -4038,9 +4050,9 @@ diff -NurpP --minimal linux-3.2.5/fs/jfs/namei.c linux-3.2.5-vs2.3.2.6/fs/jfs/na }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-3.2.5/fs/jfs/super.c linux-3.2.5-vs2.3.2.6/fs/jfs/super.c ---- linux-3.2.5/fs/jfs/super.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/jfs/super.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/jfs/super.c linux-3.2.6-vs2.3.2.7/fs/jfs/super.c +--- linux-3.2.6/fs/jfs/super.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/jfs/super.c 2011-12-05 19:33:02.000000000 +0100 @@ -198,7 +198,8 @@ static void jfs_put_super(struct super_b enum { Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, @@ -4106,9 +4118,9 @@ diff -NurpP --minimal linux-3.2.5/fs/jfs/super.c linux-3.2.5-vs2.3.2.6/fs/jfs/su if (newLVSize) { printk(KERN_ERR "resize option for remount only\n"); -diff -NurpP --minimal linux-3.2.5/fs/libfs.c linux-3.2.5-vs2.3.2.6/fs/libfs.c ---- linux-3.2.5/fs/libfs.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/libfs.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/libfs.c linux-3.2.6-vs2.3.2.7/fs/libfs.c +--- linux-3.2.6/fs/libfs.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/libfs.c 2011-12-05 19:33:02.000000000 +0100 @@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru * both impossible due to the lock on directory. */ @@ -4154,9 +4166,9 @@ diff -NurpP --minimal linux-3.2.5/fs/libfs.c linux-3.2.5-vs2.3.2.6/fs/libfs.c EXPORT_SYMBOL(generic_read_dir); EXPORT_SYMBOL(mount_pseudo); EXPORT_SYMBOL(simple_write_begin); -diff -NurpP --minimal linux-3.2.5/fs/locks.c linux-3.2.5-vs2.3.2.6/fs/locks.c ---- linux-3.2.5/fs/locks.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/locks.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/locks.c linux-3.2.6-vs2.3.2.7/fs/locks.c +--- linux-3.2.6/fs/locks.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/locks.c 2012-01-09 16:19:31.000000000 +0100 @@ -126,6 +126,8 @@ #include #include @@ -4354,9 +4366,9 @@ diff -NurpP --minimal linux-3.2.5/fs/locks.c linux-3.2.5-vs2.3.2.6/fs/locks.c return 0; } -diff -NurpP --minimal linux-3.2.5/fs/namei.c linux-3.2.5-vs2.3.2.6/fs/namei.c ---- linux-3.2.5/fs/namei.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/namei.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/namei.c linux-3.2.6-vs2.3.2.7/fs/namei.c +--- linux-3.2.6/fs/namei.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/namei.c 2011-12-05 19:33:02.000000000 +0100 @@ -33,6 +33,14 @@ #include #include @@ -4852,9 +4864,9 @@ diff -NurpP --minimal linux-3.2.5/fs/namei.c linux-3.2.5-vs2.3.2.6/fs/namei.c /* get the link contents into pagecache */ static char *page_getlink(struct dentry * dentry, struct page **ppage) { -diff -NurpP --minimal linux-3.2.5/fs/namespace.c linux-3.2.5-vs2.3.2.6/fs/namespace.c ---- linux-3.2.5/fs/namespace.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/namespace.c 2011-12-15 01:11:32.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/namespace.c linux-3.2.6-vs2.3.2.7/fs/namespace.c +--- linux-3.2.6/fs/namespace.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/namespace.c 2011-12-15 01:11:32.000000000 +0100 @@ -31,6 +31,11 @@ #include #include @@ -5174,9 +5186,9 @@ diff -NurpP --minimal linux-3.2.5/fs/namespace.c linux-3.2.5-vs2.3.2.6/fs/namesp kfree(ns); } EXPORT_SYMBOL(put_mnt_ns); -diff -NurpP --minimal linux-3.2.5/fs/nfs/client.c linux-3.2.5-vs2.3.2.6/fs/nfs/client.c ---- linux-3.2.5/fs/nfs/client.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/nfs/client.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/nfs/client.c linux-3.2.6-vs2.3.2.7/fs/nfs/client.c +--- linux-3.2.6/fs/nfs/client.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/nfs/client.c 2011-12-05 19:33:02.000000000 +0100 @@ -779,6 +779,9 @@ static int nfs_init_server_rpcclient(str if (server->flags & NFS_MOUNT_SOFT) server->client->cl_softrtry = 1; @@ -5198,9 +5210,9 @@ diff -NurpP --minimal linux-3.2.5/fs/nfs/client.c linux-3.2.5-vs2.3.2.6/fs/nfs/c server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-3.2.5/fs/nfs/dir.c linux-3.2.5-vs2.3.2.6/fs/nfs/dir.c ---- linux-3.2.5/fs/nfs/dir.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/nfs/dir.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/nfs/dir.c linux-3.2.6-vs2.3.2.7/fs/nfs/dir.c +--- linux-3.2.6/fs/nfs/dir.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/nfs/dir.c 2011-12-05 19:33:02.000000000 +0100 @@ -35,6 +35,7 @@ #include #include @@ -5217,9 +5229,9 @@ diff -NurpP --minimal linux-3.2.5/fs/nfs/dir.c linux-3.2.5-vs2.3.2.6/fs/nfs/dir. no_entry: res = d_materialise_unique(dentry, inode); if (res != NULL) { -diff -NurpP --minimal linux-3.2.5/fs/nfs/inode.c linux-3.2.5-vs2.3.2.6/fs/nfs/inode.c ---- linux-3.2.5/fs/nfs/inode.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/nfs/inode.c 2011-12-05 21:16:35.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/nfs/inode.c linux-3.2.6-vs2.3.2.7/fs/nfs/inode.c +--- linux-3.2.6/fs/nfs/inode.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/nfs/inode.c 2011-12-05 21:16:35.000000000 +0100 @@ -38,6 +38,7 @@ #include #include @@ -5371,9 +5383,9 @@ diff -NurpP --minimal linux-3.2.5/fs/nfs/inode.c linux-3.2.5-vs2.3.2.6/fs/nfs/in if (fattr->valid & NFS_ATTR_FATTR_NLINK) { if (inode->i_nlink != fattr->nlink) { invalid |= NFS_INO_INVALID_ATTR; -diff -NurpP --minimal linux-3.2.5/fs/nfs/nfs3xdr.c linux-3.2.5-vs2.3.2.6/fs/nfs/nfs3xdr.c ---- linux-3.2.5/fs/nfs/nfs3xdr.c 2011-03-15 18:07:32.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/nfs/nfs3xdr.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/nfs/nfs3xdr.c linux-3.2.6-vs2.3.2.7/fs/nfs/nfs3xdr.c +--- linux-3.2.6/fs/nfs/nfs3xdr.c 2011-03-15 18:07:32.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/nfs/nfs3xdr.c 2011-12-05 19:33:02.000000000 +0100 @@ -20,6 +20,7 @@ #include #include @@ -5519,9 +5531,9 @@ diff -NurpP --minimal linux-3.2.5/fs/nfs/nfs3xdr.c linux-3.2.5-vs2.3.2.6/fs/nfs/ } /* -diff -NurpP --minimal linux-3.2.5/fs/nfs/super.c linux-3.2.5-vs2.3.2.6/fs/nfs/super.c ---- linux-3.2.5/fs/nfs/super.c 2012-02-07 01:57:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/nfs/super.c 2012-01-26 08:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/nfs/super.c linux-3.2.6-vs2.3.2.7/fs/nfs/super.c +--- linux-3.2.6/fs/nfs/super.c 2012-02-15 00:58:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/nfs/super.c 2012-01-26 08:52:10.000000000 +0100 @@ -53,6 +53,7 @@ #include #include @@ -5593,9 +5605,9 @@ diff -NurpP --minimal linux-3.2.5/fs/nfs/super.c linux-3.2.5-vs2.3.2.6/fs/nfs/su /* * options that take text values -diff -NurpP --minimal linux-3.2.5/fs/nfsd/auth.c linux-3.2.5-vs2.3.2.6/fs/nfsd/auth.c ---- linux-3.2.5/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/nfsd/auth.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/nfsd/auth.c linux-3.2.6-vs2.3.2.7/fs/nfsd/auth.c +--- linux-3.2.6/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/nfsd/auth.c 2011-12-05 19:33:02.000000000 +0100 @@ -1,6 +1,7 @@ /* Copyright (C) 1995, 1996 Olaf Kirch */ @@ -5614,9 +5626,9 @@ diff -NurpP --minimal linux-3.2.5/fs/nfsd/auth.c linux-3.2.5-vs2.3.2.6/fs/nfsd/a rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-3.2.5/fs/nfsd/nfs3xdr.c linux-3.2.5-vs2.3.2.6/fs/nfsd/nfs3xdr.c ---- linux-3.2.5/fs/nfsd/nfs3xdr.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/nfsd/nfs3xdr.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/nfsd/nfs3xdr.c linux-3.2.6-vs2.3.2.7/fs/nfsd/nfs3xdr.c +--- linux-3.2.6/fs/nfsd/nfs3xdr.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/nfsd/nfs3xdr.c 2011-12-05 19:33:02.000000000 +0100 @@ -7,6 +7,7 @@ */ @@ -5667,9 +5679,9 @@ diff -NurpP --minimal linux-3.2.5/fs/nfsd/nfs3xdr.c linux-3.2.5-vs2.3.2.6/fs/nfs if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-3.2.5/fs/nfsd/nfs4xdr.c linux-3.2.5-vs2.3.2.6/fs/nfsd/nfs4xdr.c ---- linux-3.2.5/fs/nfsd/nfs4xdr.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/nfsd/nfs4xdr.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/nfsd/nfs4xdr.c linux-3.2.6-vs2.3.2.7/fs/nfsd/nfs4xdr.c +--- linux-3.2.6/fs/nfsd/nfs4xdr.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/nfsd/nfs4xdr.c 2011-12-05 19:33:02.000000000 +0100 @@ -46,6 +46,7 @@ #include #include @@ -5699,9 +5711,9 @@ diff -NurpP --minimal linux-3.2.5/fs/nfsd/nfs4xdr.c linux-3.2.5-vs2.3.2.6/fs/nfs if (status == nfserr_resource) goto out_resource; if (status) -diff -NurpP --minimal linux-3.2.5/fs/nfsd/nfsxdr.c linux-3.2.5-vs2.3.2.6/fs/nfsd/nfsxdr.c ---- linux-3.2.5/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/nfsd/nfsxdr.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/nfsd/nfsxdr.c linux-3.2.6-vs2.3.2.7/fs/nfsd/nfsxdr.c +--- linux-3.2.6/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/nfsd/nfsxdr.c 2011-12-05 19:33:02.000000000 +0100 @@ -6,6 +6,7 @@ #include "xdr.h" @@ -5750,9 +5762,9 @@ diff -NurpP --minimal linux-3.2.5/fs/nfsd/nfsxdr.c linux-3.2.5-vs2.3.2.6/fs/nfsd if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-3.2.5/fs/ocfs2/dlmglue.c linux-3.2.5-vs2.3.2.6/fs/ocfs2/dlmglue.c ---- linux-3.2.5/fs/ocfs2/dlmglue.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ocfs2/dlmglue.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ocfs2/dlmglue.c linux-3.2.6-vs2.3.2.7/fs/ocfs2/dlmglue.c +--- linux-3.2.6/fs/ocfs2/dlmglue.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ocfs2/dlmglue.c 2011-12-05 19:33:02.000000000 +0100 @@ -2047,6 +2047,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); @@ -5769,9 +5781,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ocfs2/dlmglue.c linux-3.2.5-vs2.3.2.6/fs/oc inode->i_mode = be16_to_cpu(lvb->lvb_imode); set_nlink(inode, be16_to_cpu(lvb->lvb_inlink)); ocfs2_unpack_timespec(&inode->i_atime, -diff -NurpP --minimal linux-3.2.5/fs/ocfs2/dlmglue.h linux-3.2.5-vs2.3.2.6/fs/ocfs2/dlmglue.h ---- linux-3.2.5/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/ocfs2/dlmglue.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ocfs2/dlmglue.h linux-3.2.6-vs2.3.2.7/fs/ocfs2/dlmglue.h +--- linux-3.2.6/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/ocfs2/dlmglue.h 2011-12-05 19:33:02.000000000 +0100 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { __be16 lvb_inlink; __be32 lvb_iattr; @@ -5782,9 +5794,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ocfs2/dlmglue.h linux-3.2.5-vs2.3.2.6/fs/oc }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-3.2.5/fs/ocfs2/file.c linux-3.2.5-vs2.3.2.6/fs/ocfs2/file.c ---- linux-3.2.5/fs/ocfs2/file.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ocfs2/file.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ocfs2/file.c linux-3.2.6-vs2.3.2.7/fs/ocfs2/file.c +--- linux-3.2.6/fs/ocfs2/file.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ocfs2/file.c 2011-12-05 19:33:02.000000000 +0100 @@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry, attr->ia_valid &= ~ATTR_SIZE; @@ -5794,9 +5806,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ocfs2/file.c linux-3.2.5-vs2.3.2.6/fs/ocfs2 if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-3.2.5/fs/ocfs2/inode.c linux-3.2.5-vs2.3.2.6/fs/ocfs2/inode.c ---- linux-3.2.5/fs/ocfs2/inode.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ocfs2/inode.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ocfs2/inode.c linux-3.2.6-vs2.3.2.7/fs/ocfs2/inode.c +--- linux-3.2.6/fs/ocfs2/inode.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ocfs2/inode.c 2011-12-05 19:33:02.000000000 +0100 @@ -28,6 +28,7 @@ #include #include @@ -5893,9 +5905,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ocfs2/inode.c linux-3.2.5-vs2.3.2.6/fs/ocfs /* Fast symlinks will have i_size but no allocated clusters. */ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) -diff -NurpP --minimal linux-3.2.5/fs/ocfs2/inode.h linux-3.2.5-vs2.3.2.6/fs/ocfs2/inode.h ---- linux-3.2.5/fs/ocfs2/inode.h 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ocfs2/inode.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ocfs2/inode.h linux-3.2.6-vs2.3.2.7/fs/ocfs2/inode.h +--- linux-3.2.6/fs/ocfs2/inode.h 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ocfs2/inode.h 2011-12-05 19:33:02.000000000 +0100 @@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i void ocfs2_set_inode_flags(struct inode *inode); @@ -5904,9 +5916,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ocfs2/inode.h linux-3.2.5-vs2.3.2.6/fs/ocfs static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-3.2.5/fs/ocfs2/ioctl.c linux-3.2.5-vs2.3.2.6/fs/ocfs2/ioctl.c ---- linux-3.2.5/fs/ocfs2/ioctl.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ocfs2/ioctl.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ocfs2/ioctl.c linux-3.2.6-vs2.3.2.7/fs/ocfs2/ioctl.c +--- linux-3.2.6/fs/ocfs2/ioctl.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ocfs2/ioctl.c 2011-12-05 19:33:02.000000000 +0100 @@ -78,7 +78,41 @@ static int ocfs2_get_inode_attr(struct i return status; } @@ -5970,9 +5982,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ocfs2/ioctl.c linux-3.2.5-vs2.3.2.6/fs/ocfs 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-3.2.5/fs/ocfs2/namei.c linux-3.2.5-vs2.3.2.6/fs/ocfs2/namei.c ---- linux-3.2.5/fs/ocfs2/namei.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ocfs2/namei.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ocfs2/namei.c linux-3.2.6-vs2.3.2.7/fs/ocfs2/namei.c +--- linux-3.2.6/fs/ocfs2/namei.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ocfs2/namei.c 2011-12-05 19:33:02.000000000 +0100 @@ -41,6 +41,7 @@ #include #include @@ -6003,9 +6015,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ocfs2/namei.c linux-3.2.5-vs2.3.2.6/fs/ocfs 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-3.2.5/fs/ocfs2/ocfs2.h linux-3.2.5-vs2.3.2.6/fs/ocfs2/ocfs2.h ---- linux-3.2.5/fs/ocfs2/ocfs2.h 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ocfs2/ocfs2.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ocfs2/ocfs2.h linux-3.2.6-vs2.3.2.7/fs/ocfs2/ocfs2.h +--- linux-3.2.6/fs/ocfs2/ocfs2.h 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ocfs2/ocfs2.h 2011-12-05 19:33:02.000000000 +0100 @@ -272,6 +272,7 @@ enum ocfs2_mount_options writes */ OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */ @@ -6014,9 +6026,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ocfs2/ocfs2.h linux-3.2.5-vs2.3.2.6/fs/ocfs }; #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-3.2.5/fs/ocfs2/ocfs2_fs.h linux-3.2.5-vs2.3.2.6/fs/ocfs2/ocfs2_fs.h ---- linux-3.2.5/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/ocfs2/ocfs2_fs.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ocfs2/ocfs2_fs.h linux-3.2.6-vs2.3.2.7/fs/ocfs2/ocfs2_fs.h +--- linux-3.2.6/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/ocfs2/ocfs2_fs.h 2011-12-05 19:33:02.000000000 +0100 @@ -266,6 +266,11 @@ #define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ #define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */ @@ -6029,9 +6041,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ocfs2/ocfs2_fs.h linux-3.2.5-vs2.3.2.6/fs/o #define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */ #define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */ -diff -NurpP --minimal linux-3.2.5/fs/ocfs2/super.c linux-3.2.5-vs2.3.2.6/fs/ocfs2/super.c ---- linux-3.2.5/fs/ocfs2/super.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/ocfs2/super.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/ocfs2/super.c linux-3.2.6-vs2.3.2.7/fs/ocfs2/super.c +--- linux-3.2.6/fs/ocfs2/super.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/ocfs2/super.c 2011-12-05 19:33:02.000000000 +0100 @@ -185,6 +185,7 @@ enum { Opt_coherency_full, Opt_resv_level, @@ -6095,9 +6107,9 @@ diff -NurpP --minimal linux-3.2.5/fs/ocfs2/super.c linux-3.2.5-vs2.3.2.6/fs/ocfs default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-3.2.5/fs/open.c linux-3.2.5-vs2.3.2.6/fs/open.c ---- linux-3.2.5/fs/open.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/open.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/open.c linux-3.2.6-vs2.3.2.7/fs/open.c +--- linux-3.2.6/fs/open.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/open.c 2011-12-05 19:33:02.000000000 +0100 @@ -30,6 +30,11 @@ #include #include @@ -6189,9 +6201,9 @@ diff -NurpP --minimal linux-3.2.5/fs/open.c linux-3.2.5-vs2.3.2.6/fs/open.c } void put_unused_fd(unsigned int fd) -diff -NurpP --minimal linux-3.2.5/fs/proc/array.c linux-3.2.5-vs2.3.2.6/fs/proc/array.c ---- linux-3.2.5/fs/proc/array.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/proc/array.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/proc/array.c linux-3.2.6-vs2.3.2.7/fs/proc/array.c +--- linux-3.2.6/fs/proc/array.c 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/proc/array.c 2011-12-05 19:33:02.000000000 +0100 @@ -81,6 +81,8 @@ #include #include @@ -6305,9 +6317,9 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/array.c linux-3.2.5-vs2.3.2.6/fs/proc/ 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-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/base.c ---- linux-3.2.5/fs/proc/base.c 2012-02-07 01:57:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/proc/base.c 2012-01-26 08:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/proc/base.c linux-3.2.6-vs2.3.2.7/fs/proc/base.c +--- linux-3.2.6/fs/proc/base.c 2012-02-15 00:58:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/proc/base.c 2012-02-15 03:26:56.000000000 +0100 @@ -83,6 +83,8 @@ #include #include @@ -6317,7 +6329,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b #ifdef CONFIG_HARDWALL #include #endif -@@ -1035,11 +1037,16 @@ static ssize_t oom_adjust_write(struct f +@@ -1021,11 +1023,16 @@ static ssize_t oom_adjust_write(struct f goto err_task_lock; } @@ -6335,7 +6347,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b /* * Warn that /proc/pid/oom_adj is deprecated, see * Documentation/feature-removal-schedule.txt. -@@ -1194,7 +1201,7 @@ static ssize_t proc_loginuid_write(struc +@@ -1180,7 +1187,7 @@ static ssize_t proc_loginuid_write(struc ssize_t length; uid_t loginuid; @@ -6344,7 +6356,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b return -EPERM; rcu_read_lock(); -@@ -1641,6 +1648,8 @@ struct inode *proc_pid_make_inode(struct +@@ -1627,6 +1634,8 @@ struct inode *proc_pid_make_inode(struct inode->i_gid = cred->egid; rcu_read_unlock(); } @@ -6353,7 +6365,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b security_task_to_inode(task, inode); out: -@@ -1677,6 +1686,8 @@ int pid_getattr(struct vfsmount *mnt, st +@@ -1663,6 +1672,8 @@ int pid_getattr(struct vfsmount *mnt, st /* dentry stuff */ @@ -6362,7 +6374,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b /* * Exceptional case: normally we are not allowed to unhash a busy * directory. In this case, however, we can do it - no aliasing problems -@@ -1705,6 +1716,12 @@ int pid_revalidate(struct dentry *dentry +@@ -1691,6 +1702,12 @@ int pid_revalidate(struct dentry *dentry task = get_proc_task(inode); if (task) { @@ -6375,7 +6387,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || task_dumpable(task)) { rcu_read_lock(); -@@ -1721,6 +1738,7 @@ int pid_revalidate(struct dentry *dentry +@@ -1707,6 +1724,7 @@ int pid_revalidate(struct dentry *dentry put_task_struct(task); return 1; } @@ -6383,7 +6395,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b d_drop(dentry); return 0; } -@@ -2210,6 +2228,13 @@ static struct dentry *proc_pident_lookup +@@ -2196,6 +2214,13 @@ static struct dentry *proc_pident_lookup if (!task) goto out_no_task; @@ -6397,7 +6409,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b /* * Yes, it does not scale. And it should not. Don't add * new entries into /proc// without very good reasons. -@@ -2595,7 +2620,7 @@ out_iput: +@@ -2581,7 +2606,7 @@ out_iput: static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry) { struct dentry *error; @@ -6406,7 +6418,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b const struct pid_entry *p, *last; error = ERR_PTR(-ENOENT); -@@ -2702,6 +2727,9 @@ static int proc_pid_personality(struct s +@@ -2688,6 +2713,9 @@ static int proc_pid_personality(struct s static const struct file_operations proc_task_operations; static const struct inode_operations proc_task_inode_operations; @@ -6416,7 +6428,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b static const struct pid_entry tgid_base_stuff[] = { DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations), DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations), -@@ -2765,6 +2793,8 @@ static const struct pid_entry tgid_base_ +@@ -2751,6 +2779,8 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_CGROUPS REG("cgroup", S_IRUGO, proc_cgroup_operations), #endif @@ -6425,7 +6437,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b INF("oom_score", S_IRUGO, proc_oom_score), REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adjust_operations), REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations), -@@ -2784,6 +2814,7 @@ static const struct pid_entry tgid_base_ +@@ -2770,6 +2800,7 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_HARDWALL INF("hardwall", S_IRUGO, proc_pid_hardwall), #endif @@ -6433,7 +6445,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b }; static int proc_tgid_base_readdir(struct file * filp, -@@ -2976,7 +3007,7 @@ retry: +@@ -2962,7 +2993,7 @@ retry: iter.task = NULL; pid = find_ge_pid(iter.tgid, ns); if (pid) { @@ -6442,7 +6454,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b iter.task = pid_task(pid, PIDTYPE_PID); /* What we to know is if the pid we have find is the * pid of a thread_group_leader. Testing for task -@@ -3006,7 +3037,7 @@ static int proc_pid_fill_cache(struct fi +@@ -2992,7 +3023,7 @@ static int proc_pid_fill_cache(struct fi struct tgid_iter iter) { char name[PROC_NUMBUF]; @@ -6451,7 +6463,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b return proc_fill_cache(filp, dirent, filldir, name, len, proc_pid_instantiate, iter.task, NULL); } -@@ -3023,7 +3054,7 @@ int proc_pid_readdir(struct file * filp, +@@ -3009,7 +3040,7 @@ int proc_pid_readdir(struct file * filp, goto out_no_task; nr = filp->f_pos - FIRST_PROCESS_ENTRY; @@ -6460,7 +6472,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b if (!reaper) goto out_no_task; -@@ -3040,6 +3071,8 @@ int proc_pid_readdir(struct file * filp, +@@ -3026,6 +3057,8 @@ int proc_pid_readdir(struct file * filp, iter.task; iter.tgid += 1, iter = next_tgid(ns, iter)) { filp->f_pos = iter.tgid + TGID_OFFSET; @@ -6469,7 +6481,7 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) { put_task_struct(iter.task); goto out; -@@ -3193,6 +3226,8 @@ static struct dentry *proc_task_lookup(s +@@ -3179,6 +3212,8 @@ static struct dentry *proc_task_lookup(s tid = name_to_int(dentry); if (tid == ~0U) goto out; @@ -6478,9 +6490,9 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/base.c linux-3.2.5-vs2.3.2.6/fs/proc/b ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-3.2.5/fs/proc/generic.c linux-3.2.5-vs2.3.2.6/fs/proc/generic.c ---- linux-3.2.5/fs/proc/generic.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/proc/generic.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/proc/generic.c linux-3.2.6-vs2.3.2.7/fs/proc/generic.c +--- linux-3.2.6/fs/proc/generic.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/proc/generic.c 2011-12-05 19:33:02.000000000 +0100 @@ -22,6 +22,7 @@ #include #include @@ -6540,9 +6552,9 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/generic.c linux-3.2.5-vs2.3.2.6/fs/pro } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-3.2.5/fs/proc/inode.c linux-3.2.5-vs2.3.2.6/fs/proc/inode.c ---- linux-3.2.5/fs/proc/inode.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/proc/inode.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/proc/inode.c linux-3.2.6-vs2.3.2.7/fs/proc/inode.c +--- linux-3.2.6/fs/proc/inode.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/proc/inode.c 2011-12-05 19:33:02.000000000 +0100 @@ -442,6 +442,8 @@ struct inode *proc_get_inode(struct supe inode->i_uid = de->uid; inode->i_gid = de->gid; @@ -6552,9 +6564,9 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/inode.c linux-3.2.5-vs2.3.2.6/fs/proc/ if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-3.2.5/fs/proc/internal.h linux-3.2.5-vs2.3.2.6/fs/proc/internal.h ---- linux-3.2.5/fs/proc/internal.h 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/proc/internal.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/proc/internal.h linux-3.2.6-vs2.3.2.7/fs/proc/internal.h +--- linux-3.2.6/fs/proc/internal.h 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/proc/internal.h 2011-12-05 19:33:02.000000000 +0100 @@ -10,6 +10,7 @@ */ @@ -6591,9 +6603,9 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/internal.h linux-3.2.5-vs2.3.2.6/fs/pr static inline int proc_fd(struct inode *inode) { return PROC_I(inode)->fd; -diff -NurpP --minimal linux-3.2.5/fs/proc/loadavg.c linux-3.2.5-vs2.3.2.6/fs/proc/loadavg.c ---- linux-3.2.5/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/proc/loadavg.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/proc/loadavg.c linux-3.2.6-vs2.3.2.7/fs/proc/loadavg.c +--- linux-3.2.6/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/proc/loadavg.c 2011-12-05 19:33:02.000000000 +0100 @@ -12,15 +12,27 @@ static int loadavg_proc_show(struct seq_file *m, void *v) @@ -6623,9 +6635,9 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/loadavg.c linux-3.2.5-vs2.3.2.6/fs/pro task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-3.2.5/fs/proc/meminfo.c linux-3.2.5-vs2.3.2.6/fs/proc/meminfo.c ---- linux-3.2.5/fs/proc/meminfo.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/proc/meminfo.c 2011-12-15 01:11:32.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/proc/meminfo.c linux-3.2.6-vs2.3.2.7/fs/proc/meminfo.c +--- linux-3.2.6/fs/proc/meminfo.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/proc/meminfo.c 2011-12-15 01:11:32.000000000 +0100 @@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_ allowed = ((totalram_pages - hugetlb_total_pages()) * sysctl_overcommit_ratio / 100) + total_swap_pages; @@ -6636,9 +6648,9 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/meminfo.c linux-3.2.5-vs2.3.2.6/fs/pro total_swapcache_pages - i.bufferram; if (cached < 0) cached = 0; -diff -NurpP --minimal linux-3.2.5/fs/proc/root.c linux-3.2.5-vs2.3.2.6/fs/proc/root.c ---- linux-3.2.5/fs/proc/root.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/proc/root.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/proc/root.c linux-3.2.6-vs2.3.2.7/fs/proc/root.c +--- linux-3.2.6/fs/proc/root.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/proc/root.c 2012-01-09 16:19:31.000000000 +0100 @@ -18,9 +18,14 @@ #include #include @@ -6670,9 +6682,9 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/root.c linux-3.2.5-vs2.3.2.6/fs/proc/r .name = "/proc", }; -diff -NurpP --minimal linux-3.2.5/fs/proc/uptime.c linux-3.2.5-vs2.3.2.6/fs/proc/uptime.c ---- linux-3.2.5/fs/proc/uptime.c 2012-02-07 01:57:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/proc/uptime.c 2012-01-26 09:03:19.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/proc/uptime.c linux-3.2.6-vs2.3.2.7/fs/proc/uptime.c +--- linux-3.2.6/fs/proc/uptime.c 2012-02-15 00:58:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/proc/uptime.c 2012-01-26 09:03:19.000000000 +0100 @@ -5,6 +5,7 @@ #include #include @@ -6692,9 +6704,9 @@ diff -NurpP --minimal linux-3.2.5/fs/proc/uptime.c linux-3.2.5-vs2.3.2.6/fs/proc seq_printf(m, "%lu.%02lu %lu.%02lu\n", (unsigned long) uptime.tv_sec, (uptime.tv_nsec / (NSEC_PER_SEC / 100)), -diff -NurpP --minimal linux-3.2.5/fs/quota/dquot.c linux-3.2.5-vs2.3.2.6/fs/quota/dquot.c ---- linux-3.2.5/fs/quota/dquot.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/quota/dquot.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/quota/dquot.c linux-3.2.6-vs2.3.2.7/fs/quota/dquot.c +--- linux-3.2.6/fs/quota/dquot.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/quota/dquot.c 2011-12-05 19:33:02.000000000 +0100 @@ -1548,6 +1548,9 @@ int __dquot_alloc_space(struct inode *in int reserve = flags & DQUOT_SPACE_RESERVE; int nofail = flags & DQUOT_SPACE_NOFAIL; @@ -6733,9 +6745,9 @@ diff -NurpP --minimal linux-3.2.5/fs/quota/dquot.c linux-3.2.5-vs2.3.2.6/fs/quot /* First test before acquiring mutex - solves deadlocks when we * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) -diff -NurpP --minimal linux-3.2.5/fs/quota/quota.c linux-3.2.5-vs2.3.2.6/fs/quota/quota.c ---- linux-3.2.5/fs/quota/quota.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/quota/quota.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/quota/quota.c linux-3.2.6-vs2.3.2.7/fs/quota/quota.c +--- linux-3.2.6/fs/quota/quota.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/quota/quota.c 2011-12-05 19:33:02.000000000 +0100 @@ -8,6 +8,7 @@ #include #include @@ -6823,9 +6835,9 @@ diff -NurpP --minimal linux-3.2.5/fs/quota/quota.c linux-3.2.5-vs2.3.2.6/fs/quot sb = get_super(bdev); bdput(bdev); if (!sb) -diff -NurpP --minimal linux-3.2.5/fs/reiserfs/file.c linux-3.2.5-vs2.3.2.6/fs/reiserfs/file.c ---- linux-3.2.5/fs/reiserfs/file.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/reiserfs/file.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/reiserfs/file.c linux-3.2.6-vs2.3.2.7/fs/reiserfs/file.c +--- linux-3.2.6/fs/reiserfs/file.c 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/reiserfs/file.c 2011-12-05 19:33:02.000000000 +0100 @@ -319,5 +319,6 @@ const struct inode_operations reiserfs_f .listxattr = reiserfs_listxattr, .removexattr = reiserfs_removexattr, @@ -6833,9 +6845,9 @@ diff -NurpP --minimal linux-3.2.5/fs/reiserfs/file.c linux-3.2.5-vs2.3.2.6/fs/re + .sync_flags = reiserfs_sync_flags, .get_acl = reiserfs_get_acl, }; -diff -NurpP --minimal linux-3.2.5/fs/reiserfs/inode.c linux-3.2.5-vs2.3.2.6/fs/reiserfs/inode.c ---- linux-3.2.5/fs/reiserfs/inode.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/reiserfs/inode.c 2011-12-05 21:18:16.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/reiserfs/inode.c linux-3.2.6-vs2.3.2.7/fs/reiserfs/inode.c +--- linux-3.2.6/fs/reiserfs/inode.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/reiserfs/inode.c 2011-12-05 21:18:16.000000000 +0100 @@ -18,6 +18,7 @@ #include #include @@ -7001,9 +7013,9 @@ diff -NurpP --minimal linux-3.2.5/fs/reiserfs/inode.c linux-3.2.5-vs2.3.2.6/fs/r mark_inode_dirty(inode); error = journal_end(&th, inode->i_sb, jbegin_count); if (error) -diff -NurpP --minimal linux-3.2.5/fs/reiserfs/ioctl.c linux-3.2.5-vs2.3.2.6/fs/reiserfs/ioctl.c ---- linux-3.2.5/fs/reiserfs/ioctl.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/reiserfs/ioctl.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/reiserfs/ioctl.c linux-3.2.6-vs2.3.2.7/fs/reiserfs/ioctl.c +--- linux-3.2.6/fs/reiserfs/ioctl.c 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/reiserfs/ioctl.c 2011-12-05 19:33:02.000000000 +0100 @@ -11,6 +11,21 @@ #include #include @@ -7065,9 +7077,9 @@ diff -NurpP --minimal linux-3.2.5/fs/reiserfs/ioctl.c linux-3.2.5-vs2.3.2.6/fs/r sd_attrs_to_i_attrs(flags, inode); REISERFS_I(inode)->i_attrs = flags; inode->i_ctime = CURRENT_TIME_SEC; -diff -NurpP --minimal linux-3.2.5/fs/reiserfs/namei.c linux-3.2.5-vs2.3.2.6/fs/reiserfs/namei.c ---- linux-3.2.5/fs/reiserfs/namei.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/reiserfs/namei.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/reiserfs/namei.c linux-3.2.6-vs2.3.2.7/fs/reiserfs/namei.c +--- linux-3.2.6/fs/reiserfs/namei.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/reiserfs/namei.c 2011-12-05 19:33:02.000000000 +0100 @@ -18,6 +18,7 @@ #include #include @@ -7084,9 +7096,9 @@ diff -NurpP --minimal linux-3.2.5/fs/reiserfs/namei.c linux-3.2.5-vs2.3.2.6/fs/r return d_splice_alias(inode, dentry); } -diff -NurpP --minimal linux-3.2.5/fs/reiserfs/super.c linux-3.2.5-vs2.3.2.6/fs/reiserfs/super.c ---- linux-3.2.5/fs/reiserfs/super.c 2012-02-07 01:57:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/reiserfs/super.c 2012-01-18 02:58:07.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/reiserfs/super.c linux-3.2.6-vs2.3.2.7/fs/reiserfs/super.c +--- linux-3.2.6/fs/reiserfs/super.c 2012-02-15 00:58:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/reiserfs/super.c 2012-01-18 02:58:07.000000000 +0100 @@ -903,6 +903,14 @@ static int reiserfs_parse_options(struct {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT}, {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT}, @@ -7128,9 +7140,9 @@ diff -NurpP --minimal linux-3.2.5/fs/reiserfs/super.c linux-3.2.5-vs2.3.2.6/fs/r 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-3.2.5/fs/reiserfs/xattr.c linux-3.2.5-vs2.3.2.6/fs/reiserfs/xattr.c ---- linux-3.2.5/fs/reiserfs/xattr.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/reiserfs/xattr.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/reiserfs/xattr.c linux-3.2.6-vs2.3.2.7/fs/reiserfs/xattr.c +--- linux-3.2.6/fs/reiserfs/xattr.c 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/reiserfs/xattr.c 2011-12-05 19:33:02.000000000 +0100 @@ -40,6 +40,7 @@ #include #include @@ -7139,9 +7151,9 @@ diff -NurpP --minimal linux-3.2.5/fs/reiserfs/xattr.c linux-3.2.5-vs2.3.2.6/fs/r #include #include #include -diff -NurpP --minimal linux-3.2.5/fs/stat.c linux-3.2.5-vs2.3.2.6/fs/stat.c ---- linux-3.2.5/fs/stat.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/stat.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/stat.c linux-3.2.6-vs2.3.2.7/fs/stat.c +--- linux-3.2.6/fs/stat.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/stat.c 2011-12-05 19:33:02.000000000 +0100 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -7150,9 +7162,9 @@ diff -NurpP --minimal linux-3.2.5/fs/stat.c linux-3.2.5-vs2.3.2.6/fs/stat.c stat->rdev = inode->i_rdev; stat->size = i_size_read(inode); stat->atime = inode->i_atime; -diff -NurpP --minimal linux-3.2.5/fs/statfs.c linux-3.2.5-vs2.3.2.6/fs/statfs.c ---- linux-3.2.5/fs/statfs.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/statfs.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/statfs.c linux-3.2.6-vs2.3.2.7/fs/statfs.c +--- linux-3.2.6/fs/statfs.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/statfs.c 2011-12-05 19:33:02.000000000 +0100 @@ -7,6 +7,8 @@ #include #include @@ -7171,9 +7183,9 @@ diff -NurpP --minimal linux-3.2.5/fs/statfs.c linux-3.2.5-vs2.3.2.6/fs/statfs.c return retval; } -diff -NurpP --minimal linux-3.2.5/fs/super.c linux-3.2.5-vs2.3.2.6/fs/super.c ---- linux-3.2.5/fs/super.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/super.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/super.c linux-3.2.6-vs2.3.2.7/fs/super.c +--- linux-3.2.6/fs/super.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/super.c 2011-12-05 19:33:02.000000000 +0100 @@ -32,6 +32,9 @@ #include #include @@ -7198,9 +7210,9 @@ diff -NurpP --minimal linux-3.2.5/fs/super.c linux-3.2.5-vs2.3.2.6/fs/super.c error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-3.2.5/fs/sysfs/mount.c linux-3.2.5-vs2.3.2.6/fs/sysfs/mount.c ---- linux-3.2.5/fs/sysfs/mount.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/sysfs/mount.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/sysfs/mount.c linux-3.2.6-vs2.3.2.7/fs/sysfs/mount.c +--- linux-3.2.6/fs/sysfs/mount.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/sysfs/mount.c 2011-12-05 19:33:02.000000000 +0100 @@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super sb->s_blocksize = PAGE_CACHE_SIZE; @@ -7210,9 +7222,9 @@ diff -NurpP --minimal linux-3.2.5/fs/sysfs/mount.c linux-3.2.5-vs2.3.2.6/fs/sysf sb->s_op = &sysfs_ops; sb->s_time_gran = 1; -diff -NurpP --minimal linux-3.2.5/fs/utimes.c linux-3.2.5-vs2.3.2.6/fs/utimes.c ---- linux-3.2.5/fs/utimes.c 2011-05-22 16:17:54.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/utimes.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/utimes.c linux-3.2.6-vs2.3.2.7/fs/utimes.c +--- linux-3.2.6/fs/utimes.c 2011-05-22 16:17:54.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/utimes.c 2011-12-05 19:33:02.000000000 +0100 @@ -8,6 +8,8 @@ #include #include @@ -7242,9 +7254,9 @@ diff -NurpP --minimal linux-3.2.5/fs/utimes.c linux-3.2.5-vs2.3.2.6/fs/utimes.c if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-3.2.5/fs/xattr.c linux-3.2.5-vs2.3.2.6/fs/xattr.c ---- linux-3.2.5/fs/xattr.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/xattr.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xattr.c linux-3.2.6-vs2.3.2.7/fs/xattr.c +--- linux-3.2.6/fs/xattr.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/xattr.c 2011-12-05 19:33:02.000000000 +0100 @@ -19,6 +19,7 @@ #include #include @@ -7262,9 +7274,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xattr.c linux-3.2.5-vs2.3.2.6/fs/xattr.c return (mask & MAY_WRITE) ? -EPERM : -ENODATA; return 0; } -diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_dinode.h linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_dinode.h ---- linux-3.2.5/fs/xfs/xfs_dinode.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_dinode.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xfs/xfs_dinode.h linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_dinode.h +--- linux-3.2.6/fs/xfs/xfs_dinode.h 2011-10-24 18:45:31.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_dinode.h 2011-12-05 19:33:02.000000000 +0100 @@ -51,7 +51,9 @@ typedef struct xfs_dinode { __be32 di_nlink; /* number of links to file */ __be16 di_projid_lo; /* lower part of owner's project id */ @@ -7305,9 +7317,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_dinode.h linux-3.2.5-vs2.3.2.6/fs/x +#define XFS_DIVFLAG_COW 0x02 #endif /* __XFS_DINODE_H__ */ -diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_fs.h linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_fs.h ---- linux-3.2.5/fs/xfs/xfs_fs.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_fs.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xfs/xfs_fs.h linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_fs.h +--- linux-3.2.6/fs/xfs/xfs_fs.h 2011-10-24 18:45:31.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_fs.h 2011-12-05 19:33:02.000000000 +0100 @@ -67,6 +67,9 @@ struct fsxattr { #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */ #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */ @@ -7328,9 +7340,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_fs.h linux-3.2.5-vs2.3.2.6/fs/xfs/x __u32 bs_dmevmask; /* DMIG event mask */ __u16 bs_dmstate; /* DMIG state info */ __u16 bs_aextents; /* attribute number of extents */ -diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_ialloc.c linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_ialloc.c ---- linux-3.2.5/fs/xfs/xfs_ialloc.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_ialloc.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xfs/xfs_ialloc.c linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_ialloc.c +--- linux-3.2.6/fs/xfs/xfs_ialloc.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_ialloc.c 2011-12-05 19:33:02.000000000 +0100 @@ -37,7 +37,6 @@ #include "xfs_error.h" #include "xfs_bmap.h" @@ -7339,9 +7351,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_ialloc.c linux-3.2.5-vs2.3.2.6/fs/x /* * Allocation group level functions. */ -diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_inode.c linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_inode.c ---- linux-3.2.5/fs/xfs/xfs_inode.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_inode.c 2011-12-15 01:11:32.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xfs/xfs_inode.c linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_inode.c +--- linux-3.2.6/fs/xfs/xfs_inode.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_inode.c 2011-12-15 01:11:32.000000000 +0100 @@ -236,6 +236,7 @@ xfs_inotobp( return 0; } @@ -7516,9 +7528,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_inode.c linux-3.2.5-vs2.3.2.6/fs/xf /* Wrap, we never let the log put out DI_MAX_FLUSH */ if (ip->i_d.di_flushiter == DI_MAX_FLUSH) -diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_inode.h linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_inode.h ---- linux-3.2.5/fs/xfs/xfs_inode.h 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_inode.h 2011-12-15 01:11:32.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xfs/xfs_inode.h linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_inode.h +--- linux-3.2.6/fs/xfs/xfs_inode.h 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_inode.h 2011-12-15 01:11:32.000000000 +0100 @@ -135,7 +135,9 @@ typedef struct xfs_icdinode { __uint32_t di_nlink; /* number of links to file */ __uint16_t di_projid_lo; /* lower part of owner's project id */ @@ -7539,9 +7551,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_inode.h linux-3.2.5-vs2.3.2.6/fs/xf 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-3.2.5/fs/xfs/xfs_ioctl.c linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_ioctl.c ---- linux-3.2.5/fs/xfs/xfs_ioctl.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_ioctl.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xfs/xfs_ioctl.c linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_ioctl.c +--- linux-3.2.6/fs/xfs/xfs_ioctl.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_ioctl.c 2011-12-05 19:33:02.000000000 +0100 @@ -28,7 +28,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -7610,9 +7622,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_ioctl.c linux-3.2.5-vs2.3.2.6/fs/xf return xfs_ioc_setxflags(ip, filp, arg); case XFS_IOC_FSSETDM: { -diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_ioctl.h linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_ioctl.h ---- linux-3.2.5/fs/xfs/xfs_ioctl.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_ioctl.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xfs/xfs_ioctl.h linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_ioctl.h +--- linux-3.2.6/fs/xfs/xfs_ioctl.h 2011-10-24 18:45:31.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_ioctl.h 2011-12-05 19:33:02.000000000 +0100 @@ -70,6 +70,12 @@ xfs_handle_to_dentry( void __user *uhandle, u32 hlen); @@ -7626,9 +7638,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_ioctl.h linux-3.2.5-vs2.3.2.6/fs/xf extern long xfs_file_ioctl( struct file *filp, -diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_iops.c linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_iops.c ---- linux-3.2.5/fs/xfs/xfs_iops.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_iops.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xfs/xfs_iops.c linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_iops.c +--- linux-3.2.6/fs/xfs/xfs_iops.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_iops.c 2011-12-05 19:33:02.000000000 +0100 @@ -30,6 +30,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -7704,9 +7716,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_iops.c linux-3.2.5-vs2.3.2.6/fs/xfs switch (inode->i_mode & S_IFMT) { case S_IFBLK: -diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_itable.c linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_itable.c ---- linux-3.2.5/fs/xfs/xfs_itable.c 2011-05-22 16:17:54.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_itable.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xfs/xfs_itable.c linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_itable.c +--- linux-3.2.6/fs/xfs/xfs_itable.c 2011-05-22 16:17:54.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_itable.c 2011-12-05 19:33:02.000000000 +0100 @@ -98,6 +98,7 @@ xfs_bulkstat_one_int( buf->bs_mode = dic->di_mode; buf->bs_uid = dic->di_uid; @@ -7715,9 +7727,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_itable.c linux-3.2.5-vs2.3.2.6/fs/x buf->bs_size = dic->di_size; /* -diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_linux.h linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_linux.h ---- linux-3.2.5/fs/xfs/xfs_linux.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_linux.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xfs/xfs_linux.h linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_linux.h +--- linux-3.2.6/fs/xfs/xfs_linux.h 2011-10-24 18:45:31.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_linux.h 2011-12-05 19:33:02.000000000 +0100 @@ -121,6 +121,7 @@ #define current_cpu() (raw_smp_processor_id()) @@ -7726,9 +7738,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_linux.h linux-3.2.5-vs2.3.2.6/fs/xf #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-3.2.5/fs/xfs/xfs_log_recover.c linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_log_recover.c ---- linux-3.2.5/fs/xfs/xfs_log_recover.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_log_recover.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xfs/xfs_log_recover.c linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_log_recover.c +--- linux-3.2.6/fs/xfs/xfs_log_recover.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_log_recover.c 2011-12-05 19:33:02.000000000 +0100 @@ -2344,7 +2344,8 @@ xlog_recover_inode_pass2( } @@ -7739,9 +7751,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_log_recover.c linux-3.2.5-vs2.3.2.6 /* the rest is in on-disk format */ if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) { -diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_mount.h linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_mount.h ---- linux-3.2.5/fs/xfs/xfs_mount.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_mount.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xfs/xfs_mount.h linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_mount.h +--- linux-3.2.6/fs/xfs/xfs_mount.h 2011-10-24 18:45:31.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_mount.h 2011-12-05 19:33:02.000000000 +0100 @@ -249,6 +249,7 @@ typedef struct xfs_mount { allocator */ #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */ @@ -7750,9 +7762,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_mount.h linux-3.2.5-vs2.3.2.6/fs/xf /* * Default minimum read and write sizes. -diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_super.c linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_super.c ---- linux-3.2.5/fs/xfs/xfs_super.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_super.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xfs/xfs_super.c linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_super.c +--- linux-3.2.6/fs/xfs/xfs_super.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_super.c 2012-01-09 16:19:31.000000000 +0100 @@ -113,6 +113,9 @@ mempool_t *xfs_ioend_pool; #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */ #define MNTOPT_DISCARD "discard" /* Discard unused blocks */ @@ -7825,9 +7837,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_super.c linux-3.2.5-vs2.3.2.6/fs/xf /* * we must configure the block size in the superblock before we run the * full mount process as the mount process can lookup and cache inodes. -diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_vnodeops.c linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_vnodeops.c ---- linux-3.2.5/fs/xfs/xfs_vnodeops.c 2012-02-07 01:57:54.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/fs/xfs/xfs_vnodeops.c 2012-02-07 03:14:01.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/fs/xfs/xfs_vnodeops.c linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_vnodeops.c +--- linux-3.2.6/fs/xfs/xfs_vnodeops.c 2012-02-15 00:58:53.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/fs/xfs/xfs_vnodeops.c 2012-02-07 03:14:01.000000000 +0100 @@ -106,6 +106,77 @@ xfs_readlink_bmap( return error; } @@ -7906,9 +7918,9 @@ diff -NurpP --minimal linux-3.2.5/fs/xfs/xfs_vnodeops.c linux-3.2.5-vs2.3.2.6/fs int xfs_readlink( xfs_inode_t *ip, -diff -NurpP --minimal linux-3.2.5/include/linux/Kbuild linux-3.2.5-vs2.3.2.6/include/linux/Kbuild ---- linux-3.2.5/include/linux/Kbuild 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/Kbuild 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/Kbuild linux-3.2.6-vs2.3.2.7/include/linux/Kbuild +--- linux-3.2.6/include/linux/Kbuild 2011-10-24 18:45:31.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/Kbuild 2011-12-05 19:33:02.000000000 +0100 @@ -17,6 +17,7 @@ header-y += netfilter_bridge/ header-y += netfilter_ipv4/ header-y += netfilter_ipv6/ @@ -7917,9 +7929,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/Kbuild linux-3.2.5-vs2.3.2.6/inc header-y += wimax/ objhdr-y += version.h -diff -NurpP --minimal linux-3.2.5/include/linux/capability.h linux-3.2.5-vs2.3.2.6/include/linux/capability.h ---- linux-3.2.5/include/linux/capability.h 2012-01-09 16:14:56.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/capability.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/capability.h linux-3.2.6-vs2.3.2.7/include/linux/capability.h +--- linux-3.2.6/include/linux/capability.h 2012-01-09 16:14:56.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/capability.h 2011-12-05 19:33:02.000000000 +0100 @@ -280,6 +280,7 @@ struct cpu_vfs_cap_data { arbitrary SCSI commands */ /* Allow setting encryption key on loopback filesystem */ @@ -7942,9 +7954,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/capability.h linux-3.2.5-vs2.3.2 /* * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-3.2.5/include/linux/cred.h linux-3.2.5-vs2.3.2.6/include/linux/cred.h ---- linux-3.2.5/include/linux/cred.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/cred.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/cred.h linux-3.2.6-vs2.3.2.7/include/linux/cred.h +--- linux-3.2.6/include/linux/cred.h 2011-10-24 18:45:31.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/cred.h 2011-12-05 19:33:02.000000000 +0100 @@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc extern int copy_creds(struct task_struct *, unsigned long); extern const struct cred *get_task_cred(struct task_struct *); @@ -7985,18 +7997,18 @@ diff -NurpP --minimal linux-3.2.5/include/linux/cred.h linux-3.2.5-vs2.3.2.6/inc /** * get_new_cred - Get a reference on a new set of credentials * @cred: The new credentials to reference -diff -NurpP --minimal linux-3.2.5/include/linux/devpts_fs.h linux-3.2.5-vs2.3.2.6/include/linux/devpts_fs.h ---- linux-3.2.5/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/devpts_fs.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/devpts_fs.h linux-3.2.6-vs2.3.2.7/include/linux/devpts_fs.h +--- linux-3.2.6/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/devpts_fs.h 2011-12-05 19:33:02.000000000 +0100 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc #endif - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/ext2_fs.h linux-3.2.5-vs2.3.2.6/include/linux/ext2_fs.h ---- linux-3.2.5/include/linux/ext2_fs.h 2012-01-09 16:14:56.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/ext2_fs.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/ext2_fs.h linux-3.2.6-vs2.3.2.7/include/linux/ext2_fs.h +--- linux-3.2.6/include/linux/ext2_fs.h 2012-01-09 16:14:56.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/ext2_fs.h 2011-12-05 19:33:02.000000000 +0100 @@ -190,8 +190,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) */ @@ -8036,9 +8048,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/ext2_fs.h linux-3.2.5-vs2.3.2.6/ #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt -diff -NurpP --minimal linux-3.2.5/include/linux/ext3_fs.h linux-3.2.5-vs2.3.2.6/include/linux/ext3_fs.h ---- linux-3.2.5/include/linux/ext3_fs.h 2012-01-09 16:14:56.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/ext3_fs.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/ext3_fs.h linux-3.2.6-vs2.3.2.7/include/linux/ext3_fs.h +--- linux-3.2.6/include/linux/ext3_fs.h 2012-01-09 16:14:56.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/ext3_fs.h 2011-12-05 19:33:02.000000000 +0100 @@ -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) */ @@ -8090,9 +8102,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/ext3_fs.h linux-3.2.5-vs2.3.2.6/ /* ioctl.c */ extern long ext3_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.2.5/include/linux/fs.h linux-3.2.5-vs2.3.2.6/include/linux/fs.h ---- linux-3.2.5/include/linux/fs.h 2012-01-09 16:14:57.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/fs.h 2011-12-15 01:11:32.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/fs.h linux-3.2.6-vs2.3.2.7/include/linux/fs.h +--- linux-3.2.6/include/linux/fs.h 2012-01-09 16:14:57.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/fs.h 2011-12-15 01:11:32.000000000 +0100 @@ -210,6 +210,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 */ @@ -8270,9 +8282,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/fs.h linux-3.2.5-vs2.3.2.6/inclu 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-3.2.5/include/linux/gfs2_ondisk.h linux-3.2.5-vs2.3.2.6/include/linux/gfs2_ondisk.h ---- linux-3.2.5/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/gfs2_ondisk.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/gfs2_ondisk.h linux-3.2.6-vs2.3.2.7/include/linux/gfs2_ondisk.h +--- linux-3.2.6/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/gfs2_ondisk.h 2011-12-05 19:33:02.000000000 +0100 @@ -211,6 +211,9 @@ enum { gfs2fl_NoAtime = 7, gfs2fl_Sync = 8, @@ -8293,9 +8305,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/gfs2_ondisk.h linux-3.2.5-vs2.3. #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-3.2.5/include/linux/if_tun.h linux-3.2.5-vs2.3.2.6/include/linux/if_tun.h ---- linux-3.2.5/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/if_tun.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/if_tun.h linux-3.2.6-vs2.3.2.7/include/linux/if_tun.h +--- linux-3.2.6/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/if_tun.h 2011-12-05 19:33:02.000000000 +0100 @@ -53,6 +53,7 @@ #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog) #define TUNGETVNETHDRSZ _IOR('T', 215, int) @@ -8304,9 +8316,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/if_tun.h linux-3.2.5-vs2.3.2.6/i /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-3.2.5/include/linux/init_task.h linux-3.2.5-vs2.3.2.6/include/linux/init_task.h ---- linux-3.2.5/include/linux/init_task.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/init_task.h 2011-12-15 01:11:32.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/init_task.h linux-3.2.6-vs2.3.2.7/include/linux/init_task.h +--- linux-3.2.6/include/linux/init_task.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/init_task.h 2011-12-15 01:11:32.000000000 +0100 @@ -193,6 +193,10 @@ extern struct cred init_cred; INIT_FTRACE_GRAPH \ INIT_TRACE_RECURSION \ @@ -8318,9 +8330,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/init_task.h linux-3.2.5-vs2.3.2. } -diff -NurpP --minimal linux-3.2.5/include/linux/ipc.h linux-3.2.5-vs2.3.2.6/include/linux/ipc.h ---- linux-3.2.5/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/ipc.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/ipc.h linux-3.2.6-vs2.3.2.7/include/linux/ipc.h +--- linux-3.2.6/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/ipc.h 2011-12-05 19:33:02.000000000 +0100 @@ -91,6 +91,7 @@ struct kern_ipc_perm key_t key; uid_t uid; @@ -8329,9 +8341,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/ipc.h linux-3.2.5-vs2.3.2.6/incl uid_t cuid; gid_t cgid; mode_t mode; -diff -NurpP --minimal linux-3.2.5/include/linux/ipc_namespace.h linux-3.2.5-vs2.3.2.6/include/linux/ipc_namespace.h ---- linux-3.2.5/include/linux/ipc_namespace.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/ipc_namespace.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/ipc_namespace.h linux-3.2.6-vs2.3.2.7/include/linux/ipc_namespace.h +--- linux-3.2.6/include/linux/ipc_namespace.h 2011-10-24 18:45:32.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/ipc_namespace.h 2011-12-05 19:33:02.000000000 +0100 @@ -101,7 +101,8 @@ static inline int mq_init_ns(struct ipc_ #if defined(CONFIG_IPC_NS) @@ -8358,9 +8370,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/ipc_namespace.h linux-3.2.5-vs2. } static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) -diff -NurpP --minimal linux-3.2.5/include/linux/loop.h linux-3.2.5-vs2.3.2.6/include/linux/loop.h ---- linux-3.2.5/include/linux/loop.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/loop.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/loop.h linux-3.2.6-vs2.3.2.7/include/linux/loop.h +--- linux-3.2.6/include/linux/loop.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/loop.h 2011-12-05 19:33:02.000000000 +0100 @@ -45,6 +45,7 @@ struct loop_device { struct loop_func_table *lo_encryption; __u32 lo_init[2]; @@ -8369,9 +8381,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/loop.h linux-3.2.5-vs2.3.2.6/inc int (*ioctl)(struct loop_device *, int cmd, unsigned long arg); -diff -NurpP --minimal linux-3.2.5/include/linux/magic.h linux-3.2.5-vs2.3.2.6/include/linux/magic.h ---- linux-3.2.5/include/linux/magic.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/magic.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/magic.h linux-3.2.6-vs2.3.2.7/include/linux/magic.h +--- linux-3.2.6/include/linux/magic.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/magic.h 2011-12-05 19:33:02.000000000 +0100 @@ -3,7 +3,7 @@ #define ADFS_SUPER_MAGIC 0xadf5 @@ -8389,9 +8401,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/magic.h linux-3.2.5-vs2.3.2.6/in #define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */ #define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */ -diff -NurpP --minimal linux-3.2.5/include/linux/major.h linux-3.2.5-vs2.3.2.6/include/linux/major.h ---- linux-3.2.5/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/major.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/major.h linux-3.2.6-vs2.3.2.7/include/linux/major.h +--- linux-3.2.6/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/major.h 2011-12-05 19:33:02.000000000 +0100 @@ -15,6 +15,7 @@ #define HD_MAJOR IDE0_MAJOR #define PTY_SLAVE_MAJOR 3 @@ -8400,9 +8412,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/major.h linux-3.2.5-vs2.3.2.6/in #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-3.2.5/include/linux/memcontrol.h linux-3.2.5-vs2.3.2.6/include/linux/memcontrol.h ---- linux-3.2.5/include/linux/memcontrol.h 2012-02-07 01:57:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/memcontrol.h 2012-01-26 08:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/memcontrol.h linux-3.2.6-vs2.3.2.7/include/linux/memcontrol.h +--- linux-3.2.6/include/linux/memcontrol.h 2012-02-15 00:58:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/memcontrol.h 2012-01-26 08:52:10.000000000 +0100 @@ -85,6 +85,13 @@ extern struct mem_cgroup *try_get_mem_cg extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p); extern struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm); @@ -8417,9 +8429,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/memcontrol.h linux-3.2.5-vs2.3.2 static inline int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup) { -diff -NurpP --minimal linux-3.2.5/include/linux/mm_types.h linux-3.2.5-vs2.3.2.6/include/linux/mm_types.h ---- linux-3.2.5/include/linux/mm_types.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/mm_types.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/mm_types.h linux-3.2.6-vs2.3.2.7/include/linux/mm_types.h +--- linux-3.2.6/include/linux/mm_types.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/mm_types.h 2011-12-05 19:33:02.000000000 +0100 @@ -344,6 +344,7 @@ struct mm_struct { /* Architecture-specific MM context */ @@ -8428,9 +8440,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/mm_types.h linux-3.2.5-vs2.3.2.6 /* Swap token stuff */ /* -diff -NurpP --minimal linux-3.2.5/include/linux/mmzone.h linux-3.2.5-vs2.3.2.6/include/linux/mmzone.h ---- linux-3.2.5/include/linux/mmzone.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/mmzone.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/mmzone.h linux-3.2.6-vs2.3.2.7/include/linux/mmzone.h +--- linux-3.2.6/include/linux/mmzone.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/mmzone.h 2011-12-05 19:33:02.000000000 +0100 @@ -673,6 +673,13 @@ typedef struct pglist_data { __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\ }) @@ -8445,9 +8457,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/mmzone.h linux-3.2.5-vs2.3.2.6/i #include extern struct mutex zonelists_mutex; -diff -NurpP --minimal linux-3.2.5/include/linux/mount.h linux-3.2.5-vs2.3.2.6/include/linux/mount.h ---- linux-3.2.5/include/linux/mount.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/mount.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/mount.h linux-3.2.6-vs2.3.2.7/include/linux/mount.h +--- linux-3.2.6/include/linux/mount.h 2011-10-24 18:45:32.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/mount.h 2011-12-05 19:33:02.000000000 +0100 @@ -52,6 +52,9 @@ struct mnt_pcp { int mnt_writers; }; @@ -8466,9 +8478,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/mount.h linux-3.2.5-vs2.3.2.6/in }; struct file; /* forward dec */ -diff -NurpP --minimal linux-3.2.5/include/linux/net.h linux-3.2.5-vs2.3.2.6/include/linux/net.h ---- linux-3.2.5/include/linux/net.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/net.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/net.h linux-3.2.6-vs2.3.2.7/include/linux/net.h +--- linux-3.2.6/include/linux/net.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/net.h 2011-12-05 19:33:02.000000000 +0100 @@ -72,6 +72,7 @@ struct net; #define SOCK_NOSPACE 2 #define SOCK_PASSCRED 3 @@ -8477,9 +8489,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/net.h linux-3.2.5-vs2.3.2.6/incl #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-3.2.5/include/linux/netdevice.h linux-3.2.5-vs2.3.2.6/include/linux/netdevice.h ---- linux-3.2.5/include/linux/netdevice.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/netdevice.h 2011-12-15 01:11:33.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/netdevice.h linux-3.2.6-vs2.3.2.7/include/linux/netdevice.h +--- linux-3.2.6/include/linux/netdevice.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/netdevice.h 2011-12-15 01:11:33.000000000 +0100 @@ -1646,6 +1646,7 @@ extern void netdev_resync_ops(struct ne extern struct net_device *dev_get_by_index(struct net *net, int ifindex); @@ -8488,9 +8500,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/netdevice.h linux-3.2.5-vs2.3.2. extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); extern int dev_restart(struct net_device *dev); #ifdef CONFIG_NETPOLL_TRAP -diff -NurpP --minimal linux-3.2.5/include/linux/nfs_mount.h linux-3.2.5-vs2.3.2.6/include/linux/nfs_mount.h ---- linux-3.2.5/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/nfs_mount.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/nfs_mount.h linux-3.2.6-vs2.3.2.7/include/linux/nfs_mount.h +--- linux-3.2.6/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/nfs_mount.h 2011-12-05 19:33:02.000000000 +0100 @@ -63,7 +63,8 @@ struct nfs_mount_data { #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ @@ -8501,9 +8513,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/nfs_mount.h linux-3.2.5-vs2.3.2. /* The following are for internal use only */ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-3.2.5/include/linux/nsproxy.h linux-3.2.5-vs2.3.2.6/include/linux/nsproxy.h ---- linux-3.2.5/include/linux/nsproxy.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/nsproxy.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/nsproxy.h linux-3.2.6-vs2.3.2.7/include/linux/nsproxy.h +--- linux-3.2.6/include/linux/nsproxy.h 2011-10-24 18:45:32.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/nsproxy.h 2011-12-05 19:33:02.000000000 +0100 @@ -3,6 +3,7 @@ #include @@ -8553,9 +8565,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/nsproxy.h linux-3.2.5-vs2.3.2.6/ } #endif -diff -NurpP --minimal linux-3.2.5/include/linux/pid.h linux-3.2.5-vs2.3.2.6/include/linux/pid.h ---- linux-3.2.5/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/pid.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/pid.h linux-3.2.6-vs2.3.2.7/include/linux/pid.h +--- linux-3.2.6/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/pid.h 2011-12-05 19:33:02.000000000 +0100 @@ -8,7 +8,8 @@ enum pid_type PIDTYPE_PID, PIDTYPE_PGID, @@ -8574,9 +8586,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/pid.h linux-3.2.5-vs2.3.2.6/incl pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-3.2.5/include/linux/proc_fs.h linux-3.2.5-vs2.3.2.6/include/linux/proc_fs.h ---- linux-3.2.5/include/linux/proc_fs.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/proc_fs.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/proc_fs.h linux-3.2.6-vs2.3.2.7/include/linux/proc_fs.h +--- linux-3.2.6/include/linux/proc_fs.h 2011-10-24 18:45:32.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/proc_fs.h 2011-12-05 19:33:02.000000000 +0100 @@ -54,6 +54,7 @@ struct proc_dir_entry { nlink_t nlink; uid_t uid; @@ -8612,9 +8624,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/proc_fs.h linux-3.2.5-vs2.3.2.6/ int fd; union proc_op op; struct proc_dir_entry *pde; -diff -NurpP --minimal linux-3.2.5/include/linux/quotaops.h linux-3.2.5-vs2.3.2.6/include/linux/quotaops.h ---- linux-3.2.5/include/linux/quotaops.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/quotaops.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/quotaops.h linux-3.2.6-vs2.3.2.7/include/linux/quotaops.h +--- linux-3.2.6/include/linux/quotaops.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/quotaops.h 2011-12-05 19:33:02.000000000 +0100 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -8656,9 +8668,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/quotaops.h linux-3.2.5-vs2.3.2.6 } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-3.2.5/include/linux/reboot.h linux-3.2.5-vs2.3.2.6/include/linux/reboot.h ---- linux-3.2.5/include/linux/reboot.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/reboot.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/reboot.h linux-3.2.6-vs2.3.2.7/include/linux/reboot.h +--- linux-3.2.6/include/linux/reboot.h 2011-10-24 18:45:32.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/reboot.h 2011-12-05 19:33:02.000000000 +0100 @@ -33,6 +33,7 @@ #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 @@ -8667,9 +8679,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/reboot.h linux-3.2.5-vs2.3.2.6/i #ifdef __KERNEL__ -diff -NurpP --minimal linux-3.2.5/include/linux/reiserfs_fs.h linux-3.2.5-vs2.3.2.6/include/linux/reiserfs_fs.h ---- linux-3.2.5/include/linux/reiserfs_fs.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/reiserfs_fs.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/reiserfs_fs.h linux-3.2.6-vs2.3.2.7/include/linux/reiserfs_fs.h +--- linux-3.2.6/include/linux/reiserfs_fs.h 2011-10-24 18:45:32.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/reiserfs_fs.h 2011-12-05 19:33:02.000000000 +0100 @@ -976,6 +976,11 @@ struct stat_data_v1 { #define REISERFS_COMPR_FL FS_COMPR_FL #define REISERFS_NOTAIL_FL FS_NOTAIL_FL @@ -8700,9 +8712,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/reiserfs_fs.h linux-3.2.5-vs2.3. int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len); -diff -NurpP --minimal linux-3.2.5/include/linux/reiserfs_fs_sb.h linux-3.2.5-vs2.3.2.6/include/linux/reiserfs_fs_sb.h ---- linux-3.2.5/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/reiserfs_fs_sb.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/reiserfs_fs_sb.h linux-3.2.6-vs2.3.2.7/include/linux/reiserfs_fs_sb.h +--- linux-3.2.6/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/reiserfs_fs_sb.h 2011-12-05 19:33:02.000000000 +0100 @@ -476,6 +476,7 @@ enum reiserfs_mount_options { REISERFS_EXPOSE_PRIVROOT, REISERFS_BARRIER_NONE, @@ -8711,9 +8723,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/reiserfs_fs_sb.h linux-3.2.5-vs2 /* Actions on error */ REISERFS_ERROR_PANIC, -diff -NurpP --minimal linux-3.2.5/include/linux/sched.h linux-3.2.5-vs2.3.2.6/include/linux/sched.h ---- linux-3.2.5/include/linux/sched.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/sched.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/sched.h linux-3.2.6-vs2.3.2.7/include/linux/sched.h +--- linux-3.2.6/include/linux/sched.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/sched.h 2011-12-05 19:33:02.000000000 +0100 @@ -1403,6 +1403,14 @@ struct task_struct { #endif seccomp_t seccomp; @@ -8760,9 +8772,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/sched.h linux-3.2.5-vs2.3.2.6/in } -diff -NurpP --minimal linux-3.2.5/include/linux/shmem_fs.h linux-3.2.5-vs2.3.2.6/include/linux/shmem_fs.h ---- linux-3.2.5/include/linux/shmem_fs.h 2012-02-07 01:57:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/shmem_fs.h 2012-01-26 08:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/shmem_fs.h linux-3.2.6-vs2.3.2.7/include/linux/shmem_fs.h +--- linux-3.2.6/include/linux/shmem_fs.h 2012-02-15 00:58:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/shmem_fs.h 2012-01-26 08:52:10.000000000 +0100 @@ -8,6 +8,9 @@ /* inode in-kernel data */ @@ -8773,9 +8785,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/shmem_fs.h linux-3.2.5-vs2.3.2.6 struct shmem_inode_info { spinlock_t lock; unsigned long flags; -diff -NurpP --minimal linux-3.2.5/include/linux/stat.h linux-3.2.5-vs2.3.2.6/include/linux/stat.h ---- linux-3.2.5/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/stat.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/stat.h linux-3.2.6-vs2.3.2.7/include/linux/stat.h +--- linux-3.2.6/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/stat.h 2011-12-05 19:33:02.000000000 +0100 @@ -66,6 +66,7 @@ struct kstat { unsigned int nlink; uid_t uid; @@ -8784,9 +8796,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/stat.h linux-3.2.5-vs2.3.2.6/inc dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-3.2.5/include/linux/sunrpc/auth.h linux-3.2.5-vs2.3.2.6/include/linux/sunrpc/auth.h ---- linux-3.2.5/include/linux/sunrpc/auth.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/sunrpc/auth.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/sunrpc/auth.h linux-3.2.6-vs2.3.2.7/include/linux/sunrpc/auth.h +--- linux-3.2.6/include/linux/sunrpc/auth.h 2011-10-24 18:45:32.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/sunrpc/auth.h 2011-12-05 19:33:02.000000000 +0100 @@ -25,6 +25,7 @@ struct auth_cred { uid_t uid; @@ -8795,9 +8807,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/sunrpc/auth.h linux-3.2.5-vs2.3. struct group_info *group_info; unsigned char machine_cred : 1; }; -diff -NurpP --minimal linux-3.2.5/include/linux/sunrpc/clnt.h linux-3.2.5-vs2.3.2.6/include/linux/sunrpc/clnt.h ---- linux-3.2.5/include/linux/sunrpc/clnt.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/sunrpc/clnt.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/sunrpc/clnt.h linux-3.2.6-vs2.3.2.7/include/linux/sunrpc/clnt.h +--- linux-3.2.6/include/linux/sunrpc/clnt.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/sunrpc/clnt.h 2011-12-05 19:33:02.000000000 +0100 @@ -50,7 +50,8 @@ struct rpc_clnt { unsigned int cl_softrtry : 1,/* soft timeouts */ cl_discrtry : 1,/* disconnect before retry */ @@ -8808,9 +8820,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/sunrpc/clnt.h linux-3.2.5-vs2.3. struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-3.2.5/include/linux/syscalls.h linux-3.2.5-vs2.3.2.6/include/linux/syscalls.h ---- linux-3.2.5/include/linux/syscalls.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/syscalls.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/syscalls.h linux-3.2.6-vs2.3.2.7/include/linux/syscalls.h +--- linux-3.2.6/include/linux/syscalls.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/syscalls.h 2011-12-05 19:33:02.000000000 +0100 @@ -483,6 +483,8 @@ asmlinkage long sys_symlink(const char _ asmlinkage long sys_unlink(const char __user *pathname); asmlinkage long sys_rename(const char __user *oldname, @@ -8820,9 +8832,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/syscalls.h linux-3.2.5-vs2.3.2.6 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-3.2.5/include/linux/sysctl.h linux-3.2.5-vs2.3.2.6/include/linux/sysctl.h ---- linux-3.2.5/include/linux/sysctl.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/sysctl.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/sysctl.h linux-3.2.6-vs2.3.2.7/include/linux/sysctl.h +--- linux-3.2.6/include/linux/sysctl.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/sysctl.h 2011-12-05 19:33:02.000000000 +0100 @@ -60,6 +60,7 @@ enum CTL_ABI=9, /* Binary emulation */ CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ @@ -8839,9 +8851,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/sysctl.h linux-3.2.5-vs2.3.2.6/i KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-3.2.5/include/linux/sysfs.h linux-3.2.5-vs2.3.2.6/include/linux/sysfs.h ---- linux-3.2.5/include/linux/sysfs.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/sysfs.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/sysfs.h linux-3.2.6-vs2.3.2.7/include/linux/sysfs.h +--- linux-3.2.6/include/linux/sysfs.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/sysfs.h 2011-12-05 19:33:02.000000000 +0100 @@ -19,6 +19,8 @@ #include #include @@ -8851,9 +8863,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/sysfs.h linux-3.2.5-vs2.3.2.6/in struct kobject; struct module; enum kobj_ns_type; -diff -NurpP --minimal linux-3.2.5/include/linux/time.h linux-3.2.5-vs2.3.2.6/include/linux/time.h ---- linux-3.2.5/include/linux/time.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/linux/time.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/time.h linux-3.2.6-vs2.3.2.7/include/linux/time.h +--- linux-3.2.6/include/linux/time.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/linux/time.h 2011-12-05 19:33:02.000000000 +0100 @@ -256,6 +256,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; @@ -8864,9 +8876,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/time.h linux-3.2.5-vs2.3.2.6/inc #endif /* __KERNEL__ */ #define NFDBITS __NFDBITS -diff -NurpP --minimal linux-3.2.5/include/linux/types.h linux-3.2.5-vs2.3.2.6/include/linux/types.h ---- linux-3.2.5/include/linux/types.h 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/types.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/types.h linux-3.2.6-vs2.3.2.7/include/linux/types.h +--- linux-3.2.6/include/linux/types.h 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/types.h 2011-12-05 19:33:02.000000000 +0100 @@ -40,6 +40,9 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; @@ -8877,9 +8889,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/types.h linux-3.2.5-vs2.3.2.6/in typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-3.2.5/include/linux/utsname.h linux-3.2.5-vs2.3.2.6/include/linux/utsname.h ---- linux-3.2.5/include/linux/utsname.h 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/utsname.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/utsname.h linux-3.2.6-vs2.3.2.7/include/linux/utsname.h +--- linux-3.2.6/include/linux/utsname.h 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/utsname.h 2011-12-05 19:33:02.000000000 +0100 @@ -62,7 +62,8 @@ static inline void get_uts_ns(struct uts } @@ -8906,9 +8918,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/utsname.h linux-3.2.5-vs2.3.2.6/ } #endif -diff -NurpP --minimal linux-3.2.5/include/linux/vroot.h linux-3.2.5-vs2.3.2.6/include/linux/vroot.h ---- linux-3.2.5/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vroot.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vroot.h linux-3.2.6-vs2.3.2.7/include/linux/vroot.h +--- linux-3.2.6/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vroot.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,51 @@ + +/* @@ -8961,9 +8973,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vroot.h linux-3.2.5-vs2.3.2.6/in +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vs_base.h linux-3.2.5-vs2.3.2.6/include/linux/vs_base.h ---- linux-3.2.5/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_base.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_base.h linux-3.2.6-vs2.3.2.7/include/linux/vs_base.h +--- linux-3.2.6/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_base.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,10 @@ +#ifndef _VS_BASE_H +#define _VS_BASE_H @@ -8975,9 +8987,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_base.h linux-3.2.5-vs2.3.2.6/ +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vs_context.h linux-3.2.5-vs2.3.2.6/include/linux/vs_context.h ---- linux-3.2.5/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_context.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_context.h linux-3.2.6-vs2.3.2.7/include/linux/vs_context.h +--- linux-3.2.6/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_context.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,242 @@ +#ifndef _VS_CONTEXT_H +#define _VS_CONTEXT_H @@ -9221,9 +9233,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_context.h linux-3.2.5-vs2.3.2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vs_cowbl.h linux-3.2.5-vs2.3.2.6/include/linux/vs_cowbl.h ---- linux-3.2.5/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_cowbl.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_cowbl.h linux-3.2.6-vs2.3.2.7/include/linux/vs_cowbl.h +--- linux-3.2.6/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_cowbl.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,48 @@ +#ifndef _VS_COWBL_H +#define _VS_COWBL_H @@ -9273,9 +9285,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_cowbl.h linux-3.2.5-vs2.3.2.6 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vs_cvirt.h linux-3.2.5-vs2.3.2.6/include/linux/vs_cvirt.h ---- linux-3.2.5/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_cvirt.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_cvirt.h linux-3.2.6-vs2.3.2.7/include/linux/vs_cvirt.h +--- linux-3.2.6/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_cvirt.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,50 @@ +#ifndef _VS_CVIRT_H +#define _VS_CVIRT_H @@ -9327,9 +9339,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_cvirt.h linux-3.2.5-vs2.3.2.6 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vs_device.h linux-3.2.5-vs2.3.2.6/include/linux/vs_device.h ---- linux-3.2.5/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_device.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_device.h linux-3.2.6-vs2.3.2.7/include/linux/vs_device.h +--- linux-3.2.6/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_device.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,45 @@ +#ifndef _VS_DEVICE_H +#define _VS_DEVICE_H @@ -9376,9 +9388,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_device.h linux-3.2.5-vs2.3.2. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vs_dlimit.h linux-3.2.5-vs2.3.2.6/include/linux/vs_dlimit.h ---- linux-3.2.5/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_dlimit.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_dlimit.h linux-3.2.6-vs2.3.2.7/include/linux/vs_dlimit.h +--- linux-3.2.6/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_dlimit.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,215 @@ +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H @@ -9595,9 +9607,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_dlimit.h linux-3.2.5-vs2.3.2. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vs_inet.h linux-3.2.5-vs2.3.2.6/include/linux/vs_inet.h ---- linux-3.2.5/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_inet.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_inet.h linux-3.2.6-vs2.3.2.7/include/linux/vs_inet.h +--- linux-3.2.6/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_inet.h 2012-02-15 03:03:53.000000000 +0100 @@ -0,0 +1,353 @@ +#ifndef _VS_INET_H +#define _VS_INET_H @@ -9952,9 +9964,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_inet.h linux-3.2.5-vs2.3.2.6/ +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vs_inet6.h linux-3.2.5-vs2.3.2.6/include/linux/vs_inet6.h ---- linux-3.2.5/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_inet6.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_inet6.h linux-3.2.6-vs2.3.2.7/include/linux/vs_inet6.h +--- linux-3.2.6/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_inet6.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,246 @@ +#ifndef _VS_INET6_H +#define _VS_INET6_H @@ -10202,9 +10214,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_inet6.h linux-3.2.5-vs2.3.2.6 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vs_limit.h linux-3.2.5-vs2.3.2.6/include/linux/vs_limit.h ---- linux-3.2.5/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_limit.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_limit.h linux-3.2.6-vs2.3.2.7/include/linux/vs_limit.h +--- linux-3.2.6/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_limit.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,140 @@ +#ifndef _VS_LIMIT_H +#define _VS_LIMIT_H @@ -10346,9 +10358,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_limit.h linux-3.2.5-vs2.3.2.6 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vs_network.h linux-3.2.5-vs2.3.2.6/include/linux/vs_network.h ---- linux-3.2.5/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_network.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_network.h linux-3.2.6-vs2.3.2.7/include/linux/vs_network.h +--- linux-3.2.6/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_network.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,169 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -10519,9 +10531,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_network.h linux-3.2.5-vs2.3.2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vs_pid.h linux-3.2.5-vs2.3.2.6/include/linux/vs_pid.h ---- linux-3.2.5/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_pid.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_pid.h linux-3.2.6-vs2.3.2.7/include/linux/vs_pid.h +--- linux-3.2.6/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_pid.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,50 @@ +#ifndef _VS_PID_H +#define _VS_PID_H @@ -10573,9 +10585,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_pid.h linux-3.2.5-vs2.3.2.6/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vs_sched.h linux-3.2.5-vs2.3.2.6/include/linux/vs_sched.h ---- linux-3.2.5/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_sched.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_sched.h linux-3.2.6-vs2.3.2.7/include/linux/vs_sched.h +--- linux-3.2.6/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_sched.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,40 @@ +#ifndef _VS_SCHED_H +#define _VS_SCHED_H @@ -10617,9 +10629,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_sched.h linux-3.2.5-vs2.3.2.6 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vs_socket.h linux-3.2.5-vs2.3.2.6/include/linux/vs_socket.h ---- linux-3.2.5/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_socket.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_socket.h linux-3.2.6-vs2.3.2.7/include/linux/vs_socket.h +--- linux-3.2.6/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_socket.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,67 @@ +#ifndef _VS_SOCKET_H +#define _VS_SOCKET_H @@ -10688,9 +10700,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_socket.h linux-3.2.5-vs2.3.2. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vs_tag.h linux-3.2.5-vs2.3.2.6/include/linux/vs_tag.h ---- linux-3.2.5/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_tag.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_tag.h linux-3.2.6-vs2.3.2.7/include/linux/vs_tag.h +--- linux-3.2.6/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_tag.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,47 @@ +#ifndef _VS_TAG_H +#define _VS_TAG_H @@ -10739,9 +10751,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_tag.h linux-3.2.5-vs2.3.2.6/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vs_time.h linux-3.2.5-vs2.3.2.6/include/linux/vs_time.h ---- linux-3.2.5/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vs_time.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vs_time.h linux-3.2.6-vs2.3.2.7/include/linux/vs_time.h +--- linux-3.2.6/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vs_time.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,19 @@ +#ifndef _VS_TIME_H +#define _VS_TIME_H @@ -10762,9 +10774,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vs_time.h linux-3.2.5-vs2.3.2.6/ +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/Kbuild linux-3.2.5-vs2.3.2.6/include/linux/vserver/Kbuild ---- linux-3.2.5/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/Kbuild 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/Kbuild linux-3.2.6-vs2.3.2.7/include/linux/vserver/Kbuild +--- linux-3.2.6/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/Kbuild 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,8 @@ + +header-y += context_cmd.h network_cmd.h space_cmd.h \ @@ -10774,9 +10786,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/Kbuild linux-3.2.5-vs2.3 + +header-y += switch.h network.h monitor.h inode.h device.h + -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/base.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/base.h ---- linux-3.2.5/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/base.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/base.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/base.h +--- linux-3.2.6/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/base.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,178 @@ +#ifndef _VX_BASE_H +#define _VX_BASE_H @@ -10956,9 +10968,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/base.h linux-3.2.5-vs2.3 +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/cacct.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/cacct.h ---- linux-3.2.5/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/cacct.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/cacct.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/cacct.h +--- linux-3.2.6/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/cacct.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,15 @@ +#ifndef _VX_CACCT_H +#define _VX_CACCT_H @@ -10975,9 +10987,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/cacct.h linux-3.2.5-vs2. +}; + +#endif /* _VX_CACCT_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/cacct_cmd.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/cacct_cmd.h ---- linux-3.2.5/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/cacct_cmd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/cacct_cmd.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/cacct_cmd.h +--- linux-3.2.6/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/cacct_cmd.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,23 @@ +#ifndef _VX_CACCT_CMD_H +#define _VX_CACCT_CMD_H @@ -11002,9 +11014,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/cacct_cmd.h linux-3.2.5- + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/cacct_def.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/cacct_def.h ---- linux-3.2.5/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/cacct_def.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/cacct_def.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/cacct_def.h +--- linux-3.2.6/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/cacct_def.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,43 @@ +#ifndef _VX_CACCT_DEF_H +#define _VX_CACCT_DEF_H @@ -11049,9 +11061,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/cacct_def.h linux-3.2.5- +#endif + +#endif /* _VX_CACCT_DEF_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/cacct_int.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/cacct_int.h ---- linux-3.2.5/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/cacct_int.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/cacct_int.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/cacct_int.h +--- linux-3.2.6/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/cacct_int.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,21 @@ +#ifndef _VX_CACCT_INT_H +#define _VX_CACCT_INT_H @@ -11074,9 +11086,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/cacct_int.h linux-3.2.5- + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_INT_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/check.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/check.h ---- linux-3.2.5/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/check.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/check.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/check.h +--- linux-3.2.6/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/check.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,89 @@ +#ifndef _VS_CHECK_H +#define _VS_CHECK_H @@ -11167,9 +11179,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/check.h linux-3.2.5-vs2. +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/context.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/context.h ---- linux-3.2.5/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/context.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/context.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/context.h +--- linux-3.2.6/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/context.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,188 @@ +#ifndef _VX_CONTEXT_H +#define _VX_CONTEXT_H @@ -11359,9 +11371,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/context.h linux-3.2.5-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/context_cmd.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/context_cmd.h ---- linux-3.2.5/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/context_cmd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/context_cmd.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/context_cmd.h +--- linux-3.2.6/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/context_cmd.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,162 @@ +#ifndef _VX_CONTEXT_CMD_H +#define _VX_CONTEXT_CMD_H @@ -11525,9 +11537,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/context_cmd.h linux-3.2. + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/cvirt.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/cvirt.h ---- linux-3.2.5/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/cvirt.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/cvirt.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/cvirt.h +--- linux-3.2.6/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/cvirt.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,20 @@ +#ifndef _VX_CVIRT_H +#define _VX_CVIRT_H @@ -11549,9 +11561,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/cvirt.h linux-3.2.5-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/cvirt_cmd.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/cvirt_cmd.h ---- linux-3.2.5/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/cvirt_cmd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/cvirt_cmd.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/cvirt_cmd.h +--- linux-3.2.6/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/cvirt_cmd.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,53 @@ +#ifndef _VX_CVIRT_CMD_H +#define _VX_CVIRT_CMD_H @@ -11606,9 +11618,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/cvirt_cmd.h linux-3.2.5- + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/cvirt_def.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/cvirt_def.h ---- linux-3.2.5/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/cvirt_def.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/cvirt_def.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/cvirt_def.h +--- linux-3.2.6/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/cvirt_def.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,80 @@ +#ifndef _VX_CVIRT_DEF_H +#define _VX_CVIRT_DEF_H @@ -11690,9 +11702,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/cvirt_def.h linux-3.2.5- +#endif + +#endif /* _VX_CVIRT_DEF_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/debug.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/debug.h ---- linux-3.2.5/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/debug.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/debug.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/debug.h +--- linux-3.2.6/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/debug.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,145 @@ +#ifndef _VX_DEBUG_H +#define _VX_DEBUG_H @@ -11839,9 +11851,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/debug.h linux-3.2.5-vs2. + + +#endif /* _VX_DEBUG_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/debug_cmd.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/debug_cmd.h ---- linux-3.2.5/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/debug_cmd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/debug_cmd.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/debug_cmd.h +--- linux-3.2.6/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/debug_cmd.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,58 @@ +#ifndef _VX_DEBUG_CMD_H +#define _VX_DEBUG_CMD_H @@ -11901,9 +11913,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/debug_cmd.h linux-3.2.5- + +#endif /* __KERNEL__ */ +#endif /* _VX_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/device.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/device.h ---- linux-3.2.5/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/device.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/device.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/device.h +--- linux-3.2.6/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/device.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,15 @@ +#ifndef _VX_DEVICE_H +#define _VX_DEVICE_H @@ -11920,9 +11932,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/device.h linux-3.2.5-vs2 +#else /* _VX_DEVICE_H */ +#warning duplicate inclusion +#endif /* _VX_DEVICE_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/device_cmd.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/device_cmd.h ---- linux-3.2.5/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/device_cmd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/device_cmd.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/device_cmd.h +--- linux-3.2.6/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/device_cmd.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,44 @@ +#ifndef _VX_DEVICE_CMD_H +#define _VX_DEVICE_CMD_H @@ -11968,9 +11980,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/device_cmd.h linux-3.2.5 + +#endif /* __KERNEL__ */ +#endif /* _VX_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/device_def.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/device_def.h ---- linux-3.2.5/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/device_def.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/device_def.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/device_def.h +--- linux-3.2.6/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/device_def.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,17 @@ +#ifndef _VX_DEVICE_DEF_H +#define _VX_DEVICE_DEF_H @@ -11989,9 +12001,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/device_def.h linux-3.2.5 +}; + +#endif /* _VX_DEVICE_DEF_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/dlimit.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/dlimit.h ---- linux-3.2.5/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/dlimit.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/dlimit.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/dlimit.h +--- linux-3.2.6/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/dlimit.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,54 @@ +#ifndef _VX_DLIMIT_H +#define _VX_DLIMIT_H @@ -12047,9 +12059,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/dlimit.h linux-3.2.5-vs2 +#else /* _VX_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VX_DLIMIT_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/dlimit_cmd.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/dlimit_cmd.h ---- linux-3.2.5/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/dlimit_cmd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/dlimit_cmd.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/dlimit_cmd.h +--- linux-3.2.6/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/dlimit_cmd.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,109 @@ +#ifndef _VX_DLIMIT_CMD_H +#define _VX_DLIMIT_CMD_H @@ -12160,9 +12172,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/dlimit_cmd.h linux-3.2.5 + +#endif /* __KERNEL__ */ +#endif /* _VX_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/global.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/global.h ---- linux-3.2.5/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/global.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/global.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/global.h +--- linux-3.2.6/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/global.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,19 @@ +#ifndef _VX_GLOBAL_H +#define _VX_GLOBAL_H @@ -12183,9 +12195,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/global.h linux-3.2.5-vs2 + + +#endif /* _VX_GLOBAL_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/history.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/history.h ---- linux-3.2.5/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/history.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/history.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/history.h +--- linux-3.2.6/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/history.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,197 @@ +#ifndef _VX_HISTORY_H +#define _VX_HISTORY_H @@ -12384,9 +12396,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/history.h linux-3.2.5-vs +#endif /* CONFIG_VSERVER_HISTORY */ + +#endif /* _VX_HISTORY_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/inode.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/inode.h ---- linux-3.2.5/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/inode.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/inode.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/inode.h +--- linux-3.2.6/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/inode.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,39 @@ +#ifndef _VX_INODE_H +#define _VX_INODE_H @@ -12427,9 +12439,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/inode.h linux-3.2.5-vs2. +#else /* _VX_INODE_H */ +#warning duplicate inclusion +#endif /* _VX_INODE_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/inode_cmd.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/inode_cmd.h ---- linux-3.2.5/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/inode_cmd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/inode_cmd.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/inode_cmd.h +--- linux-3.2.6/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/inode_cmd.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,59 @@ +#ifndef _VX_INODE_CMD_H +#define _VX_INODE_CMD_H @@ -12490,9 +12502,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/inode_cmd.h linux-3.2.5- + +#endif /* __KERNEL__ */ +#endif /* _VX_INODE_CMD_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/limit.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/limit.h ---- linux-3.2.5/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/limit.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/limit.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/limit.h +--- linux-3.2.6/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/limit.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,71 @@ +#ifndef _VX_LIMIT_H +#define _VX_LIMIT_H @@ -12565,9 +12577,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/limit.h linux-3.2.5-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/limit_cmd.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/limit_cmd.h ---- linux-3.2.5/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/limit_cmd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/limit_cmd.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/limit_cmd.h +--- linux-3.2.6/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/limit_cmd.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,71 @@ +#ifndef _VX_LIMIT_CMD_H +#define _VX_LIMIT_CMD_H @@ -12640,9 +12652,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/limit_cmd.h linux-3.2.5- + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/limit_def.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/limit_def.h ---- linux-3.2.5/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/limit_def.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/limit_def.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/limit_def.h +--- linux-3.2.6/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/limit_def.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,47 @@ +#ifndef _VX_LIMIT_DEF_H +#define _VX_LIMIT_DEF_H @@ -12691,9 +12703,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/limit_def.h linux-3.2.5- +#endif + +#endif /* _VX_LIMIT_DEF_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/limit_int.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/limit_int.h ---- linux-3.2.5/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/limit_int.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/limit_int.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/limit_int.h +--- linux-3.2.6/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/limit_int.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,198 @@ +#ifndef _VX_LIMIT_INT_H +#define _VX_LIMIT_INT_H @@ -12893,9 +12905,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/limit_int.h linux-3.2.5- + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_INT_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/monitor.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/monitor.h ---- linux-3.2.5/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/monitor.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/monitor.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/monitor.h +--- linux-3.2.6/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/monitor.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,96 @@ +#ifndef _VX_MONITOR_H +#define _VX_MONITOR_H @@ -12993,9 +13005,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/monitor.h linux-3.2.5-vs + + +#endif /* _VX_MONITOR_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/network.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/network.h ---- linux-3.2.5/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/network.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/network.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/network.h +--- linux-3.2.6/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/network.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,148 @@ +#ifndef _VX_NETWORK_H +#define _VX_NETWORK_H @@ -13145,9 +13157,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/network.h linux-3.2.5-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_NETWORK_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/network_cmd.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/network_cmd.h ---- linux-3.2.5/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/network_cmd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/network_cmd.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/network_cmd.h +--- linux-3.2.6/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/network_cmd.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,164 @@ +#ifndef _VX_NETWORK_CMD_H +#define _VX_NETWORK_CMD_H @@ -13313,9 +13325,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/network_cmd.h linux-3.2. + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/percpu.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/percpu.h ---- linux-3.2.5/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/percpu.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/percpu.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/percpu.h +--- linux-3.2.6/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/percpu.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,14 @@ +#ifndef _VX_PERCPU_H +#define _VX_PERCPU_H @@ -13331,9 +13343,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/percpu.h linux-3.2.5-vs2 +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + +#endif /* _VX_PERCPU_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/pid.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/pid.h ---- linux-3.2.5/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/pid.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/pid.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/pid.h +--- linux-3.2.6/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/pid.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,51 @@ +#ifndef _VSERVER_PID_H +#define _VSERVER_PID_H @@ -13386,9 +13398,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/pid.h linux-3.2.5-vs2.3. +} + +#endif -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/sched.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/sched.h ---- linux-3.2.5/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/sched.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/sched.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/sched.h +--- linux-3.2.6/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/sched.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,23 @@ +#ifndef _VX_SCHED_H +#define _VX_SCHED_H @@ -13413,9 +13425,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/sched.h linux-3.2.5-vs2. +#else /* _VX_SCHED_H */ +#warning duplicate inclusion +#endif /* _VX_SCHED_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/sched_cmd.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/sched_cmd.h ---- linux-3.2.5/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/sched_cmd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/sched_cmd.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/sched_cmd.h +--- linux-3.2.6/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/sched_cmd.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,21 @@ +#ifndef _VX_SCHED_CMD_H +#define _VX_SCHED_CMD_H @@ -13438,9 +13450,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/sched_cmd.h linux-3.2.5- + +#endif /* __KERNEL__ */ +#endif /* _VX_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/sched_def.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/sched_def.h ---- linux-3.2.5/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/sched_def.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/sched_def.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/sched_def.h +--- linux-3.2.6/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/sched_def.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,38 @@ +#ifndef _VX_SCHED_DEF_H +#define _VX_SCHED_DEF_H @@ -13480,9 +13492,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/sched_def.h linux-3.2.5- +#endif + +#endif /* _VX_SCHED_DEF_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/signal.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/signal.h ---- linux-3.2.5/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/signal.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/signal.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/signal.h +--- linux-3.2.6/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/signal.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,14 @@ +#ifndef _VX_SIGNAL_H +#define _VX_SIGNAL_H @@ -13498,9 +13510,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/signal.h linux-3.2.5-vs2 +#else /* _VX_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VX_SIGNAL_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/signal_cmd.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/signal_cmd.h ---- linux-3.2.5/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/signal_cmd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/signal_cmd.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/signal_cmd.h +--- linux-3.2.6/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/signal_cmd.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,43 @@ +#ifndef _VX_SIGNAL_CMD_H +#define _VX_SIGNAL_CMD_H @@ -13545,9 +13557,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/signal_cmd.h linux-3.2.5 + +#endif /* __KERNEL__ */ +#endif /* _VX_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/space.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/space.h ---- linux-3.2.5/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/space.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/space.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/space.h +--- linux-3.2.6/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/space.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,12 @@ +#ifndef _VX_SPACE_H +#define _VX_SPACE_H @@ -13561,9 +13573,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/space.h linux-3.2.5-vs2. +#else /* _VX_SPACE_H */ +#warning duplicate inclusion +#endif /* _VX_SPACE_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/space_cmd.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/space_cmd.h ---- linux-3.2.5/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/space_cmd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/space_cmd.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/space_cmd.h +--- linux-3.2.6/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/space_cmd.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,38 @@ +#ifndef _VX_SPACE_CMD_H +#define _VX_SPACE_CMD_H @@ -13603,9 +13615,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/space_cmd.h linux-3.2.5- + +#endif /* __KERNEL__ */ +#endif /* _VX_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/switch.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/switch.h ---- linux-3.2.5/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/switch.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/switch.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/switch.h +--- linux-3.2.6/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/switch.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,98 @@ +#ifndef _VX_SWITCH_H +#define _VX_SWITCH_H @@ -13705,9 +13717,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/switch.h linux-3.2.5-vs2 + +#endif /* _VX_SWITCH_H */ + -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/tag.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/tag.h ---- linux-3.2.5/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/tag.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/tag.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/tag.h +--- linux-3.2.6/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/tag.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,143 @@ +#ifndef _DX_TAG_H +#define _DX_TAG_H @@ -13852,9 +13864,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/tag.h linux-3.2.5-vs2.3. +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-3.2.5/include/linux/vserver/tag_cmd.h linux-3.2.5-vs2.3.2.6/include/linux/vserver/tag_cmd.h ---- linux-3.2.5/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/linux/vserver/tag_cmd.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/linux/vserver/tag_cmd.h linux-3.2.6-vs2.3.2.7/include/linux/vserver/tag_cmd.h +--- linux-3.2.6/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/linux/vserver/tag_cmd.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,22 @@ +#ifndef _VX_TAG_CMD_H +#define _VX_TAG_CMD_H @@ -13878,9 +13890,9 @@ diff -NurpP --minimal linux-3.2.5/include/linux/vserver/tag_cmd.h linux-3.2.5-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_TAG_CMD_H */ -diff -NurpP --minimal linux-3.2.5/include/net/addrconf.h linux-3.2.5-vs2.3.2.6/include/net/addrconf.h ---- linux-3.2.5/include/net/addrconf.h 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/net/addrconf.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/net/addrconf.h linux-3.2.6-vs2.3.2.7/include/net/addrconf.h +--- linux-3.2.6/include/net/addrconf.h 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/net/addrconf.h 2011-12-05 19:33:02.000000000 +0100 @@ -80,7 +80,8 @@ extern int ipv6_dev_get_saddr(struct n struct net_device *dev, const struct in6_addr *daddr, @@ -13891,9 +13903,9 @@ diff -NurpP --minimal linux-3.2.5/include/net/addrconf.h linux-3.2.5-vs2.3.2.6/i extern int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags); -diff -NurpP --minimal linux-3.2.5/include/net/af_unix.h linux-3.2.5-vs2.3.2.6/include/net/af_unix.h ---- linux-3.2.5/include/net/af_unix.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/net/af_unix.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/net/af_unix.h linux-3.2.6-vs2.3.2.7/include/net/af_unix.h +--- linux-3.2.6/include/net/af_unix.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/net/af_unix.h 2011-12-05 19:33:02.000000000 +0100 @@ -4,6 +4,7 @@ #include #include @@ -13902,9 +13914,9 @@ diff -NurpP --minimal linux-3.2.5/include/net/af_unix.h linux-3.2.5-vs2.3.2.6/in #include extern void unix_inflight(struct file *fp); -diff -NurpP --minimal linux-3.2.5/include/net/inet_timewait_sock.h linux-3.2.5-vs2.3.2.6/include/net/inet_timewait_sock.h ---- linux-3.2.5/include/net/inet_timewait_sock.h 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/net/inet_timewait_sock.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/net/inet_timewait_sock.h linux-3.2.6-vs2.3.2.7/include/net/inet_timewait_sock.h +--- linux-3.2.6/include/net/inet_timewait_sock.h 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/net/inet_timewait_sock.h 2011-12-05 19:33:02.000000000 +0100 @@ -112,6 +112,10 @@ struct inet_timewait_sock { #define tw_net __tw_common.skc_net #define tw_daddr __tw_common.skc_daddr @@ -13916,9 +13928,9 @@ diff -NurpP --minimal linux-3.2.5/include/net/inet_timewait_sock.h linux-3.2.5-v int tw_timeout; volatile unsigned char tw_substate; unsigned char tw_rcv_wscale; -diff -NurpP --minimal linux-3.2.5/include/net/ip6_route.h linux-3.2.5-vs2.3.2.6/include/net/ip6_route.h ---- linux-3.2.5/include/net/ip6_route.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/include/net/ip6_route.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/net/ip6_route.h linux-3.2.6-vs2.3.2.7/include/net/ip6_route.h +--- linux-3.2.6/include/net/ip6_route.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/include/net/ip6_route.h 2011-12-05 19:33:02.000000000 +0100 @@ -86,7 +86,8 @@ extern int ip6_route_get_saddr(struct struct rt6_info *rt, const struct in6_addr *daddr, @@ -13929,9 +13941,9 @@ diff -NurpP --minimal linux-3.2.5/include/net/ip6_route.h linux-3.2.5-vs2.3.2.6/ extern struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr, -diff -NurpP --minimal linux-3.2.5/include/net/route.h linux-3.2.5-vs2.3.2.6/include/net/route.h ---- linux-3.2.5/include/net/route.h 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/net/route.h 2012-02-07 03:13:38.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/net/route.h linux-3.2.6-vs2.3.2.7/include/net/route.h +--- linux-3.2.6/include/net/route.h 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/net/route.h 2012-02-07 03:13:38.000000000 +0100 @@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab dst_release(&rt->dst); } @@ -13979,9 +13991,9 @@ diff -NurpP --minimal linux-3.2.5/include/net/route.h linux-3.2.5-vs2.3.2.6/incl rt = __ip_route_output_key(net, fl4); if (IS_ERR(rt)) return rt; -diff -NurpP --minimal linux-3.2.5/include/net/sock.h linux-3.2.5-vs2.3.2.6/include/net/sock.h ---- linux-3.2.5/include/net/sock.h 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/include/net/sock.h 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/include/net/sock.h linux-3.2.6-vs2.3.2.7/include/net/sock.h +--- linux-3.2.6/include/net/sock.h 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/include/net/sock.h 2012-01-09 16:19:31.000000000 +0100 @@ -149,6 +149,10 @@ struct sock_common { #ifdef CONFIG_NET_NS struct net *skc_net; @@ -14004,9 +14016,9 @@ diff -NurpP --minimal linux-3.2.5/include/net/sock.h linux-3.2.5-vs2.3.2.6/inclu socket_lock_t sk_lock; struct sk_buff_head sk_receive_queue; /* -diff -NurpP --minimal linux-3.2.5/init/Kconfig linux-3.2.5-vs2.3.2.6/init/Kconfig ---- linux-3.2.5/init/Kconfig 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/init/Kconfig 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/init/Kconfig linux-3.2.6-vs2.3.2.7/init/Kconfig +--- linux-3.2.6/init/Kconfig 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/init/Kconfig 2011-12-05 19:33:02.000000000 +0100 @@ -574,6 +574,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK menuconfig CGROUPS boolean "Control Group support" @@ -14023,9 +14035,9 @@ diff -NurpP --minimal linux-3.2.5/init/Kconfig linux-3.2.5-vs2.3.2.6/init/Kconfi default y help This allows containers, i.e. vservers, to use user namespaces -diff -NurpP --minimal linux-3.2.5/init/main.c linux-3.2.5-vs2.3.2.6/init/main.c ---- linux-3.2.5/init/main.c 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/init/main.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/init/main.c linux-3.2.6-vs2.3.2.7/init/main.c +--- linux-3.2.6/init/main.c 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/init/main.c 2011-12-05 19:33:02.000000000 +0100 @@ -68,6 +68,7 @@ #include #include @@ -14034,9 +14046,9 @@ diff -NurpP --minimal linux-3.2.5/init/main.c linux-3.2.5-vs2.3.2.6/init/main.c #include #include -diff -NurpP --minimal linux-3.2.5/ipc/mqueue.c linux-3.2.5-vs2.3.2.6/ipc/mqueue.c ---- linux-3.2.5/ipc/mqueue.c 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/ipc/mqueue.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/ipc/mqueue.c linux-3.2.6-vs2.3.2.7/ipc/mqueue.c +--- linux-3.2.6/ipc/mqueue.c 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/ipc/mqueue.c 2012-01-09 16:19:31.000000000 +0100 @@ -33,6 +33,8 @@ #include #include @@ -14112,9 +14124,9 @@ diff -NurpP --minimal linux-3.2.5/ipc/mqueue.c linux-3.2.5-vs2.3.2.6/ipc/mqueue. free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-3.2.5/ipc/msg.c linux-3.2.5-vs2.3.2.6/ipc/msg.c ---- linux-3.2.5/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/ipc/msg.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/ipc/msg.c linux-3.2.6-vs2.3.2.7/ipc/msg.c +--- linux-3.2.6/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/ipc/msg.c 2011-12-05 19:33:02.000000000 +0100 @@ -37,6 +37,7 @@ #include #include @@ -14131,9 +14143,9 @@ diff -NurpP --minimal linux-3.2.5/ipc/msg.c linux-3.2.5-vs2.3.2.6/ipc/msg.c msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-3.2.5/ipc/namespace.c linux-3.2.5-vs2.3.2.6/ipc/namespace.c ---- linux-3.2.5/ipc/namespace.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/ipc/namespace.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/ipc/namespace.c linux-3.2.6-vs2.3.2.7/ipc/namespace.c +--- linux-3.2.6/ipc/namespace.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/ipc/namespace.c 2011-12-05 19:33:02.000000000 +0100 @@ -13,11 +13,12 @@ #include #include @@ -14174,9 +14186,9 @@ diff -NurpP --minimal linux-3.2.5/ipc/namespace.c linux-3.2.5-vs2.3.2.6/ipc/name } /* -diff -NurpP --minimal linux-3.2.5/ipc/sem.c linux-3.2.5-vs2.3.2.6/ipc/sem.c ---- linux-3.2.5/ipc/sem.c 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/ipc/sem.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/ipc/sem.c linux-3.2.6-vs2.3.2.7/ipc/sem.c +--- linux-3.2.6/ipc/sem.c 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/ipc/sem.c 2011-12-05 19:33:02.000000000 +0100 @@ -86,6 +86,8 @@ #include #include @@ -14214,9 +14226,9 @@ diff -NurpP --minimal linux-3.2.5/ipc/sem.c linux-3.2.5-vs2.3.2.6/ipc/sem.c security_sem_free(sma); ipc_rcu_putref(sma); } -diff -NurpP --minimal linux-3.2.5/ipc/shm.c linux-3.2.5-vs2.3.2.6/ipc/shm.c ---- linux-3.2.5/ipc/shm.c 2012-02-07 01:57:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/ipc/shm.c 2012-01-26 08:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/ipc/shm.c linux-3.2.6-vs2.3.2.7/ipc/shm.c +--- linux-3.2.6/ipc/shm.c 2012-02-15 00:58:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/ipc/shm.c 2012-01-26 08:52:10.000000000 +0100 @@ -39,6 +39,8 @@ #include #include @@ -14272,9 +14284,9 @@ diff -NurpP --minimal linux-3.2.5/ipc/shm.c linux-3.2.5-vs2.3.2.6/ipc/shm.c return error; no_id: -diff -NurpP --minimal linux-3.2.5/kernel/Makefile linux-3.2.5-vs2.3.2.6/kernel/Makefile ---- linux-3.2.5/kernel/Makefile 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/Makefile 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/Makefile linux-3.2.6-vs2.3.2.7/kernel/Makefile +--- linux-3.2.6/kernel/Makefile 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/Makefile 2011-12-05 19:33:02.000000000 +0100 @@ -24,6 +24,7 @@ CFLAGS_REMOVE_sched_clock.o = -pg CFLAGS_REMOVE_irq_work.o = -pg endif @@ -14283,9 +14295,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/Makefile linux-3.2.5-vs2.3.2.6/kernel/M obj-$(CONFIG_FREEZER) += freezer.o obj-$(CONFIG_PROFILING) += profile.o obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o -diff -NurpP --minimal linux-3.2.5/kernel/capability.c linux-3.2.5-vs2.3.2.6/kernel/capability.c ---- linux-3.2.5/kernel/capability.c 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/capability.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/capability.c linux-3.2.6-vs2.3.2.7/kernel/capability.c +--- linux-3.2.6/kernel/capability.c 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/capability.c 2011-12-05 19:33:02.000000000 +0100 @@ -15,6 +15,7 @@ #include #include @@ -14311,9 +14323,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/capability.c linux-3.2.5-vs2.3.2.6/kern /** * capable - Determine if the current task has a superior capability in effect * @cap: The capability to be tested for -diff -NurpP --minimal linux-3.2.5/kernel/compat.c linux-3.2.5-vs2.3.2.6/kernel/compat.c ---- linux-3.2.5/kernel/compat.c 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/compat.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/compat.c linux-3.2.6-vs2.3.2.7/kernel/compat.c +--- linux-3.2.6/kernel/compat.c 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/compat.c 2011-12-05 19:33:02.000000000 +0100 @@ -973,7 +973,7 @@ asmlinkage long compat_sys_stime(compat_ if (err) return err; @@ -14323,9 +14335,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/compat.c linux-3.2.5-vs2.3.2.6/kernel/c return 0; } -diff -NurpP --minimal linux-3.2.5/kernel/cred.c linux-3.2.5-vs2.3.2.6/kernel/cred.c ---- linux-3.2.5/kernel/cred.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/cred.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/cred.c linux-3.2.6-vs2.3.2.7/kernel/cred.c +--- linux-3.2.6/kernel/cred.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/cred.c 2011-12-05 19:33:02.000000000 +0100 @@ -61,31 +61,6 @@ struct cred init_cred = { #endif }; @@ -14395,9 +14407,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/cred.c linux-3.2.5-vs2.3.2.6/kernel/cre EXPORT_SYMBOL(prepare_creds); /* -diff -NurpP --minimal linux-3.2.5/kernel/exit.c linux-3.2.5-vs2.3.2.6/kernel/exit.c ---- linux-3.2.5/kernel/exit.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/exit.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/exit.c linux-3.2.6-vs2.3.2.7/kernel/exit.c +--- linux-3.2.6/kernel/exit.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/exit.c 2012-01-09 16:19:31.000000000 +0100 @@ -48,6 +48,10 @@ #include #include @@ -14438,9 +14450,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/exit.c linux-3.2.5-vs2.3.2.6/kernel/exi BUG(); /* Avoid "noreturn function does return". */ for (;;) -diff -NurpP --minimal linux-3.2.5/kernel/fork.c linux-3.2.5-vs2.3.2.6/kernel/fork.c ---- linux-3.2.5/kernel/fork.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/fork.c 2011-12-15 01:52:28.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/fork.c linux-3.2.6-vs2.3.2.7/kernel/fork.c +--- linux-3.2.6/kernel/fork.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/fork.c 2011-12-15 01:52:28.000000000 +0100 @@ -66,6 +66,9 @@ #include #include @@ -14533,9 +14545,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/fork.c linux-3.2.5-vs2.3.2.6/kernel/for write_unlock_irq(&tasklist_lock); proc_fork_connector(p); cgroup_post_fork(p); -diff -NurpP --minimal linux-3.2.5/kernel/kthread.c linux-3.2.5-vs2.3.2.6/kernel/kthread.c ---- linux-3.2.5/kernel/kthread.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/kthread.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/kthread.c linux-3.2.6-vs2.3.2.7/kernel/kthread.c +--- linux-3.2.6/kernel/kthread.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/kthread.c 2011-12-05 19:33:02.000000000 +0100 @@ -16,6 +16,7 @@ #include #include @@ -14544,9 +14556,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/kthread.c linux-3.2.5-vs2.3.2.6/kernel/ #include static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-3.2.5/kernel/nsproxy.c linux-3.2.5-vs2.3.2.6/kernel/nsproxy.c ---- linux-3.2.5/kernel/nsproxy.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/nsproxy.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/nsproxy.c linux-3.2.6-vs2.3.2.7/kernel/nsproxy.c +--- linux-3.2.6/kernel/nsproxy.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/nsproxy.c 2011-12-05 19:33:02.000000000 +0100 @@ -20,6 +20,8 @@ #include #include @@ -14722,9 +14734,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/nsproxy.c linux-3.2.5-vs2.3.2.6/kernel/ return -EPERM; *new_nsp = create_new_namespaces(unshare_flags, current, -diff -NurpP --minimal linux-3.2.5/kernel/pid.c linux-3.2.5-vs2.3.2.6/kernel/pid.c ---- linux-3.2.5/kernel/pid.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/pid.c 2011-12-05 19:43:14.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/pid.c linux-3.2.6-vs2.3.2.7/kernel/pid.c +--- linux-3.2.6/kernel/pid.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/pid.c 2011-12-05 19:43:14.000000000 +0100 @@ -36,6 +36,7 @@ #include #include @@ -14782,9 +14794,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/pid.c linux-3.2.5-vs2.3.2.6/kernel/pid. pid_t pid_vnr(struct pid *pid) { return pid_nr_ns(pid, current->nsproxy->pid_ns); -diff -NurpP --minimal linux-3.2.5/kernel/pid_namespace.c linux-3.2.5-vs2.3.2.6/kernel/pid_namespace.c ---- linux-3.2.5/kernel/pid_namespace.c 2011-05-22 16:17:59.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/kernel/pid_namespace.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/pid_namespace.c linux-3.2.6-vs2.3.2.7/kernel/pid_namespace.c +--- linux-3.2.6/kernel/pid_namespace.c 2011-05-22 16:17:59.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/kernel/pid_namespace.c 2011-12-05 19:33:02.000000000 +0100 @@ -15,6 +15,7 @@ #include #include @@ -14809,9 +14821,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/pid_namespace.c linux-3.2.5-vs2.3.2.6/k kmem_cache_free(pid_ns_cachep, ns); } -diff -NurpP --minimal linux-3.2.5/kernel/posix-timers.c linux-3.2.5-vs2.3.2.6/kernel/posix-timers.c ---- linux-3.2.5/kernel/posix-timers.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/posix-timers.c 2011-12-05 19:44:00.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/posix-timers.c linux-3.2.6-vs2.3.2.7/kernel/posix-timers.c +--- linux-3.2.6/kernel/posix-timers.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/posix-timers.c 2011-12-05 19:44:00.000000000 +0100 @@ -47,6 +47,7 @@ #include #include @@ -14847,9 +14859,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/posix-timers.c linux-3.2.5-vs2.3.2.6/ke /* If we failed to send the signal the timer stops. */ return ret > 0; } -diff -NurpP --minimal linux-3.2.5/kernel/printk.c linux-3.2.5-vs2.3.2.6/kernel/printk.c ---- linux-3.2.5/kernel/printk.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/printk.c 2011-12-15 01:11:33.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/printk.c linux-3.2.6-vs2.3.2.7/kernel/printk.c +--- linux-3.2.6/kernel/printk.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/printk.c 2011-12-15 01:11:33.000000000 +0100 @@ -41,6 +41,7 @@ #include #include @@ -14917,9 +14929,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/printk.c linux-3.2.5-vs2.3.2.6/kernel/p count = len; if (count > log_buf_len) count = log_buf_len; -diff -NurpP --minimal linux-3.2.5/kernel/ptrace.c linux-3.2.5-vs2.3.2.6/kernel/ptrace.c ---- linux-3.2.5/kernel/ptrace.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/ptrace.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/ptrace.c linux-3.2.6-vs2.3.2.7/kernel/ptrace.c +--- linux-3.2.6/kernel/ptrace.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/ptrace.c 2012-01-09 16:19:31.000000000 +0100 @@ -22,6 +22,7 @@ #include #include @@ -14940,9 +14952,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/ptrace.c linux-3.2.5-vs2.3.2.6/kernel/p return security_ptrace_access_check(task, mode); } -diff -NurpP --minimal linux-3.2.5/kernel/sched.c linux-3.2.5-vs2.3.2.6/kernel/sched.c ---- linux-3.2.5/kernel/sched.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/sched.c 2011-12-15 01:14:00.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/sched.c linux-3.2.6-vs2.3.2.7/kernel/sched.c +--- linux-3.2.6/kernel/sched.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/sched.c 2011-12-15 01:14:00.000000000 +0100 @@ -72,6 +72,8 @@ #include #include @@ -15016,9 +15028,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/sched.c linux-3.2.5-vs2.3.2.6/kernel/sc retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-3.2.5/kernel/sched_fair.c linux-3.2.5-vs2.3.2.6/kernel/sched_fair.c ---- linux-3.2.5/kernel/sched_fair.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/sched_fair.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/sched_fair.c linux-3.2.6-vs2.3.2.7/kernel/sched_fair.c +--- linux-3.2.6/kernel/sched_fair.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/sched_fair.c 2012-01-09 16:19:31.000000000 +0100 @@ -1014,6 +1014,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st __enqueue_entity(cfs_rq, se); se->on_rq = 1; @@ -15037,9 +15049,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/sched_fair.c linux-3.2.5-vs2.3.2.6/kern update_cfs_load(cfs_rq, 0); account_entity_dequeue(cfs_rq, se); -diff -NurpP --minimal linux-3.2.5/kernel/signal.c linux-3.2.5-vs2.3.2.6/kernel/signal.c ---- linux-3.2.5/kernel/signal.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/signal.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/signal.c linux-3.2.6-vs2.3.2.7/kernel/signal.c +--- linux-3.2.6/kernel/signal.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/signal.c 2012-01-09 16:19:31.000000000 +0100 @@ -28,6 +28,8 @@ #include #include @@ -15132,9 +15144,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/signal.c linux-3.2.5-vs2.3.2.6/kernel/s if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-3.2.5/kernel/softirq.c linux-3.2.5-vs2.3.2.6/kernel/softirq.c ---- linux-3.2.5/kernel/softirq.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/softirq.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/softirq.c linux-3.2.6-vs2.3.2.7/kernel/softirq.c +--- linux-3.2.6/kernel/softirq.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/softirq.c 2011-12-05 19:33:02.000000000 +0100 @@ -24,6 +24,7 @@ #include #include @@ -15143,9 +15155,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/softirq.c linux-3.2.5-vs2.3.2.6/kernel/ #define CREATE_TRACE_POINTS #include -diff -NurpP --minimal linux-3.2.5/kernel/sys.c linux-3.2.5-vs2.3.2.6/kernel/sys.c ---- linux-3.2.5/kernel/sys.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/sys.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/sys.c linux-3.2.6-vs2.3.2.7/kernel/sys.c +--- linux-3.2.6/kernel/sys.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/sys.c 2011-12-05 19:33:02.000000000 +0100 @@ -45,6 +45,7 @@ #include #include @@ -15242,9 +15254,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/sys.c linux-3.2.5-vs2.3.2.6/kernel/sys. return 0; return -EPERM; -diff -NurpP --minimal linux-3.2.5/kernel/sysctl.c linux-3.2.5-vs2.3.2.6/kernel/sysctl.c ---- linux-3.2.5/kernel/sysctl.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/sysctl.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/sysctl.c linux-3.2.6-vs2.3.2.7/kernel/sysctl.c +--- linux-3.2.6/kernel/sysctl.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/sysctl.c 2011-12-05 19:33:02.000000000 +0100 @@ -76,6 +76,7 @@ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) #include @@ -15267,9 +15279,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/sysctl.c linux-3.2.5-vs2.3.2.6/kernel/s #ifdef CONFIG_CHR_DEV_SG { .procname = "sg-big-buff", -diff -NurpP --minimal linux-3.2.5/kernel/sysctl_binary.c linux-3.2.5-vs2.3.2.6/kernel/sysctl_binary.c ---- linux-3.2.5/kernel/sysctl_binary.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/sysctl_binary.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/sysctl_binary.c linux-3.2.6-vs2.3.2.7/kernel/sysctl_binary.c +--- linux-3.2.6/kernel/sysctl_binary.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/sysctl_binary.c 2012-01-09 16:19:31.000000000 +0100 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t { CTL_INT, KERN_PANIC, "panic" }, @@ -15278,9 +15290,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/sysctl_binary.c linux-3.2.5-vs2.3.2.6/k { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-3.2.5/kernel/time/timekeeping.c linux-3.2.5-vs2.3.2.6/kernel/time/timekeeping.c ---- linux-3.2.5/kernel/time/timekeeping.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/time/timekeeping.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/time/timekeeping.c linux-3.2.6-vs2.3.2.7/kernel/time/timekeeping.c +--- linux-3.2.6/kernel/time/timekeeping.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/time/timekeeping.c 2011-12-05 19:33:02.000000000 +0100 @@ -233,6 +233,7 @@ void getnstimeofday(struct timespec *ts) } while (read_seqretry(&xtime_lock, seq)); @@ -15289,9 +15301,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/time/timekeeping.c linux-3.2.5-vs2.3.2. } EXPORT_SYMBOL(getnstimeofday); -diff -NurpP --minimal linux-3.2.5/kernel/time.c linux-3.2.5-vs2.3.2.6/kernel/time.c ---- linux-3.2.5/kernel/time.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/time.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/time.c linux-3.2.6-vs2.3.2.7/kernel/time.c +--- linux-3.2.6/kernel/time.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/time.c 2011-12-05 19:33:02.000000000 +0100 @@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, if (err) return err; @@ -15310,9 +15322,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/time.c linux-3.2.5-vs2.3.2.6/kernel/tim } return 0; } -diff -NurpP --minimal linux-3.2.5/kernel/timer.c linux-3.2.5-vs2.3.2.6/kernel/timer.c ---- linux-3.2.5/kernel/timer.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/timer.c 2011-12-15 01:11:33.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/timer.c linux-3.2.6-vs2.3.2.7/kernel/timer.c +--- linux-3.2.6/kernel/timer.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/timer.c 2011-12-15 01:11:33.000000000 +0100 @@ -40,6 +40,10 @@ #include #include @@ -15362,9 +15374,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/timer.c linux-3.2.5-vs2.3.2.6/kernel/ti SYSCALL_DEFINE0(getuid) { /* Only we change this so SMP safe */ -diff -NurpP --minimal linux-3.2.5/kernel/user_namespace.c linux-3.2.5-vs2.3.2.6/kernel/user_namespace.c ---- linux-3.2.5/kernel/user_namespace.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/user_namespace.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/user_namespace.c linux-3.2.6-vs2.3.2.7/kernel/user_namespace.c +--- linux-3.2.6/kernel/user_namespace.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/user_namespace.c 2011-12-05 19:33:02.000000000 +0100 @@ -11,6 +11,7 @@ #include #include @@ -15390,9 +15402,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/user_namespace.c linux-3.2.5-vs2.3.2.6/ INIT_WORK(&ns->destroyer, free_user_ns_work); schedule_work(&ns->destroyer); } -diff -NurpP --minimal linux-3.2.5/kernel/utsname.c linux-3.2.5-vs2.3.2.6/kernel/utsname.c ---- linux-3.2.5/kernel/utsname.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/utsname.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/utsname.c linux-3.2.6-vs2.3.2.7/kernel/utsname.c +--- linux-3.2.6/kernel/utsname.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/utsname.c 2011-12-05 19:33:02.000000000 +0100 @@ -16,14 +16,17 @@ #include #include @@ -15461,9 +15473,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/utsname.c linux-3.2.5-vs2.3.2.6/kernel/ kfree(ns); } -diff -NurpP --minimal linux-3.2.5/kernel/vserver/Kconfig linux-3.2.5-vs2.3.2.6/kernel/vserver/Kconfig ---- linux-3.2.5/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/Kconfig 2011-12-15 01:52:48.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/Kconfig linux-3.2.6-vs2.3.2.7/kernel/vserver/Kconfig +--- linux-3.2.6/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/Kconfig 2011-12-15 01:52:48.000000000 +0100 @@ -0,0 +1,224 @@ +# +# Linux VServer configuration @@ -15689,9 +15701,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/Kconfig linux-3.2.5-vs2.3.2.6/k + bool + default n + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/Makefile linux-3.2.5-vs2.3.2.6/kernel/vserver/Makefile ---- linux-3.2.5/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/Makefile 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/Makefile linux-3.2.6-vs2.3.2.7/kernel/vserver/Makefile +--- linux-3.2.6/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/Makefile 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,18 @@ +# +# Makefile for the Linux vserver routines. @@ -15711,9 +15723,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/Makefile linux-3.2.5-vs2.3.2.6/ +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/cacct.c linux-3.2.5-vs2.3.2.6/kernel/vserver/cacct.c ---- linux-3.2.5/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/cacct.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/cacct.c linux-3.2.6-vs2.3.2.7/kernel/vserver/cacct.c +--- linux-3.2.6/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/cacct.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,42 @@ +/* + * linux/kernel/vserver/cacct.c @@ -15757,9 +15769,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/cacct.c linux-3.2.5-vs2.3.2.6/k + return 0; +} + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/cacct_init.h linux-3.2.5-vs2.3.2.6/kernel/vserver/cacct_init.h ---- linux-3.2.5/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/cacct_init.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/cacct_init.h linux-3.2.6-vs2.3.2.7/kernel/vserver/cacct_init.h +--- linux-3.2.6/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/cacct_init.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,25 @@ + + @@ -15786,9 +15798,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/cacct_init.h linux-3.2.5-vs2.3. + return; +} + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/cacct_proc.h linux-3.2.5-vs2.3.2.6/kernel/vserver/cacct_proc.h ---- linux-3.2.5/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/cacct_proc.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/cacct_proc.h linux-3.2.6-vs2.3.2.7/kernel/vserver/cacct_proc.h +--- linux-3.2.6/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/cacct_proc.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,53 @@ +#ifndef _VX_CACCT_PROC_H +#define _VX_CACCT_PROC_H @@ -15843,9 +15855,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/cacct_proc.h linux-3.2.5-vs2.3. +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-3.2.5/kernel/vserver/context.c linux-3.2.5-vs2.3.2.6/kernel/vserver/context.c ---- linux-3.2.5/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/context.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/context.c linux-3.2.6-vs2.3.2.7/kernel/vserver/context.c +--- linux-3.2.6/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/context.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,1107 @@ +/* + * linux/kernel/vserver/context.c @@ -16954,9 +16966,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/context.c linux-3.2.5-vs2.3.2.6 + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/cvirt.c linux-3.2.5-vs2.3.2.6/kernel/vserver/cvirt.c ---- linux-3.2.5/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/cvirt.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/cvirt.c linux-3.2.6-vs2.3.2.7/kernel/vserver/cvirt.c +--- linux-3.2.6/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/cvirt.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,303 @@ +/* + * linux/kernel/vserver/cvirt.c @@ -17261,9 +17273,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/cvirt.c linux-3.2.5-vs2.3.2.6/k + +#endif + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/cvirt_init.h linux-3.2.5-vs2.3.2.6/kernel/vserver/cvirt_init.h ---- linux-3.2.5/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/cvirt_init.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/cvirt_init.h linux-3.2.6-vs2.3.2.7/kernel/vserver/cvirt_init.h +--- linux-3.2.6/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/cvirt_init.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,70 @@ + + @@ -17335,9 +17347,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/cvirt_init.h linux-3.2.5-vs2.3. + return; +} + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/cvirt_proc.h linux-3.2.5-vs2.3.2.6/kernel/vserver/cvirt_proc.h ---- linux-3.2.5/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/cvirt_proc.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/cvirt_proc.h linux-3.2.6-vs2.3.2.7/kernel/vserver/cvirt_proc.h +--- linux-3.2.6/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/cvirt_proc.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,135 @@ +#ifndef _VX_CVIRT_PROC_H +#define _VX_CVIRT_PROC_H @@ -17474,9 +17486,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/cvirt_proc.h linux-3.2.5-vs2.3. +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-3.2.5/kernel/vserver/debug.c linux-3.2.5-vs2.3.2.6/kernel/vserver/debug.c ---- linux-3.2.5/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/debug.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/debug.c linux-3.2.6-vs2.3.2.7/kernel/vserver/debug.c +--- linux-3.2.6/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/debug.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,32 @@ +/* + * kernel/vserver/debug.c @@ -17510,9 +17522,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/debug.c linux-3.2.5-vs2.3.2.6/k + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/device.c linux-3.2.5-vs2.3.2.6/kernel/vserver/device.c ---- linux-3.2.5/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/device.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/device.c linux-3.2.6-vs2.3.2.7/kernel/vserver/device.c +--- linux-3.2.6/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/device.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,443 @@ +/* + * linux/kernel/vserver/device.c @@ -17957,9 +17969,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/device.c linux-3.2.5-vs2.3.2.6/ +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/dlimit.c linux-3.2.5-vs2.3.2.6/kernel/vserver/dlimit.c ---- linux-3.2.5/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/dlimit.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/dlimit.c linux-3.2.6-vs2.3.2.7/kernel/vserver/dlimit.c +--- linux-3.2.6/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/dlimit.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,531 @@ +/* + * linux/kernel/vserver/dlimit.c @@ -18492,9 +18504,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/dlimit.c linux-3.2.5-vs2.3.2.6/ +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/helper.c linux-3.2.5-vs2.3.2.6/kernel/vserver/helper.c ---- linux-3.2.5/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/helper.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/helper.c linux-3.2.6-vs2.3.2.7/kernel/vserver/helper.c +--- linux-3.2.6/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/helper.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,223 @@ +/* + * linux/kernel/vserver/helper.c @@ -18719,9 +18731,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/helper.c linux-3.2.5-vs2.3.2.6/ + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/history.c linux-3.2.5-vs2.3.2.6/kernel/vserver/history.c ---- linux-3.2.5/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/history.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/history.c linux-3.2.6-vs2.3.2.7/kernel/vserver/history.c +--- linux-3.2.6/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/history.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,258 @@ +/* + * kernel/vserver/history.c @@ -18981,9 +18993,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/history.c linux-3.2.5-vs2.3.2.6 + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/inet.c linux-3.2.5-vs2.3.2.6/kernel/vserver/inet.c ---- linux-3.2.5/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/inet.c 2011-12-15 01:33:09.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/inet.c linux-3.2.6-vs2.3.2.7/kernel/vserver/inet.c +--- linux-3.2.6/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/inet.c 2011-12-15 01:33:09.000000000 +0100 @@ -0,0 +1,226 @@ + +#include @@ -19211,9 +19223,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/inet.c linux-3.2.5-vs2.3.2.6/ke + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/init.c linux-3.2.5-vs2.3.2.6/kernel/vserver/init.c ---- linux-3.2.5/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/init.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/init.c linux-3.2.6-vs2.3.2.7/kernel/vserver/init.c +--- linux-3.2.6/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/init.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,45 @@ +/* + * linux/kernel/init.c @@ -19260,9 +19272,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/init.c linux-3.2.5-vs2.3.2.6/ke +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/inode.c linux-3.2.5-vs2.3.2.6/kernel/vserver/inode.c ---- linux-3.2.5/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/inode.c 2011-12-06 23:56:11.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/inode.c linux-3.2.6-vs2.3.2.7/kernel/vserver/inode.c +--- linux-3.2.6/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/inode.c 2011-12-06 23:56:11.000000000 +0100 @@ -0,0 +1,437 @@ +/* + * linux/kernel/vserver/inode.c @@ -19701,9 +19713,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/inode.c linux-3.2.5-vs2.3.2.6/k + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/limit.c linux-3.2.5-vs2.3.2.6/kernel/vserver/limit.c ---- linux-3.2.5/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/limit.c 2011-12-15 01:52:48.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/limit.c linux-3.2.6-vs2.3.2.7/kernel/vserver/limit.c +--- linux-3.2.6/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/limit.c 2011-12-15 01:52:48.000000000 +0100 @@ -0,0 +1,330 @@ +/* + * linux/kernel/vserver/limit.c @@ -20035,9 +20047,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/limit.c linux-3.2.5-vs2.3.2.6/k +#endif +} + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/limit_init.h linux-3.2.5-vs2.3.2.6/kernel/vserver/limit_init.h ---- linux-3.2.5/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/limit_init.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/limit_init.h linux-3.2.6-vs2.3.2.7/kernel/vserver/limit_init.h +--- linux-3.2.6/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/limit_init.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,31 @@ + + @@ -20070,9 +20082,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/limit_init.h linux-3.2.5-vs2.3. + } +} + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/limit_proc.h linux-3.2.5-vs2.3.2.6/kernel/vserver/limit_proc.h ---- linux-3.2.5/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/limit_proc.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/limit_proc.h linux-3.2.6-vs2.3.2.7/kernel/vserver/limit_proc.h +--- linux-3.2.6/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/limit_proc.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,57 @@ +#ifndef _VX_LIMIT_PROC_H +#define _VX_LIMIT_PROC_H @@ -20131,9 +20143,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/limit_proc.h linux-3.2.5-vs2.3. +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/network.c linux-3.2.5-vs2.3.2.6/kernel/vserver/network.c ---- linux-3.2.5/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/network.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/network.c linux-3.2.6-vs2.3.2.7/kernel/vserver/network.c +--- linux-3.2.6/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/network.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,912 @@ +/* + * linux/kernel/vserver/network.c @@ -21047,9 +21059,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/network.c linux-3.2.5-vs2.3.2.6 +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/proc.c linux-3.2.5-vs2.3.2.6/kernel/vserver/proc.c ---- linux-3.2.5/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/proc.c 2011-12-06 23:19:52.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/proc.c linux-3.2.6-vs2.3.2.7/kernel/vserver/proc.c +--- linux-3.2.6/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/proc.c 2011-12-06 23:19:52.000000000 +0100 @@ -0,0 +1,1103 @@ +/* + * linux/kernel/vserver/proc.c @@ -22154,9 +22166,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/proc.c linux-3.2.5-vs2.3.2.6/ke + return buffer - orig; +} + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/sched.c linux-3.2.5-vs2.3.2.6/kernel/vserver/sched.c ---- linux-3.2.5/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/sched.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/sched.c linux-3.2.6-vs2.3.2.7/kernel/vserver/sched.c +--- linux-3.2.6/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/sched.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,82 @@ +/* + * linux/kernel/vserver/sched.c @@ -22240,9 +22252,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/sched.c linux-3.2.5-vs2.3.2.6/k + return 0; +} + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/sched_init.h linux-3.2.5-vs2.3.2.6/kernel/vserver/sched_init.h ---- linux-3.2.5/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/sched_init.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/sched_init.h linux-3.2.6-vs2.3.2.7/kernel/vserver/sched_init.h +--- linux-3.2.6/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/sched_init.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,27 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) @@ -22271,9 +22283,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/sched_init.h linux-3.2.5-vs2.3. +{ + return; +} -diff -NurpP --minimal linux-3.2.5/kernel/vserver/sched_proc.h linux-3.2.5-vs2.3.2.6/kernel/vserver/sched_proc.h ---- linux-3.2.5/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/sched_proc.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/sched_proc.h linux-3.2.6-vs2.3.2.7/kernel/vserver/sched_proc.h +--- linux-3.2.6/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/sched_proc.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,32 @@ +#ifndef _VX_SCHED_PROC_H +#define _VX_SCHED_PROC_H @@ -22307,9 +22319,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/sched_proc.h linux-3.2.5-vs2.3. +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-3.2.5/kernel/vserver/signal.c linux-3.2.5-vs2.3.2.6/kernel/vserver/signal.c ---- linux-3.2.5/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/signal.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/signal.c linux-3.2.6-vs2.3.2.7/kernel/vserver/signal.c +--- linux-3.2.6/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/signal.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,134 @@ +/* + * linux/kernel/vserver/signal.c @@ -22445,9 +22457,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/signal.c linux-3.2.5-vs2.3.2.6/ + return ret; +} + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/space.c linux-3.2.5-vs2.3.2.6/kernel/vserver/space.c ---- linux-3.2.5/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/space.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/space.c linux-3.2.6-vs2.3.2.7/kernel/vserver/space.c +--- linux-3.2.6/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/space.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,435 @@ +/* + * linux/kernel/vserver/space.c @@ -22884,9 +22896,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/space.c linux-3.2.5-vs2.3.2.6/k + return 0; +} + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/switch.c linux-3.2.5-vs2.3.2.6/kernel/vserver/switch.c ---- linux-3.2.5/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/switch.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/switch.c linux-3.2.6-vs2.3.2.7/kernel/vserver/switch.c +--- linux-3.2.6/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/switch.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,556 @@ +/* + * linux/kernel/vserver/switch.c @@ -23444,9 +23456,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/switch.c linux-3.2.5-vs2.3.2.6/ +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-3.2.5/kernel/vserver/sysctl.c linux-3.2.5-vs2.3.2.6/kernel/vserver/sysctl.c ---- linux-3.2.5/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/sysctl.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/sysctl.c linux-3.2.6-vs2.3.2.7/kernel/vserver/sysctl.c +--- linux-3.2.6/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/sysctl.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,247 @@ +/* + * kernel/vserver/sysctl.c @@ -23695,9 +23707,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/sysctl.c linux-3.2.5-vs2.3.2.6/ +EXPORT_SYMBOL_GPL(vs_debug_perm); +EXPORT_SYMBOL_GPL(vs_debug_misc); + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/tag.c linux-3.2.5-vs2.3.2.6/kernel/vserver/tag.c ---- linux-3.2.5/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/tag.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/tag.c linux-3.2.6-vs2.3.2.7/kernel/vserver/tag.c +--- linux-3.2.6/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/tag.c 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,63 @@ +/* + * linux/kernel/vserver/tag.c @@ -23762,9 +23774,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/tag.c linux-3.2.5-vs2.3.2.6/ker +} + + -diff -NurpP --minimal linux-3.2.5/kernel/vserver/vci_config.h linux-3.2.5-vs2.3.2.6/kernel/vserver/vci_config.h ---- linux-3.2.5/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/kernel/vserver/vci_config.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/kernel/vserver/vci_config.h linux-3.2.6-vs2.3.2.7/kernel/vserver/vci_config.h +--- linux-3.2.6/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/kernel/vserver/vci_config.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,76 @@ + +/* interface version */ @@ -23842,9 +23854,9 @@ diff -NurpP --minimal linux-3.2.5/kernel/vserver/vci_config.h linux-3.2.5-vs2.3. + 0; +} + -diff -NurpP --minimal linux-3.2.5/mm/memcontrol.c linux-3.2.5-vs2.3.2.6/mm/memcontrol.c ---- linux-3.2.5/mm/memcontrol.c 2012-02-07 01:57:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/mm/memcontrol.c 2012-01-26 08:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/mm/memcontrol.c linux-3.2.6-vs2.3.2.7/mm/memcontrol.c +--- linux-3.2.6/mm/memcontrol.c 2012-02-15 00:58:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/mm/memcontrol.c 2012-01-26 08:52:10.000000000 +0100 @@ -766,6 +766,31 @@ struct mem_cgroup *mem_cgroup_from_task( struct mem_cgroup, css); } @@ -23877,9 +23889,9 @@ diff -NurpP --minimal linux-3.2.5/mm/memcontrol.c linux-3.2.5-vs2.3.2.6/mm/memco struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) { struct mem_cgroup *memcg = NULL; -diff -NurpP --minimal linux-3.2.5/mm/oom_kill.c linux-3.2.5-vs2.3.2.6/mm/oom_kill.c ---- linux-3.2.5/mm/oom_kill.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/mm/oom_kill.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/mm/oom_kill.c linux-3.2.6-vs2.3.2.7/mm/oom_kill.c +--- linux-3.2.6/mm/oom_kill.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/mm/oom_kill.c 2012-01-09 16:19:31.000000000 +0100 @@ -33,6 +33,8 @@ #include #include @@ -23954,9 +23966,9 @@ diff -NurpP --minimal linux-3.2.5/mm/oom_kill.c linux-3.2.5-vs2.3.2.6/mm/oom_kil } if (oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, -diff -NurpP --minimal linux-3.2.5/mm/page_alloc.c linux-3.2.5-vs2.3.2.6/mm/page_alloc.c ---- linux-3.2.5/mm/page_alloc.c 2012-02-07 01:57:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/mm/page_alloc.c 2012-01-26 08:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/mm/page_alloc.c linux-3.2.6-vs2.3.2.7/mm/page_alloc.c +--- linux-3.2.6/mm/page_alloc.c 2012-02-15 00:58:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/mm/page_alloc.c 2012-01-26 08:52:10.000000000 +0100 @@ -57,6 +57,8 @@ #include #include @@ -23986,9 +23998,9 @@ diff -NurpP --minimal linux-3.2.5/mm/page_alloc.c linux-3.2.5-vs2.3.2.6/mm/page_ } #endif -diff -NurpP --minimal linux-3.2.5/mm/pgtable-generic.c linux-3.2.5-vs2.3.2.6/mm/pgtable-generic.c ---- linux-3.2.5/mm/pgtable-generic.c 2011-03-15 18:07:42.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/mm/pgtable-generic.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/mm/pgtable-generic.c linux-3.2.6-vs2.3.2.7/mm/pgtable-generic.c +--- linux-3.2.6/mm/pgtable-generic.c 2011-03-15 18:07:42.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/mm/pgtable-generic.c 2011-12-05 19:33:02.000000000 +0100 @@ -6,6 +6,8 @@ * Copyright (C) 2010 Linus Torvalds */ @@ -23998,9 +24010,9 @@ diff -NurpP --minimal linux-3.2.5/mm/pgtable-generic.c linux-3.2.5-vs2.3.2.6/mm/ #include #include #include -diff -NurpP --minimal linux-3.2.5/mm/shmem.c linux-3.2.5-vs2.3.2.6/mm/shmem.c ---- linux-3.2.5/mm/shmem.c 2012-02-07 01:57:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/mm/shmem.c 2012-01-26 08:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/mm/shmem.c linux-3.2.6-vs2.3.2.7/mm/shmem.c +--- linux-3.2.6/mm/shmem.c 2012-02-15 00:58:54.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/mm/shmem.c 2012-01-26 08:52:10.000000000 +0100 @@ -1460,7 +1460,7 @@ static int shmem_statfs(struct dentry *d { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); @@ -24019,9 +24031,9 @@ diff -NurpP --minimal linux-3.2.5/mm/shmem.c linux-3.2.5-vs2.3.2.6/mm/shmem.c sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-3.2.5/mm/slab.c linux-3.2.5-vs2.3.2.6/mm/slab.c ---- linux-3.2.5/mm/slab.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/mm/slab.c 2011-12-15 01:11:34.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/mm/slab.c linux-3.2.6-vs2.3.2.7/mm/slab.c +--- linux-3.2.6/mm/slab.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/mm/slab.c 2011-12-15 01:11:34.000000000 +0100 @@ -411,6 +411,8 @@ static void kmem_list3_init(struct kmem_ #define STATS_INC_FREEMISS(x) do { } while (0) #endif @@ -24055,9 +24067,9 @@ diff -NurpP --minimal linux-3.2.5/mm/slab.c linux-3.2.5-vs2.3.2.6/mm/slab.c kmemcheck_slab_free(cachep, objp, obj_size(cachep)); -diff -NurpP --minimal linux-3.2.5/mm/slab_vs.h linux-3.2.5-vs2.3.2.6/mm/slab_vs.h ---- linux-3.2.5/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/mm/slab_vs.h 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/mm/slab_vs.h linux-3.2.6-vs2.3.2.7/mm/slab_vs.h +--- linux-3.2.6/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/mm/slab_vs.h 2011-12-05 19:33:02.000000000 +0100 @@ -0,0 +1,29 @@ + +#include @@ -24088,9 +24100,9 @@ diff -NurpP --minimal linux-3.2.5/mm/slab_vs.h linux-3.2.5-vs2.3.2.6/mm/slab_vs. + atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-3.2.5/mm/swapfile.c linux-3.2.5-vs2.3.2.6/mm/swapfile.c ---- linux-3.2.5/mm/swapfile.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/mm/swapfile.c 2011-12-15 01:52:28.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/mm/swapfile.c linux-3.2.6-vs2.3.2.7/mm/swapfile.c +--- linux-3.2.6/mm/swapfile.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/mm/swapfile.c 2011-12-15 01:52:28.000000000 +0100 @@ -36,6 +36,7 @@ #include #include @@ -24125,9 +24137,9 @@ diff -NurpP --minimal linux-3.2.5/mm/swapfile.c linux-3.2.5-vs2.3.2.6/mm/swapfil } /* -diff -NurpP --minimal linux-3.2.5/net/bridge/br_multicast.c linux-3.2.5-vs2.3.2.6/net/bridge/br_multicast.c ---- linux-3.2.5/net/bridge/br_multicast.c 2012-01-09 16:15:03.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/bridge/br_multicast.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/bridge/br_multicast.c linux-3.2.6-vs2.3.2.7/net/bridge/br_multicast.c +--- linux-3.2.6/net/bridge/br_multicast.c 2012-01-09 16:15:03.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/bridge/br_multicast.c 2011-12-05 19:33:02.000000000 +0100 @@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_ ip6h->hop_limit = 1; ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); @@ -24137,9 +24149,9 @@ diff -NurpP --minimal linux-3.2.5/net/bridge/br_multicast.c linux-3.2.5-vs2.3.2. ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest); hopopt = (u8 *)(ip6h + 1); -diff -NurpP --minimal linux-3.2.5/net/core/dev.c linux-3.2.5-vs2.3.2.6/net/core/dev.c ---- linux-3.2.5/net/core/dev.c 2012-01-09 16:15:03.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/core/dev.c 2011-12-15 01:11:36.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/core/dev.c linux-3.2.6-vs2.3.2.7/net/core/dev.c +--- linux-3.2.6/net/core/dev.c 2012-01-09 16:15:03.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/core/dev.c 2011-12-15 01:11:36.000000000 +0100 @@ -127,6 +127,7 @@ #include #include @@ -24257,9 +24269,9 @@ diff -NurpP --minimal linux-3.2.5/net/core/dev.c linux-3.2.5-vs2.3.2.6/net/core/ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu " "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n", dev->name, stats->rx_bytes, stats->rx_packets, -diff -NurpP --minimal linux-3.2.5/net/core/rtnetlink.c linux-3.2.5-vs2.3.2.6/net/core/rtnetlink.c ---- linux-3.2.5/net/core/rtnetlink.c 2012-01-09 16:15:03.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/core/rtnetlink.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/core/rtnetlink.c linux-3.2.6-vs2.3.2.7/net/core/rtnetlink.c +--- linux-3.2.6/net/core/rtnetlink.c 2012-01-09 16:15:03.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/core/rtnetlink.c 2011-12-05 19:33:02.000000000 +0100 @@ -1058,6 +1058,8 @@ static int rtnl_dump_ifinfo(struct sk_bu hlist_for_each_entry_rcu(dev, node, head, index_hlist) { if (idx < s_idx) @@ -24279,9 +24291,9 @@ diff -NurpP --minimal linux-3.2.5/net/core/rtnetlink.c linux-3.2.5-vs2.3.2.6/net skb = nlmsg_new((if_info_size = if_nlmsg_size(dev)), GFP_KERNEL); if (skb == NULL) goto errout; -diff -NurpP --minimal linux-3.2.5/net/core/sock.c linux-3.2.5-vs2.3.2.6/net/core/sock.c ---- linux-3.2.5/net/core/sock.c 2012-01-09 16:15:03.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/core/sock.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/core/sock.c linux-3.2.6-vs2.3.2.7/net/core/sock.c +--- linux-3.2.6/net/core/sock.c 2012-01-09 16:15:03.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/core/sock.c 2012-01-09 16:19:31.000000000 +0100 @@ -127,6 +127,10 @@ #include @@ -24349,9 +24361,9 @@ diff -NurpP --minimal linux-3.2.5/net/core/sock.c linux-3.2.5-vs2.3.2.6/net/core /* * Before updating sk_refcnt, we must commit prior changes to memory * (Documentation/RCU/rculist_nulls.txt for details) -diff -NurpP --minimal linux-3.2.5/net/ipv4/af_inet.c linux-3.2.5-vs2.3.2.6/net/ipv4/af_inet.c ---- linux-3.2.5/net/ipv4/af_inet.c 2012-01-09 16:15:03.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/af_inet.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/af_inet.c linux-3.2.6-vs2.3.2.7/net/ipv4/af_inet.c +--- linux-3.2.6/net/ipv4/af_inet.c 2012-01-09 16:15:03.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/af_inet.c 2012-02-15 03:03:53.000000000 +0100 @@ -117,6 +117,7 @@ #ifdef CONFIG_IP_MROUTE #include @@ -24429,9 +24441,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/af_inet.c linux-3.2.5-vs2.3.2.6/net/i sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; } -diff -NurpP --minimal linux-3.2.5/net/ipv4/arp.c linux-3.2.5-vs2.3.2.6/net/ipv4/arp.c ---- linux-3.2.5/net/ipv4/arp.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/arp.c 2012-02-07 03:13:38.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/arp.c linux-3.2.6-vs2.3.2.7/net/ipv4/arp.c +--- linux-3.2.6/net/ipv4/arp.c 2011-10-24 18:45:34.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/arp.c 2012-02-07 03:13:38.000000000 +0100 @@ -1332,6 +1332,7 @@ static void arp_format_neigh_entry(struc struct net_device *dev = n->dev; int hatype = dev->type; @@ -24448,9 +24460,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/arp.c linux-3.2.5-vs2.3.2.6/net/ipv4/ sprintf(tbuf, "%pI4", n->key); seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n", tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00", -diff -NurpP --minimal linux-3.2.5/net/ipv4/devinet.c linux-3.2.5-vs2.3.2.6/net/ipv4/devinet.c ---- linux-3.2.5/net/ipv4/devinet.c 2012-02-07 01:57:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/devinet.c 2012-02-07 03:14:01.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/devinet.c linux-3.2.6-vs2.3.2.7/net/ipv4/devinet.c +--- linux-3.2.6/net/ipv4/devinet.c 2012-02-15 00:58:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/devinet.c 2012-02-07 03:14:01.000000000 +0100 @@ -518,6 +518,7 @@ struct in_device *inetdev_by_index(struc } EXPORT_SYMBOL(inetdev_by_index); @@ -24517,9 +24529,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/devinet.c linux-3.2.5-vs2.3.2.6/net/i if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-3.2.5/net/ipv4/fib_trie.c linux-3.2.5-vs2.3.2.6/net/ipv4/fib_trie.c ---- linux-3.2.5/net/ipv4/fib_trie.c 2012-02-07 01:57:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/fib_trie.c 2012-02-07 03:14:01.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/fib_trie.c linux-3.2.6-vs2.3.2.7/net/ipv4/fib_trie.c +--- linux-3.2.6/net/ipv4/fib_trie.c 2012-02-15 00:58:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/fib_trie.c 2012-02-07 03:14:01.000000000 +0100 @@ -2555,6 +2555,7 @@ static int fib_route_seq_show(struct seq || fa->fa_type == RTN_MULTICAST) continue; @@ -24528,9 +24540,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/fib_trie.c linux-3.2.5-vs2.3.2.6/net/ if (fi) seq_printf(seq, "%s\t%08X\t%08X\t%04X\t%d\t%u\t" -diff -NurpP --minimal linux-3.2.5/net/ipv4/inet_connection_sock.c linux-3.2.5-vs2.3.2.6/net/ipv4/inet_connection_sock.c ---- linux-3.2.5/net/ipv4/inet_connection_sock.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/inet_connection_sock.c 2012-02-07 03:13:38.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/inet_connection_sock.c linux-3.2.6-vs2.3.2.7/net/ipv4/inet_connection_sock.c +--- linux-3.2.6/net/ipv4/inet_connection_sock.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/inet_connection_sock.c 2012-02-07 03:13:38.000000000 +0100 @@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low, } EXPORT_SYMBOL(inet_get_local_port_range); @@ -24580,9 +24592,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/inet_connection_sock.c linux-3.2.5-vs break; } } -diff -NurpP --minimal linux-3.2.5/net/ipv4/inet_diag.c linux-3.2.5-vs2.3.2.6/net/ipv4/inet_diag.c ---- linux-3.2.5/net/ipv4/inet_diag.c 2012-01-09 16:15:03.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/inet_diag.c 2011-12-15 01:11:37.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/inet_diag.c linux-3.2.6-vs2.3.2.7/net/ipv4/inet_diag.c +--- linux-3.2.6/net/ipv4/inet_diag.c 2012-01-09 16:15:03.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/inet_diag.c 2012-02-15 03:03:53.000000000 +0100 @@ -33,6 +33,8 @@ #include @@ -24686,9 +24698,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/inet_diag.c linux-3.2.5-vs2.3.2.6/net if (num < s_num) goto next_dying; if (r->id.idiag_sport != tw->tw_sport && -diff -NurpP --minimal linux-3.2.5/net/ipv4/inet_hashtables.c linux-3.2.5-vs2.3.2.6/net/ipv4/inet_hashtables.c ---- linux-3.2.5/net/ipv4/inet_hashtables.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/inet_hashtables.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/inet_hashtables.c linux-3.2.6-vs2.3.2.7/net/ipv4/inet_hashtables.c +--- linux-3.2.6/net/ipv4/inet_hashtables.c 2011-10-24 18:45:34.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/inet_hashtables.c 2011-12-05 19:33:02.000000000 +0100 @@ -22,6 +22,7 @@ #include #include @@ -24725,9 +24737,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/inet_hashtables.c linux-3.2.5-vs2.3.2 /* * 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-3.2.5/net/ipv4/netfilter/nf_nat_helper.c linux-3.2.5-vs2.3.2.6/net/ipv4/netfilter/nf_nat_helper.c ---- linux-3.2.5/net/ipv4/netfilter/nf_nat_helper.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/netfilter/nf_nat_helper.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/netfilter/nf_nat_helper.c linux-3.2.6-vs2.3.2.7/net/ipv4/netfilter/nf_nat_helper.c +--- linux-3.2.6/net/ipv4/netfilter/nf_nat_helper.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/netfilter/nf_nat_helper.c 2011-12-05 19:33:02.000000000 +0100 @@ -20,6 +20,7 @@ #include @@ -24736,9 +24748,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/netfilter/nf_nat_helper.c linux-3.2.5 #include #include #include -diff -NurpP --minimal linux-3.2.5/net/ipv4/netfilter.c linux-3.2.5-vs2.3.2.6/net/ipv4/netfilter.c ---- linux-3.2.5/net/ipv4/netfilter.c 2012-01-09 16:15:03.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/netfilter.c 2012-02-07 03:13:38.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/netfilter.c linux-3.2.6-vs2.3.2.7/net/ipv4/netfilter.c +--- linux-3.2.6/net/ipv4/netfilter.c 2012-01-09 16:15:03.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/netfilter.c 2012-02-07 03:13:38.000000000 +0100 @@ -6,7 +6,7 @@ #include #include @@ -24748,9 +24760,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/netfilter.c linux-3.2.5-vs2.3.2.6/net #include #include #include -diff -NurpP --minimal linux-3.2.5/net/ipv4/raw.c linux-3.2.5-vs2.3.2.6/net/ipv4/raw.c ---- linux-3.2.5/net/ipv4/raw.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/raw.c 2012-02-07 03:13:38.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/raw.c linux-3.2.6-vs2.3.2.7/net/ipv4/raw.c +--- linux-3.2.6/net/ipv4/raw.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/raw.c 2012-02-15 03:03:53.000000000 +0100 @@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru if (net_eq(sock_net(sk), net) && inet->inet_num == num && @@ -24843,9 +24855,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/raw.c linux-3.2.5-vs2.3.2.6/net/ipv4/ if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-3.2.5/net/ipv4/route.c linux-3.2.5-vs2.3.2.6/net/ipv4/route.c ---- linux-3.2.5/net/ipv4/route.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/route.c 2012-02-07 03:13:38.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/route.c linux-3.2.6-vs2.3.2.7/net/ipv4/route.c +--- linux-3.2.6/net/ipv4/route.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/route.c 2012-02-07 03:13:38.000000000 +0100 @@ -2709,7 +2709,7 @@ static struct rtable *ip_route_output_sl @@ -24855,9 +24867,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/route.c linux-3.2.5-vs2.3.2.6/net/ipv rth = ERR_PTR(-ENODEV); if (dev_out == NULL) goto out; -diff -NurpP --minimal linux-3.2.5/net/ipv4/tcp.c linux-3.2.5-vs2.3.2.6/net/ipv4/tcp.c ---- linux-3.2.5/net/ipv4/tcp.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/tcp.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/tcp.c linux-3.2.6-vs2.3.2.7/net/ipv4/tcp.c +--- linux-3.2.6/net/ipv4/tcp.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/tcp.c 2011-12-05 19:33:02.000000000 +0100 @@ -266,6 +266,7 @@ #include #include @@ -24866,9 +24878,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/tcp.c linux-3.2.5-vs2.3.2.6/net/ipv4/ #include #include -diff -NurpP --minimal linux-3.2.5/net/ipv4/tcp_ipv4.c linux-3.2.5-vs2.3.2.6/net/ipv4/tcp_ipv4.c ---- linux-3.2.5/net/ipv4/tcp_ipv4.c 2012-02-07 01:57:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/tcp_ipv4.c 2012-02-07 03:14:01.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/tcp_ipv4.c linux-3.2.6-vs2.3.2.7/net/ipv4/tcp_ipv4.c +--- linux-3.2.6/net/ipv4/tcp_ipv4.c 2012-02-15 00:58:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/tcp_ipv4.c 2012-02-15 03:03:53.000000000 +0100 @@ -2023,6 +2023,12 @@ static void *listening_get_next(struct s req = req->dl_next; while (1) { @@ -24974,9 +24986,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/tcp_ipv4.c linux-3.2.5-vs2.3.2.6/net/ destp = ntohs(tw->tw_dport); srcp = ntohs(tw->tw_sport); -diff -NurpP --minimal linux-3.2.5/net/ipv4/tcp_minisocks.c linux-3.2.5-vs2.3.2.6/net/ipv4/tcp_minisocks.c ---- linux-3.2.5/net/ipv4/tcp_minisocks.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/tcp_minisocks.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/tcp_minisocks.c linux-3.2.6-vs2.3.2.7/net/ipv4/tcp_minisocks.c +--- linux-3.2.6/net/ipv4/tcp_minisocks.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/tcp_minisocks.c 2011-12-05 19:33:02.000000000 +0100 @@ -23,6 +23,9 @@ #include #include @@ -24999,9 +25011,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/tcp_minisocks.c linux-3.2.5-vs2.3.2.6 #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-3.2.5/net/ipv4/udp.c linux-3.2.5-vs2.3.2.6/net/ipv4/udp.c ---- linux-3.2.5/net/ipv4/udp.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv4/udp.c 2012-02-07 03:13:38.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv4/udp.c linux-3.2.6-vs2.3.2.7/net/ipv4/udp.c +--- linux-3.2.6/net/ipv4/udp.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv4/udp.c 2012-02-15 03:03:53.000000000 +0100 @@ -297,14 +297,7 @@ fail: } EXPORT_SYMBOL(udp_lib_get_port); @@ -25123,9 +25135,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv4/udp.c linux-3.2.5-vs2.3.2.6/net/ipv4/ if (!sk) { if (state->bucket <= state->udp_table->mask) -diff -NurpP --minimal linux-3.2.5/net/ipv6/Kconfig linux-3.2.5-vs2.3.2.6/net/ipv6/Kconfig ---- linux-3.2.5/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/net/ipv6/Kconfig 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv6/Kconfig linux-3.2.6-vs2.3.2.7/net/ipv6/Kconfig +--- linux-3.2.6/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/net/ipv6/Kconfig 2011-12-05 19:33:02.000000000 +0100 @@ -4,8 +4,8 @@ # IPv6 as module will cause a CRASH if you try to unload it @@ -25137,9 +25149,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv6/Kconfig linux-3.2.5-vs2.3.2.6/net/ipv ---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-3.2.5/net/ipv6/addrconf.c linux-3.2.5-vs2.3.2.6/net/ipv6/addrconf.c ---- linux-3.2.5/net/ipv6/addrconf.c 2012-02-07 01:57:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv6/addrconf.c 2012-02-07 03:14:01.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv6/addrconf.c linux-3.2.6-vs2.3.2.7/net/ipv6/addrconf.c +--- linux-3.2.6/net/ipv6/addrconf.c 2012-02-15 00:58:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv6/addrconf.c 2012-02-07 03:14:01.000000000 +0100 @@ -88,6 +88,8 @@ #include #include @@ -25239,9 +25251,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv6/addrconf.c linux-3.2.5-vs2.3.2.6/net/ idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-3.2.5/net/ipv6/af_inet6.c linux-3.2.5-vs2.3.2.6/net/ipv6/af_inet6.c ---- linux-3.2.5/net/ipv6/af_inet6.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/net/ipv6/af_inet6.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv6/af_inet6.c linux-3.2.6-vs2.3.2.7/net/ipv6/af_inet6.c +--- linux-3.2.6/net/ipv6/af_inet6.c 2011-10-24 18:45:34.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/net/ipv6/af_inet6.c 2011-12-05 19:33:02.000000000 +0100 @@ -42,6 +42,8 @@ #include #include @@ -25337,9 +25349,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv6/af_inet6.c linux-3.2.5-vs2.3.2.6/net/ if (ipv6_addr_any(&np->rcv_saddr)) ipv6_addr_copy(&sin->sin6_addr, &np->saddr); else -diff -NurpP --minimal linux-3.2.5/net/ipv6/datagram.c linux-3.2.5-vs2.3.2.6/net/ipv6/datagram.c ---- linux-3.2.5/net/ipv6/datagram.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv6/datagram.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv6/datagram.c linux-3.2.6-vs2.3.2.7/net/ipv6/datagram.c +--- linux-3.2.6/net/ipv6/datagram.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv6/datagram.c 2011-12-05 19:33:02.000000000 +0100 @@ -642,7 +642,7 @@ int datagram_send_ctl(struct net *net, s rcu_read_lock(); @@ -25349,9 +25361,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv6/datagram.c linux-3.2.5-vs2.3.2.6/net/ if (!dev) { rcu_read_unlock(); return -ENODEV; -diff -NurpP --minimal linux-3.2.5/net/ipv6/fib6_rules.c linux-3.2.5-vs2.3.2.6/net/ipv6/fib6_rules.c ---- linux-3.2.5/net/ipv6/fib6_rules.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv6/fib6_rules.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv6/fib6_rules.c linux-3.2.6-vs2.3.2.7/net/ipv6/fib6_rules.c +--- linux-3.2.6/net/ipv6/fib6_rules.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv6/fib6_rules.c 2011-12-05 19:33:02.000000000 +0100 @@ -91,7 +91,7 @@ static int fib6_rule_action(struct fib_r ip6_dst_idev(&rt->dst)->dev, &flp6->daddr, @@ -25361,9 +25373,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv6/fib6_rules.c linux-3.2.5-vs2.3.2.6/ne goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-3.2.5/net/ipv6/inet6_hashtables.c linux-3.2.5-vs2.3.2.6/net/ipv6/inet6_hashtables.c ---- linux-3.2.5/net/ipv6/inet6_hashtables.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/net/ipv6/inet6_hashtables.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv6/inet6_hashtables.c linux-3.2.6-vs2.3.2.7/net/ipv6/inet6_hashtables.c +--- linux-3.2.6/net/ipv6/inet6_hashtables.c 2011-10-24 18:45:34.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/net/ipv6/inet6_hashtables.c 2011-12-05 19:33:02.000000000 +0100 @@ -16,6 +16,7 @@ #include @@ -25399,9 +25411,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv6/inet6_hashtables.c linux-3.2.5-vs2.3. } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-3.2.5/net/ipv6/ip6_output.c linux-3.2.5-vs2.3.2.6/net/ipv6/ip6_output.c ---- linux-3.2.5/net/ipv6/ip6_output.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv6/ip6_output.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv6/ip6_output.c linux-3.2.6-vs2.3.2.7/net/ipv6/ip6_output.c +--- linux-3.2.6/net/ipv6/ip6_output.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv6/ip6_output.c 2012-01-09 16:19:31.000000000 +0100 @@ -963,7 +963,8 @@ static int ip6_dst_lookup_tail(struct so struct rt6_info *rt = (struct rt6_info *) *dst; err = ip6_route_get_saddr(net, rt, &fl6->daddr, @@ -25412,9 +25424,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv6/ip6_output.c linux-3.2.5-vs2.3.2.6/ne if (err) goto out_err_release; } -diff -NurpP --minimal linux-3.2.5/net/ipv6/ndisc.c linux-3.2.5-vs2.3.2.6/net/ipv6/ndisc.c ---- linux-3.2.5/net/ipv6/ndisc.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv6/ndisc.c 2011-12-15 01:11:37.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv6/ndisc.c linux-3.2.6-vs2.3.2.7/net/ipv6/ndisc.c +--- linux-3.2.6/net/ipv6/ndisc.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv6/ndisc.c 2011-12-15 01:11:37.000000000 +0100 @@ -588,7 +588,7 @@ static void ndisc_send_na(struct net_dev } else { if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, @@ -25424,9 +25436,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv6/ndisc.c linux-3.2.5-vs2.3.2.6/net/ipv return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-3.2.5/net/ipv6/raw.c linux-3.2.5-vs2.3.2.6/net/ipv6/raw.c ---- linux-3.2.5/net/ipv6/raw.c 2012-02-07 01:57:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv6/raw.c 2012-02-07 03:14:01.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv6/raw.c linux-3.2.6-vs2.3.2.7/net/ipv6/raw.c +--- linux-3.2.6/net/ipv6/raw.c 2012-02-15 00:58:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv6/raw.c 2012-02-07 03:14:01.000000000 +0100 @@ -30,6 +30,7 @@ #include #include @@ -25449,9 +25461,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv6/raw.c linux-3.2.5-vs2.3.2.6/net/ipv6/ /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -diff -NurpP --minimal linux-3.2.5/net/ipv6/route.c linux-3.2.5-vs2.3.2.6/net/ipv6/route.c ---- linux-3.2.5/net/ipv6/route.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv6/route.c 2012-01-09 16:19:31.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv6/route.c linux-3.2.6-vs2.3.2.7/net/ipv6/route.c +--- linux-3.2.6/net/ipv6/route.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv6/route.c 2012-01-09 16:19:31.000000000 +0100 @@ -55,6 +55,7 @@ #include #include @@ -25499,9 +25511,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv6/route.c linux-3.2.5-vs2.3.2.6/net/ipv seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); #ifdef CONFIG_IPV6_SUBTREES -diff -NurpP --minimal linux-3.2.5/net/ipv6/tcp_ipv6.c linux-3.2.5-vs2.3.2.6/net/ipv6/tcp_ipv6.c ---- linux-3.2.5/net/ipv6/tcp_ipv6.c 2012-02-07 01:57:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv6/tcp_ipv6.c 2012-02-07 03:14:01.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv6/tcp_ipv6.c linux-3.2.6-vs2.3.2.7/net/ipv6/tcp_ipv6.c +--- linux-3.2.6/net/ipv6/tcp_ipv6.c 2012-02-15 00:58:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv6/tcp_ipv6.c 2012-02-07 03:14:01.000000000 +0100 @@ -70,6 +70,7 @@ #include @@ -25528,9 +25540,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv6/tcp_ipv6.c linux-3.2.5-vs2.3.2.6/net/ addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-3.2.5/net/ipv6/udp.c linux-3.2.5-vs2.3.2.6/net/ipv6/udp.c ---- linux-3.2.5/net/ipv6/udp.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/ipv6/udp.c 2011-12-15 01:11:37.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv6/udp.c linux-3.2.6-vs2.3.2.7/net/ipv6/udp.c +--- linux-3.2.6/net/ipv6/udp.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/ipv6/udp.c 2011-12-15 01:11:37.000000000 +0100 @@ -45,41 +45,67 @@ #include #include @@ -25623,9 +25635,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv6/udp.c linux-3.2.5-vs2.3.2.6/net/ipv6/ } if (!ipv6_addr_any(&np->daddr)) { if (!ipv6_addr_equal(&np->daddr, saddr)) -diff -NurpP --minimal linux-3.2.5/net/ipv6/xfrm6_policy.c linux-3.2.5-vs2.3.2.6/net/ipv6/xfrm6_policy.c ---- linux-3.2.5/net/ipv6/xfrm6_policy.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/net/ipv6/xfrm6_policy.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/ipv6/xfrm6_policy.c linux-3.2.6-vs2.3.2.7/net/ipv6/xfrm6_policy.c +--- linux-3.2.6/net/ipv6/xfrm6_policy.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/net/ipv6/xfrm6_policy.c 2011-12-05 19:33:02.000000000 +0100 @@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n dev = ip6_dst_idev(dst)->dev; ipv6_dev_get_saddr(dev_net(dev), dev, @@ -25635,9 +25647,9 @@ diff -NurpP --minimal linux-3.2.5/net/ipv6/xfrm6_policy.c linux-3.2.5-vs2.3.2.6/ dst_release(dst); return 0; } -diff -NurpP --minimal linux-3.2.5/net/netfilter/ipvs/ip_vs_xmit.c linux-3.2.5-vs2.3.2.6/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-3.2.5/net/netfilter/ipvs/ip_vs_xmit.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/netfilter/ipvs/ip_vs_xmit.c 2012-02-07 03:13:38.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/netfilter/ipvs/ip_vs_xmit.c linux-3.2.6-vs2.3.2.7/net/netfilter/ipvs/ip_vs_xmit.c +--- linux-3.2.6/net/netfilter/ipvs/ip_vs_xmit.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/netfilter/ipvs/ip_vs_xmit.c 2012-02-07 03:13:38.000000000 +0100 @@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net, return dst; if (ipv6_addr_any(&fl6.saddr) && @@ -25647,9 +25659,9 @@ diff -NurpP --minimal linux-3.2.5/net/netfilter/ipvs/ip_vs_xmit.c linux-3.2.5-vs goto out_err; if (do_xfrm) { dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-3.2.5/net/netlink/af_netlink.c linux-3.2.5-vs2.3.2.6/net/netlink/af_netlink.c ---- linux-3.2.5/net/netlink/af_netlink.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/netlink/af_netlink.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/netlink/af_netlink.c linux-3.2.6-vs2.3.2.7/net/netlink/af_netlink.c +--- linux-3.2.6/net/netlink/af_netlink.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/netlink/af_netlink.c 2011-12-05 19:33:02.000000000 +0100 @@ -55,6 +55,9 @@ #include #include @@ -25689,9 +25701,9 @@ diff -NurpP --minimal linux-3.2.5/net/netlink/af_netlink.c linux-3.2.5-vs2.3.2.6 s = sk_next(s); if (s) { iter->link = i; -diff -NurpP --minimal linux-3.2.5/net/socket.c linux-3.2.5-vs2.3.2.6/net/socket.c ---- linux-3.2.5/net/socket.c 2012-02-07 01:57:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/socket.c 2012-02-07 03:14:01.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/socket.c linux-3.2.6-vs2.3.2.7/net/socket.c +--- linux-3.2.6/net/socket.c 2012-02-15 00:58:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/socket.c 2012-02-07 03:14:01.000000000 +0100 @@ -98,6 +98,10 @@ #include @@ -25798,9 +25810,9 @@ diff -NurpP --minimal linux-3.2.5/net/socket.c linux-3.2.5-vs2.3.2.6/net/socket. err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-3.2.5/net/sunrpc/auth.c linux-3.2.5-vs2.3.2.6/net/sunrpc/auth.c ---- linux-3.2.5/net/sunrpc/auth.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.2.5-vs2.3.2.6/net/sunrpc/auth.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/sunrpc/auth.c linux-3.2.6-vs2.3.2.7/net/sunrpc/auth.c +--- linux-3.2.6/net/sunrpc/auth.c 2011-10-24 18:45:34.000000000 +0200 ++++ linux-3.2.6-vs2.3.2.7/net/sunrpc/auth.c 2011-12-05 19:33:02.000000000 +0100 @@ -14,6 +14,7 @@ #include #include @@ -25825,9 +25837,9 @@ diff -NurpP --minimal linux-3.2.5/net/sunrpc/auth.c linux-3.2.5-vs2.3.2.6/net/su }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-3.2.5/net/sunrpc/auth_unix.c linux-3.2.5-vs2.3.2.6/net/sunrpc/auth_unix.c ---- linux-3.2.5/net/sunrpc/auth_unix.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/sunrpc/auth_unix.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/sunrpc/auth_unix.c linux-3.2.6-vs2.3.2.7/net/sunrpc/auth_unix.c +--- linux-3.2.6/net/sunrpc/auth_unix.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/sunrpc/auth_unix.c 2011-12-05 19:33:02.000000000 +0100 @@ -12,12 +12,14 @@ #include #include @@ -25886,9 +25898,9 @@ diff -NurpP --minimal linux-3.2.5/net/sunrpc/auth_unix.c linux-3.2.5-vs2.3.2.6/n 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-3.2.5/net/sunrpc/clnt.c linux-3.2.5-vs2.3.2.6/net/sunrpc/clnt.c ---- linux-3.2.5/net/sunrpc/clnt.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/sunrpc/clnt.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/sunrpc/clnt.c linux-3.2.6-vs2.3.2.7/net/sunrpc/clnt.c +--- linux-3.2.6/net/sunrpc/clnt.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/sunrpc/clnt.c 2011-12-05 19:33:02.000000000 +0100 @@ -31,6 +31,7 @@ #include #include @@ -25907,9 +25919,9 @@ diff -NurpP --minimal linux-3.2.5/net/sunrpc/clnt.c linux-3.2.5-vs2.3.2.6/net/su return clnt; } EXPORT_SYMBOL_GPL(rpc_create); -diff -NurpP --minimal linux-3.2.5/net/unix/af_unix.c linux-3.2.5-vs2.3.2.6/net/unix/af_unix.c ---- linux-3.2.5/net/unix/af_unix.c 2012-02-07 01:57:55.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/net/unix/af_unix.c 2012-02-07 03:14:01.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/net/unix/af_unix.c linux-3.2.6-vs2.3.2.7/net/unix/af_unix.c +--- linux-3.2.6/net/unix/af_unix.c 2012-02-15 00:58:55.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/net/unix/af_unix.c 2012-02-07 03:14:01.000000000 +0100 @@ -114,6 +114,8 @@ #include #include @@ -25947,9 +25959,9 @@ diff -NurpP --minimal linux-3.2.5/net/unix/af_unix.c linux-3.2.5-vs2.3.2.6/net/u sk = next_unix_socket(&iter->i, sk); return sk; } -diff -NurpP --minimal linux-3.2.5/scripts/checksyscalls.sh linux-3.2.5-vs2.3.2.6/scripts/checksyscalls.sh ---- linux-3.2.5/scripts/checksyscalls.sh 2011-03-15 18:07:46.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/scripts/checksyscalls.sh 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/scripts/checksyscalls.sh linux-3.2.6-vs2.3.2.7/scripts/checksyscalls.sh +--- linux-3.2.6/scripts/checksyscalls.sh 2011-03-15 18:07:46.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/scripts/checksyscalls.sh 2011-12-05 19:33:02.000000000 +0100 @@ -193,7 +193,6 @@ cat << EOF #define __IGNORE_afs_syscall #define __IGNORE_getpmsg @@ -25958,9 +25970,9 @@ diff -NurpP --minimal linux-3.2.5/scripts/checksyscalls.sh linux-3.2.5-vs2.3.2.6 EOF } -diff -NurpP --minimal linux-3.2.5/security/commoncap.c linux-3.2.5-vs2.3.2.6/security/commoncap.c ---- linux-3.2.5/security/commoncap.c 2012-01-09 16:15:05.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/security/commoncap.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/security/commoncap.c linux-3.2.6-vs2.3.2.7/security/commoncap.c +--- linux-3.2.6/security/commoncap.c 2012-01-09 16:15:05.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/security/commoncap.c 2011-12-05 19:33:02.000000000 +0100 @@ -62,6 +62,7 @@ int cap_netlink_recv(struct sk_buff *skb return -EPERM; return 0; @@ -26010,9 +26022,9 @@ diff -NurpP --minimal linux-3.2.5/security/commoncap.c linux-3.2.5-vs2.3.2.6/sec return -EPERM; return 0; } -diff -NurpP --minimal linux-3.2.5/security/selinux/hooks.c linux-3.2.5-vs2.3.2.6/security/selinux/hooks.c ---- linux-3.2.5/security/selinux/hooks.c 2012-01-09 16:15:05.000000000 +0100 -+++ linux-3.2.5-vs2.3.2.6/security/selinux/hooks.c 2011-12-05 19:33:02.000000000 +0100 +diff -NurpP --minimal linux-3.2.6/security/selinux/hooks.c linux-3.2.6-vs2.3.2.7/security/selinux/hooks.c +--- linux-3.2.6/security/selinux/hooks.c 2012-01-09 16:15:05.000000000 +0100 ++++ linux-3.2.6-vs2.3.2.7/security/selinux/hooks.c 2011-12-05 19:33:02.000000000 +0100 @@ -67,7 +67,6 @@ #include #include diff --git a/kernel.spec b/kernel.spec index f28acc51..b2395724 100644 --- a/kernel.spec +++ b/kernel.spec @@ -92,7 +92,7 @@ %define rel 1 %define basever 3.2 -%define postver .6 +%define postver .7 # __alt_kernel is list of features, empty string if none set # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros) @@ -135,7 +135,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz # Source0-md5: 364066fa18767ec0ae5f4e4abcf9dc51 %if "%{postver}" != ".0" Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2 -# Patch0-md5: 2bd4679899df503177a3b61ae2068749 +# Patch0-md5: 899624bffed6a19578613b672cc9483f %endif Source3: kernel-autoconf.h @@ -220,7 +220,7 @@ Patch59: kernel-rndis_host-wm5.patch # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch Patch85: kernel-hostap.patch -# http://vserver.13thfloor.at/Experimental/patch-3.2.5-vs2.3.2.6.diff +# http://vserver.13thfloor.at/Experimental/patch-3.2.6-vs2.3.2.7.diff Patch100: kernel-vserver-2.3.patch Patch101: kernel-vserver-fixes.patch -- 2.44.0