From 4a165445233fc0c4132e5754a8f73369cc90a841 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 19 Dec 2012 08:49:06 +0100 Subject: [PATCH] - up to 3.4.24 - updated vserver patch to patch-3.4.24-vs2.3.3.9.diff --- kernel-vserver-2.3.patch | 2492 +++++++++++++++++++------------------- kernel.spec | 4 +- 2 files changed, 1248 insertions(+), 1248 deletions(-) diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index fc5c8d42..f644fb6a 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-3.4.23/Documentation/vserver/debug.txt linux-3.4.23-vs2.3.3.9/Documentation/vserver/debug.txt ---- linux-3.4.23/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/Documentation/vserver/debug.txt 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/Documentation/vserver/debug.txt linux-3.4.24-vs2.3.3.9/Documentation/vserver/debug.txt +--- linux-3.4.24/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/Documentation/vserver/debug.txt 2012-05-21 16:15:04.000000000 +0000 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -156,9 +156,9 @@ diff -NurpP --minimal linux-3.4.23/Documentation/vserver/debug.txt linux-3.4.23- + 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.4.23/arch/alpha/Kconfig linux-3.4.23-vs2.3.3.9/arch/alpha/Kconfig ---- linux-3.4.23/arch/alpha/Kconfig 2012-05-21 18:06:12.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/alpha/Kconfig 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/alpha/Kconfig linux-3.4.24-vs2.3.3.9/arch/alpha/Kconfig +--- linux-3.4.24/arch/alpha/Kconfig 2012-05-21 16:06:12.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/alpha/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -662,6 +662,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.4.23/arch/alpha/Kconfig linux-3.4.23-vs2.3.3.9/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.23/arch/alpha/kernel/entry.S linux-3.4.23-vs2.3.3.9/arch/alpha/kernel/entry.S ---- linux-3.4.23/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/alpha/kernel/entry.S 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/alpha/kernel/entry.S linux-3.4.24-vs2.3.3.9/arch/alpha/kernel/entry.S +--- linux-3.4.24/arch/alpha/kernel/entry.S 2010-10-21 11:06:45.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/alpha/kernel/entry.S 2012-05-21 16:15:04.000000000 +0000 @@ -860,24 +860,15 @@ sys_getxgid: .globl sys_getxpid .ent sys_getxpid @@ -203,9 +203,9 @@ diff -NurpP --minimal linux-3.4.23/arch/alpha/kernel/entry.S linux-3.4.23-vs2.3. ret .end sys_getxpid -diff -NurpP --minimal linux-3.4.23/arch/alpha/kernel/ptrace.c linux-3.4.23-vs2.3.3.9/arch/alpha/kernel/ptrace.c ---- linux-3.4.23/arch/alpha/kernel/ptrace.c 2012-05-21 18:06:12.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/alpha/kernel/ptrace.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/alpha/kernel/ptrace.c linux-3.4.24-vs2.3.3.9/arch/alpha/kernel/ptrace.c +--- linux-3.4.24/arch/alpha/kernel/ptrace.c 2012-05-21 16:06:12.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/alpha/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 @@ -13,6 +13,7 @@ #include #include @@ -214,9 +214,9 @@ diff -NurpP --minimal linux-3.4.23/arch/alpha/kernel/ptrace.c linux-3.4.23-vs2.3 #include #include -diff -NurpP --minimal linux-3.4.23/arch/alpha/kernel/systbls.S linux-3.4.23-vs2.3.3.9/arch/alpha/kernel/systbls.S ---- linux-3.4.23/arch/alpha/kernel/systbls.S 2012-01-09 16:13:54.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/alpha/kernel/systbls.S 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/alpha/kernel/systbls.S linux-3.4.24-vs2.3.3.9/arch/alpha/kernel/systbls.S +--- linux-3.4.24/arch/alpha/kernel/systbls.S 2012-01-09 15:13:54.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/alpha/kernel/systbls.S 2012-05-21 16:15:04.000000000 +0000 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -226,9 +226,9 @@ diff -NurpP --minimal linux-3.4.23/arch/alpha/kernel/systbls.S linux-3.4.23-vs2. .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.4.23/arch/alpha/kernel/traps.c linux-3.4.23-vs2.3.3.9/arch/alpha/kernel/traps.c ---- linux-3.4.23/arch/alpha/kernel/traps.c 2012-05-21 18:06:12.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/alpha/kernel/traps.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/alpha/kernel/traps.c linux-3.4.24-vs2.3.3.9/arch/alpha/kernel/traps.c +--- linux-3.4.24/arch/alpha/kernel/traps.c 2012-05-21 16:06:12.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/alpha/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 @@ -184,7 +184,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.4.23/arch/alpha/kernel/traps.c linux-3.4.23-vs2.3. dik_show_regs(regs, r9_15); add_taint(TAINT_DIE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-3.4.23/arch/arm/Kconfig linux-3.4.23-vs2.3.3.9/arch/arm/Kconfig ---- linux-3.4.23/arch/arm/Kconfig 2012-12-11 12:37:16.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/arm/Kconfig 2012-12-11 12:42:38.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/arch/arm/Kconfig linux-3.4.24-vs2.3.3.9/arch/arm/Kconfig +--- linux-3.4.24/arch/arm/Kconfig 2012-12-18 14:00:43.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/arm/Kconfig 2012-12-11 11:42:38.000000000 +0000 @@ -2311,6 +2311,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -251,9 +251,9 @@ diff -NurpP --minimal linux-3.4.23/arch/arm/Kconfig linux-3.4.23-vs2.3.3.9/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.23/arch/arm/kernel/calls.S linux-3.4.23-vs2.3.3.9/arch/arm/kernel/calls.S ---- linux-3.4.23/arch/arm/kernel/calls.S 2012-01-09 16:13:54.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/arm/kernel/calls.S 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/arm/kernel/calls.S linux-3.4.24-vs2.3.3.9/arch/arm/kernel/calls.S +--- linux-3.4.24/arch/arm/kernel/calls.S 2012-01-09 15:13:54.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/arm/kernel/calls.S 2012-05-21 16:15:04.000000000 +0000 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -263,9 +263,9 @@ diff -NurpP --minimal linux-3.4.23/arch/arm/kernel/calls.S linux-3.4.23-vs2.3.3. CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-3.4.23/arch/arm/kernel/process.c linux-3.4.23-vs2.3.3.9/arch/arm/kernel/process.c ---- linux-3.4.23/arch/arm/kernel/process.c 2012-12-11 12:37:17.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/arm/kernel/process.c 2012-09-01 10:50:48.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/arm/kernel/process.c linux-3.4.24-vs2.3.3.9/arch/arm/kernel/process.c +--- linux-3.4.24/arch/arm/kernel/process.c 2012-12-18 14:00:44.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/arm/kernel/process.c 2012-09-01 08:50:48.000000000 +0000 @@ -357,7 +357,8 @@ void __show_regs(struct pt_regs *regs) void show_regs(struct pt_regs * regs) { @@ -276,9 +276,9 @@ diff -NurpP --minimal linux-3.4.23/arch/arm/kernel/process.c linux-3.4.23-vs2.3. __show_regs(regs); dump_stack(); } -diff -NurpP --minimal linux-3.4.23/arch/arm/kernel/traps.c linux-3.4.23-vs2.3.3.9/arch/arm/kernel/traps.c ---- linux-3.4.23/arch/arm/kernel/traps.c 2012-12-11 12:37:17.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/arm/kernel/traps.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/arm/kernel/traps.c linux-3.4.24-vs2.3.3.9/arch/arm/kernel/traps.c +--- linux-3.4.24/arch/arm/kernel/traps.c 2012-12-18 14:00:44.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/arm/kernel/traps.c 2012-10-22 13:09:53.000000000 +0000 @@ -249,8 +249,8 @@ static int __die(const char *str, int er print_modules(); @@ -290,9 +290,9 @@ diff -NurpP --minimal linux-3.4.23/arch/arm/kernel/traps.c linux-3.4.23-vs2.3.3. if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-3.4.23/arch/cris/Kconfig linux-3.4.23-vs2.3.3.9/arch/cris/Kconfig ---- linux-3.4.23/arch/cris/Kconfig 2012-03-19 19:46:39.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/cris/Kconfig 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/cris/Kconfig linux-3.4.24-vs2.3.3.9/arch/cris/Kconfig +--- linux-3.4.24/arch/cris/Kconfig 2012-03-19 18:46:39.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/cris/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -675,6 +675,8 @@ source "drivers/staging/Kconfig" source "arch/cris/Kconfig.debug" @@ -302,9 +302,9 @@ diff -NurpP --minimal linux-3.4.23/arch/cris/Kconfig linux-3.4.23-vs2.3.3.9/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.23/arch/frv/kernel/kernel_thread.S linux-3.4.23-vs2.3.3.9/arch/frv/kernel/kernel_thread.S ---- linux-3.4.23/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/frv/kernel/kernel_thread.S 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/frv/kernel/kernel_thread.S linux-3.4.24-vs2.3.3.9/arch/frv/kernel/kernel_thread.S +--- linux-3.4.24/arch/frv/kernel/kernel_thread.S 2008-12-24 23:26:37.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/frv/kernel/kernel_thread.S 2012-05-21 16:15:04.000000000 +0000 @@ -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.4.23/arch/frv/kernel/kernel_thread.S linux-3.4.23- 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.4.23/arch/h8300/Kconfig linux-3.4.23-vs2.3.3.9/arch/h8300/Kconfig ---- linux-3.4.23/arch/h8300/Kconfig 2012-03-19 19:46:39.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/h8300/Kconfig 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/h8300/Kconfig linux-3.4.24-vs2.3.3.9/arch/h8300/Kconfig +--- linux-3.4.24/arch/h8300/Kconfig 2012-03-19 18:46:39.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/h8300/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -214,6 +214,8 @@ source "fs/Kconfig" source "arch/h8300/Kconfig.debug" @@ -326,9 +326,9 @@ diff -NurpP --minimal linux-3.4.23/arch/h8300/Kconfig linux-3.4.23-vs2.3.3.9/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.23/arch/ia64/Kconfig linux-3.4.23-vs2.3.3.9/arch/ia64/Kconfig ---- linux-3.4.23/arch/ia64/Kconfig 2012-03-19 19:46:39.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/ia64/Kconfig 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/ia64/Kconfig linux-3.4.24-vs2.3.3.9/arch/ia64/Kconfig +--- linux-3.4.24/arch/ia64/Kconfig 2012-03-19 18:46:39.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/ia64/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -654,6 +654,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -338,9 +338,9 @@ diff -NurpP --minimal linux-3.4.23/arch/ia64/Kconfig linux-3.4.23-vs2.3.3.9/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.23/arch/ia64/kernel/entry.S linux-3.4.23-vs2.3.3.9/arch/ia64/kernel/entry.S ---- linux-3.4.23/arch/ia64/kernel/entry.S 2012-03-19 19:46:40.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/ia64/kernel/entry.S 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/ia64/kernel/entry.S linux-3.4.24-vs2.3.3.9/arch/ia64/kernel/entry.S +--- linux-3.4.24/arch/ia64/kernel/entry.S 2012-03-19 18:46:40.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/ia64/kernel/entry.S 2012-05-21 16:15:04.000000000 +0000 @@ -1714,7 +1714,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr @@ -350,9 +350,9 @@ diff -NurpP --minimal linux-3.4.23/arch/ia64/kernel/entry.S linux-3.4.23-vs2.3.3 data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-3.4.23/arch/ia64/kernel/process.c linux-3.4.23-vs2.3.3.9/arch/ia64/kernel/process.c ---- linux-3.4.23/arch/ia64/kernel/process.c 2012-12-11 12:37:17.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/ia64/kernel/process.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/ia64/kernel/process.c linux-3.4.24-vs2.3.3.9/arch/ia64/kernel/process.c +--- linux-3.4.24/arch/ia64/kernel/process.c 2012-12-18 14:00:44.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/ia64/kernel/process.c 2012-10-22 13:09:53.000000000 +0000 @@ -111,8 +111,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.4.23/arch/ia64/kernel/process.c linux-3.4.23-vs2.3 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.4.23/arch/ia64/kernel/ptrace.c linux-3.4.23-vs2.3.3.9/arch/ia64/kernel/ptrace.c ---- linux-3.4.23/arch/ia64/kernel/ptrace.c 2012-05-21 18:06:26.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/ia64/kernel/ptrace.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/ia64/kernel/ptrace.c linux-3.4.24-vs2.3.3.9/arch/ia64/kernel/ptrace.c +--- linux-3.4.24/arch/ia64/kernel/ptrace.c 2012-05-21 16:06:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/ia64/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -375,9 +375,9 @@ diff -NurpP --minimal linux-3.4.23/arch/ia64/kernel/ptrace.c linux-3.4.23-vs2.3. #include #include -diff -NurpP --minimal linux-3.4.23/arch/ia64/kernel/traps.c linux-3.4.23-vs2.3.3.9/arch/ia64/kernel/traps.c ---- linux-3.4.23/arch/ia64/kernel/traps.c 2012-05-21 18:06:26.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/ia64/kernel/traps.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/ia64/kernel/traps.c linux-3.4.24-vs2.3.3.9/arch/ia64/kernel/traps.c +--- linux-3.4.24/arch/ia64/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/ia64/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re put_cpu(); @@ -402,9 +402,9 @@ diff -NurpP --minimal linux-3.4.23/arch/ia64/kernel/traps.c linux-3.4.23-vs2.3.3 } } } -diff -NurpP --minimal linux-3.4.23/arch/m32r/kernel/traps.c linux-3.4.23-vs2.3.3.9/arch/m32r/kernel/traps.c ---- linux-3.4.23/arch/m32r/kernel/traps.c 2012-05-21 18:06:26.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/m32r/kernel/traps.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/m32r/kernel/traps.c linux-3.4.24-vs2.3.3.9/arch/m32r/kernel/traps.c +--- linux-3.4.24/arch/m32r/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/m32r/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 @@ -195,8 +195,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); @@ -417,9 +417,9 @@ diff -NurpP --minimal linux-3.4.23/arch/m32r/kernel/traps.c linux-3.4.23-vs2.3.3 /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-3.4.23/arch/m68k/Kconfig linux-3.4.23-vs2.3.3.9/arch/m68k/Kconfig ---- linux-3.4.23/arch/m68k/Kconfig 2012-05-21 18:06:26.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/m68k/Kconfig 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/m68k/Kconfig linux-3.4.24-vs2.3.3.9/arch/m68k/Kconfig +--- linux-3.4.24/arch/m68k/Kconfig 2012-05-21 16:06:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/m68k/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -146,6 +146,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -429,9 +429,9 @@ diff -NurpP --minimal linux-3.4.23/arch/m68k/Kconfig linux-3.4.23-vs2.3.3.9/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.23/arch/mips/Kconfig linux-3.4.23-vs2.3.3.9/arch/mips/Kconfig ---- linux-3.4.23/arch/mips/Kconfig 2012-05-21 18:06:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/mips/Kconfig 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/mips/Kconfig linux-3.4.24-vs2.3.3.9/arch/mips/Kconfig +--- linux-3.4.24/arch/mips/Kconfig 2012-05-21 16:06:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/mips/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -2516,6 +2516,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -441,9 +441,9 @@ diff -NurpP --minimal linux-3.4.23/arch/mips/Kconfig linux-3.4.23-vs2.3.3.9/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.23/arch/mips/kernel/ptrace.c linux-3.4.23-vs2.3.3.9/arch/mips/kernel/ptrace.c ---- linux-3.4.23/arch/mips/kernel/ptrace.c 2012-05-21 18:06:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/mips/kernel/ptrace.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/mips/kernel/ptrace.c linux-3.4.24-vs2.3.3.9/arch/mips/kernel/ptrace.c +--- linux-3.4.24/arch/mips/kernel/ptrace.c 2012-05-21 16:06:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/mips/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 @@ -25,6 +25,7 @@ #include #include @@ -462,9 +462,9 @@ diff -NurpP --minimal linux-3.4.23/arch/mips/kernel/ptrace.c linux-3.4.23-vs2.3. 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.4.23/arch/mips/kernel/scall32-o32.S linux-3.4.23-vs2.3.3.9/arch/mips/kernel/scall32-o32.S ---- linux-3.4.23/arch/mips/kernel/scall32-o32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/mips/kernel/scall32-o32.S 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/mips/kernel/scall32-o32.S linux-3.4.24-vs2.3.3.9/arch/mips/kernel/scall32-o32.S +--- linux-3.4.24/arch/mips/kernel/scall32-o32.S 2012-01-09 15:14:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/mips/kernel/scall32-o32.S 2012-05-21 16:15:04.000000000 +0000 @@ -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.4.23/arch/mips/kernel/scall32-o32.S linux-3.4.23-v sys sys_waitid 5 sys sys_ni_syscall 0 /* available, was setaltroot */ sys sys_add_key 5 /* 4280 */ -diff -NurpP --minimal linux-3.4.23/arch/mips/kernel/scall64-64.S linux-3.4.23-vs2.3.3.9/arch/mips/kernel/scall64-64.S ---- linux-3.4.23/arch/mips/kernel/scall64-64.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/mips/kernel/scall64-64.S 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/mips/kernel/scall64-64.S linux-3.4.24-vs2.3.3.9/arch/mips/kernel/scall64-64.S +--- linux-3.4.24/arch/mips/kernel/scall64-64.S 2012-01-09 15:14:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/mips/kernel/scall64-64.S 2012-05-21 16:15:04.000000000 +0000 @@ -362,7 +362,7 @@ sys_call_table: PTR sys_mq_timedreceive PTR sys_mq_notify @@ -486,9 +486,9 @@ diff -NurpP --minimal linux-3.4.23/arch/mips/kernel/scall64-64.S linux-3.4.23-vs PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.4.23/arch/mips/kernel/scall64-n32.S linux-3.4.23-vs2.3.3.9/arch/mips/kernel/scall64-n32.S ---- linux-3.4.23/arch/mips/kernel/scall64-n32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/mips/kernel/scall64-n32.S 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/mips/kernel/scall64-n32.S linux-3.4.24-vs2.3.3.9/arch/mips/kernel/scall64-n32.S +--- linux-3.4.24/arch/mips/kernel/scall64-n32.S 2012-01-09 15:14:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/mips/kernel/scall64-n32.S 2012-05-21 16:15:04.000000000 +0000 @@ -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.4.23/arch/mips/kernel/scall64-n32.S linux-3.4.23-v PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.4.23/arch/mips/kernel/scall64-o32.S linux-3.4.23-vs2.3.3.9/arch/mips/kernel/scall64-o32.S ---- linux-3.4.23/arch/mips/kernel/scall64-o32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/mips/kernel/scall64-o32.S 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/mips/kernel/scall64-o32.S linux-3.4.24-vs2.3.3.9/arch/mips/kernel/scall64-o32.S +--- linux-3.4.24/arch/mips/kernel/scall64-o32.S 2012-01-09 15:14:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/mips/kernel/scall64-o32.S 2012-05-21 16:15:04.000000000 +0000 @@ -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.4.23/arch/mips/kernel/scall64-o32.S linux-3.4.23-v PTR sys_32_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-3.4.23/arch/mips/kernel/traps.c linux-3.4.23-vs2.3.3.9/arch/mips/kernel/traps.c ---- linux-3.4.23/arch/mips/kernel/traps.c 2012-05-21 18:06:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/mips/kernel/traps.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/mips/kernel/traps.c linux-3.4.24-vs2.3.3.9/arch/mips/kernel/traps.c +--- linux-3.4.24/arch/mips/kernel/traps.c 2012-05-21 16:06:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/mips/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 @@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); @@ -527,9 +527,9 @@ diff -NurpP --minimal linux-3.4.23/arch/mips/kernel/traps.c linux-3.4.23-vs2.3.3 if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-3.4.23/arch/parisc/Kconfig linux-3.4.23-vs2.3.3.9/arch/parisc/Kconfig ---- linux-3.4.23/arch/parisc/Kconfig 2012-03-19 19:46:44.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/parisc/Kconfig 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/parisc/Kconfig linux-3.4.24-vs2.3.3.9/arch/parisc/Kconfig +--- linux-3.4.24/arch/parisc/Kconfig 2012-03-19 18:46:44.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/parisc/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -279,6 +279,8 @@ source "fs/Kconfig" source "arch/parisc/Kconfig.debug" @@ -539,9 +539,9 @@ diff -NurpP --minimal linux-3.4.23/arch/parisc/Kconfig linux-3.4.23-vs2.3.3.9/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.23/arch/parisc/kernel/syscall_table.S linux-3.4.23-vs2.3.3.9/arch/parisc/kernel/syscall_table.S ---- linux-3.4.23/arch/parisc/kernel/syscall_table.S 2011-10-24 18:45:00.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/parisc/kernel/syscall_table.S 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/parisc/kernel/syscall_table.S linux-3.4.24-vs2.3.3.9/arch/parisc/kernel/syscall_table.S +--- linux-3.4.24/arch/parisc/kernel/syscall_table.S 2011-10-24 16:45:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/parisc/kernel/syscall_table.S 2012-05-21 16:15:04.000000000 +0000 @@ -361,7 +361,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) @@ -551,9 +551,9 @@ diff -NurpP --minimal linux-3.4.23/arch/parisc/kernel/syscall_table.S linux-3.4. ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-3.4.23/arch/parisc/kernel/traps.c linux-3.4.23-vs2.3.3.9/arch/parisc/kernel/traps.c ---- linux-3.4.23/arch/parisc/kernel/traps.c 2012-05-21 18:06:28.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/parisc/kernel/traps.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/parisc/kernel/traps.c linux-3.4.24-vs2.3.3.9/arch/parisc/kernel/traps.c +--- linux-3.4.24/arch/parisc/kernel/traps.c 2012-05-21 16:06:28.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/parisc/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 @@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_ if (err == 0) return; /* STFU */ @@ -577,9 +577,9 @@ diff -NurpP --minimal linux-3.4.23/arch/parisc/kernel/traps.c linux-3.4.23-vs2.3 /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-3.4.23/arch/parisc/mm/fault.c linux-3.4.23-vs2.3.3.9/arch/parisc/mm/fault.c ---- linux-3.4.23/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/parisc/mm/fault.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/parisc/mm/fault.c linux-3.4.24-vs2.3.3.9/arch/parisc/mm/fault.c +--- linux-3.4.24/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/parisc/mm/fault.c 2012-05-21 16:15:04.000000000 +0000 @@ -237,8 +237,9 @@ bad_area: #ifdef PRINT_USER_FAULTS @@ -592,9 +592,9 @@ diff -NurpP --minimal linux-3.4.23/arch/parisc/mm/fault.c linux-3.4.23-vs2.3.3.9 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.4.23/arch/powerpc/Kconfig linux-3.4.23-vs2.3.3.9/arch/powerpc/Kconfig ---- linux-3.4.23/arch/powerpc/Kconfig 2012-05-21 18:06:28.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/powerpc/Kconfig 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/powerpc/Kconfig linux-3.4.24-vs2.3.3.9/arch/powerpc/Kconfig +--- linux-3.4.24/arch/powerpc/Kconfig 2012-05-21 16:06:28.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/powerpc/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -1002,6 +1002,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -604,9 +604,9 @@ diff -NurpP --minimal linux-3.4.23/arch/powerpc/Kconfig linux-3.4.23-vs2.3.3.9/a source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-3.4.23/arch/powerpc/include/asm/unistd.h linux-3.4.23-vs2.3.3.9/arch/powerpc/include/asm/unistd.h ---- linux-3.4.23/arch/powerpc/include/asm/unistd.h 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/powerpc/include/asm/unistd.h 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/powerpc/include/asm/unistd.h linux-3.4.24-vs2.3.3.9/arch/powerpc/include/asm/unistd.h +--- linux-3.4.24/arch/powerpc/include/asm/unistd.h 2012-01-09 15:14:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/powerpc/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -616,9 +616,9 @@ diff -NurpP --minimal linux-3.4.23/arch/powerpc/include/asm/unistd.h linux-3.4.2 #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-3.4.23/arch/powerpc/kernel/process.c linux-3.4.23-vs2.3.3.9/arch/powerpc/kernel/process.c ---- linux-3.4.23/arch/powerpc/kernel/process.c 2012-12-11 12:37:17.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/powerpc/kernel/process.c 2012-09-16 20:49:11.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/powerpc/kernel/process.c linux-3.4.24-vs2.3.3.9/arch/powerpc/kernel/process.c +--- linux-3.4.24/arch/powerpc/kernel/process.c 2012-12-18 14:00:45.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/powerpc/kernel/process.c 2012-09-16 18:49:11.000000000 +0000 @@ -661,8 +661,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.4.23/arch/powerpc/kernel/process.c linux-3.4.23-vs #ifdef CONFIG_SMP printk(" CPU: %d", raw_smp_processor_id()); -diff -NurpP --minimal linux-3.4.23/arch/powerpc/kernel/traps.c linux-3.4.23-vs2.3.3.9/arch/powerpc/kernel/traps.c ---- linux-3.4.23/arch/powerpc/kernel/traps.c 2012-12-11 12:37:17.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/powerpc/kernel/traps.c 2012-09-16 20:49:11.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/powerpc/kernel/traps.c linux-3.4.24-vs2.3.3.9/arch/powerpc/kernel/traps.c +--- linux-3.4.24/arch/powerpc/kernel/traps.c 2012-12-18 14:00:45.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/powerpc/kernel/traps.c 2012-09-16 18:49:11.000000000 +0000 @@ -1119,8 +1119,9 @@ void nonrecoverable_exception(struct pt_ void trace_syscall(struct pt_regs *regs) @@ -646,9 +646,9 @@ diff -NurpP --minimal linux-3.4.23/arch/powerpc/kernel/traps.c linux-3.4.23-vs2. regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-3.4.23/arch/s390/Kconfig linux-3.4.23-vs2.3.3.9/arch/s390/Kconfig ---- linux-3.4.23/arch/s390/Kconfig 2012-05-21 18:06:32.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/s390/Kconfig 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/s390/Kconfig linux-3.4.24-vs2.3.3.9/arch/s390/Kconfig +--- linux-3.4.24/arch/s390/Kconfig 2012-05-21 16:06:32.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/s390/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -639,6 +639,8 @@ source "fs/Kconfig" source "arch/s390/Kconfig.debug" @@ -658,9 +658,9 @@ diff -NurpP --minimal linux-3.4.23/arch/s390/Kconfig linux-3.4.23-vs2.3.3.9/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.23/arch/s390/include/asm/tlb.h linux-3.4.23-vs2.3.3.9/arch/s390/include/asm/tlb.h ---- linux-3.4.23/arch/s390/include/asm/tlb.h 2012-05-21 18:06:32.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/s390/include/asm/tlb.h 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/s390/include/asm/tlb.h linux-3.4.24-vs2.3.3.9/arch/s390/include/asm/tlb.h +--- linux-3.4.24/arch/s390/include/asm/tlb.h 2012-05-21 16:06:32.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/s390/include/asm/tlb.h 2012-05-21 16:15:04.000000000 +0000 @@ -24,6 +24,7 @@ #include #include @@ -669,9 +669,9 @@ diff -NurpP --minimal linux-3.4.23/arch/s390/include/asm/tlb.h linux-3.4.23-vs2. #include #include #include -diff -NurpP --minimal linux-3.4.23/arch/s390/include/asm/unistd.h linux-3.4.23-vs2.3.3.9/arch/s390/include/asm/unistd.h ---- linux-3.4.23/arch/s390/include/asm/unistd.h 2012-03-19 19:46:48.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/s390/include/asm/unistd.h 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/s390/include/asm/unistd.h linux-3.4.24-vs2.3.3.9/arch/s390/include/asm/unistd.h +--- linux-3.4.24/arch/s390/include/asm/unistd.h 2012-03-19 18:46:48.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/s390/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000 @@ -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.4.23/arch/s390/include/asm/unistd.h linux-3.4.23-v #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-3.4.23/arch/s390/kernel/ptrace.c linux-3.4.23-vs2.3.3.9/arch/s390/kernel/ptrace.c ---- linux-3.4.23/arch/s390/kernel/ptrace.c 2012-05-21 18:06:32.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/s390/kernel/ptrace.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/s390/kernel/ptrace.c linux-3.4.24-vs2.3.3.9/arch/s390/kernel/ptrace.c +--- linux-3.4.24/arch/s390/kernel/ptrace.c 2012-05-21 16:06:32.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/s390/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -692,9 +692,9 @@ diff -NurpP --minimal linux-3.4.23/arch/s390/kernel/ptrace.c linux-3.4.23-vs2.3. #include #include #include -diff -NurpP --minimal linux-3.4.23/arch/s390/kernel/syscalls.S linux-3.4.23-vs2.3.3.9/arch/s390/kernel/syscalls.S ---- linux-3.4.23/arch/s390/kernel/syscalls.S 2012-01-09 16:14:06.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/s390/kernel/syscalls.S 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/s390/kernel/syscalls.S linux-3.4.24-vs2.3.3.9/arch/s390/kernel/syscalls.S +--- linux-3.4.24/arch/s390/kernel/syscalls.S 2012-01-09 15:14:06.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/s390/kernel/syscalls.S 2012-05-21 16:15:04.000000000 +0000 @@ -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.4.23/arch/s390/kernel/syscalls.S linux-3.4.23-vs2. 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.4.23/arch/sh/Kconfig linux-3.4.23-vs2.3.3.9/arch/sh/Kconfig ---- linux-3.4.23/arch/sh/Kconfig 2012-05-21 18:06:33.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/sh/Kconfig 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/sh/Kconfig linux-3.4.24-vs2.3.3.9/arch/sh/Kconfig +--- linux-3.4.24/arch/sh/Kconfig 2012-05-21 16:06:33.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/sh/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -905,6 +905,8 @@ source "fs/Kconfig" source "arch/sh/Kconfig.debug" @@ -716,9 +716,9 @@ diff -NurpP --minimal linux-3.4.23/arch/sh/Kconfig linux-3.4.23-vs2.3.3.9/arch/s source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.23/arch/sh/kernel/irq.c linux-3.4.23-vs2.3.3.9/arch/sh/kernel/irq.c ---- linux-3.4.23/arch/sh/kernel/irq.c 2011-07-22 11:17:41.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/sh/kernel/irq.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/sh/kernel/irq.c linux-3.4.24-vs2.3.3.9/arch/sh/kernel/irq.c +--- linux-3.4.24/arch/sh/kernel/irq.c 2011-07-22 09:17:41.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/sh/kernel/irq.c 2012-05-21 16:15:04.000000000 +0000 @@ -14,6 +14,7 @@ #include #include @@ -727,9 +727,9 @@ diff -NurpP --minimal linux-3.4.23/arch/sh/kernel/irq.c linux-3.4.23-vs2.3.3.9/a #include #include #include -diff -NurpP --minimal linux-3.4.23/arch/sparc/Kconfig linux-3.4.23-vs2.3.3.9/arch/sparc/Kconfig ---- linux-3.4.23/arch/sparc/Kconfig 2012-12-11 12:37:18.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/sparc/Kconfig 2012-06-08 15:57:24.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/sparc/Kconfig linux-3.4.24-vs2.3.3.9/arch/sparc/Kconfig +--- linux-3.4.24/arch/sparc/Kconfig 2012-12-18 14:00:45.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/sparc/Kconfig 2012-06-08 13:57:24.000000000 +0000 @@ -599,6 +599,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -739,9 +739,9 @@ diff -NurpP --minimal linux-3.4.23/arch/sparc/Kconfig linux-3.4.23-vs2.3.3.9/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.23/arch/sparc/include/asm/unistd.h linux-3.4.23-vs2.3.3.9/arch/sparc/include/asm/unistd.h ---- linux-3.4.23/arch/sparc/include/asm/unistd.h 2012-01-09 16:14:07.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/sparc/include/asm/unistd.h 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/sparc/include/asm/unistd.h linux-3.4.24-vs2.3.3.9/arch/sparc/include/asm/unistd.h +--- linux-3.4.24/arch/sparc/include/asm/unistd.h 2012-01-09 15:14:07.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/sparc/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000 @@ -335,7 +335,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -751,9 +751,9 @@ diff -NurpP --minimal linux-3.4.23/arch/sparc/include/asm/unistd.h linux-3.4.23- #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-3.4.23/arch/sparc/kernel/systbls_32.S linux-3.4.23-vs2.3.3.9/arch/sparc/kernel/systbls_32.S ---- linux-3.4.23/arch/sparc/kernel/systbls_32.S 2012-01-09 16:14:09.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/sparc/kernel/systbls_32.S 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/sparc/kernel/systbls_32.S linux-3.4.24-vs2.3.3.9/arch/sparc/kernel/systbls_32.S +--- linux-3.4.24/arch/sparc/kernel/systbls_32.S 2012-01-09 15:14:09.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/sparc/kernel/systbls_32.S 2012-05-21 16:15:04.000000000 +0000 @@ -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.4.23/arch/sparc/kernel/systbls_32.S linux-3.4.23-v /*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.4.23/arch/sparc/kernel/systbls_64.S linux-3.4.23-vs2.3.3.9/arch/sparc/kernel/systbls_64.S ---- linux-3.4.23/arch/sparc/kernel/systbls_64.S 2012-12-11 12:37:18.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/sparc/kernel/systbls_64.S 2012-06-08 15:57:24.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/sparc/kernel/systbls_64.S linux-3.4.24-vs2.3.3.9/arch/sparc/kernel/systbls_64.S +--- linux-3.4.24/arch/sparc/kernel/systbls_64.S 2012-12-18 14:00:46.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/sparc/kernel/systbls_64.S 2012-06-08 13:57:24.000000000 +0000 @@ -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.4.23/arch/sparc/kernel/systbls_64.S linux-3.4.23-v /*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.4.23/arch/um/Kconfig.rest linux-3.4.23-vs2.3.3.9/arch/um/Kconfig.rest ---- linux-3.4.23/arch/um/Kconfig.rest 2012-01-09 16:14:09.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/um/Kconfig.rest 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/um/Kconfig.rest linux-3.4.24-vs2.3.3.9/arch/um/Kconfig.rest +--- linux-3.4.24/arch/um/Kconfig.rest 2012-01-09 15:14:09.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/um/Kconfig.rest 2012-05-21 16:15:04.000000000 +0000 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" source "fs/Kconfig" @@ -796,14 +796,14 @@ diff -NurpP --minimal linux-3.4.23/arch/um/Kconfig.rest linux-3.4.23-vs2.3.3.9/a source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.23/arch/um/include/shared/kern_constants.h linux-3.4.23-vs2.3.3.9/arch/um/include/shared/kern_constants.h ---- linux-3.4.23/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/um/include/shared/kern_constants.h 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/um/include/shared/kern_constants.h linux-3.4.24-vs2.3.3.9/arch/um/include/shared/kern_constants.h +--- linux-3.4.24/arch/um/include/shared/kern_constants.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/um/include/shared/kern_constants.h 2012-05-21 16:15:04.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../include/generated/asm-offsets.h" -diff -NurpP --minimal linux-3.4.23/arch/um/include/shared/user_constants.h linux-3.4.23-vs2.3.3.9/arch/um/include/shared/user_constants.h ---- linux-3.4.23/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/um/include/shared/user_constants.h 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/um/include/shared/user_constants.h linux-3.4.24-vs2.3.3.9/arch/um/include/shared/user_constants.h +--- linux-3.4.24/arch/um/include/shared/user_constants.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/um/include/shared/user_constants.h 2012-05-21 16:15:04.000000000 +0000 @@ -0,0 +1,40 @@ +/* + * DO NOT MODIFY. @@ -845,9 +845,9 @@ diff -NurpP --minimal linux-3.4.23/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.4.23/arch/x86/Kconfig linux-3.4.23-vs2.3.3.9/arch/x86/Kconfig ---- linux-3.4.23/arch/x86/Kconfig 2012-05-21 18:06:35.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/x86/Kconfig 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/x86/Kconfig linux-3.4.24-vs2.3.3.9/arch/x86/Kconfig +--- linux-3.4.24/arch/x86/Kconfig 2012-05-21 16:06:35.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/x86/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -2225,6 +2225,8 @@ source "fs/Kconfig" source "arch/x86/Kconfig.debug" @@ -857,9 +857,9 @@ diff -NurpP --minimal linux-3.4.23/arch/x86/Kconfig linux-3.4.23-vs2.3.3.9/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.23/arch/x86/syscalls/syscall_32.tbl linux-3.4.23-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl ---- linux-3.4.23/arch/x86/syscalls/syscall_32.tbl 2012-05-21 18:06:42.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/x86/syscalls/syscall_32.tbl linux-3.4.24-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl +--- linux-3.4.24/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:06:42.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:15:04.000000000 +0000 @@ -279,7 +279,7 @@ 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes compat_sys_utimes @@ -869,9 +869,9 @@ diff -NurpP --minimal linux-3.4.23/arch/x86/syscalls/syscall_32.tbl linux-3.4.23 274 i386 mbind sys_mbind 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy 276 i386 set_mempolicy sys_set_mempolicy -diff -NurpP --minimal linux-3.4.23/arch/x86/syscalls/syscall_64.tbl linux-3.4.23-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl ---- linux-3.4.23/arch/x86/syscalls/syscall_64.tbl 2012-12-11 12:37:18.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl 2012-09-16 20:49:11.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/arch/x86/syscalls/syscall_64.tbl linux-3.4.24-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl +--- linux-3.4.24/arch/x86/syscalls/syscall_64.tbl 2012-12-18 14:00:48.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl 2012-09-16 18:49:11.000000000 +0000 @@ -242,7 +242,7 @@ 233 common epoll_ctl sys_epoll_ctl 234 common tgkill sys_tgkill @@ -881,9 +881,9 @@ diff -NurpP --minimal linux-3.4.23/arch/x86/syscalls/syscall_64.tbl linux-3.4.23 237 common mbind sys_mbind 238 common set_mempolicy sys_set_mempolicy 239 common get_mempolicy sys_get_mempolicy -diff -NurpP --minimal linux-3.4.23/drivers/block/Kconfig linux-3.4.23-vs2.3.3.9/drivers/block/Kconfig ---- linux-3.4.23/drivers/block/Kconfig 2012-05-21 18:06:43.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/drivers/block/Kconfig 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/drivers/block/Kconfig linux-3.4.24-vs2.3.3.9/drivers/block/Kconfig +--- linux-3.4.24/drivers/block/Kconfig 2012-05-21 16:06:43.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/drivers/block/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -290,6 +290,13 @@ config BLK_DEV_CRYPTOLOOP source "drivers/block/drbd/Kconfig" @@ -898,9 +898,9 @@ diff -NurpP --minimal linux-3.4.23/drivers/block/Kconfig linux-3.4.23-vs2.3.3.9/ config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-3.4.23/drivers/block/Makefile linux-3.4.23-vs2.3.3.9/drivers/block/Makefile ---- linux-3.4.23/drivers/block/Makefile 2012-03-19 19:46:52.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/drivers/block/Makefile 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/drivers/block/Makefile linux-3.4.24-vs2.3.3.9/drivers/block/Makefile +--- linux-3.4.24/drivers/block/Makefile 2012-03-19 18:46:52.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/drivers/block/Makefile 2012-05-21 16:15:04.000000000 +0000 @@ -35,6 +35,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o obj-$(CONFIG_BLK_DEV_SX8) += sx8.o obj-$(CONFIG_BLK_DEV_UB) += ub.o @@ -909,9 +909,9 @@ diff -NurpP --minimal linux-3.4.23/drivers/block/Makefile linux-3.4.23-vs2.3.3.9 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-3.4.23/drivers/block/loop.c linux-3.4.23-vs2.3.3.9/drivers/block/loop.c ---- linux-3.4.23/drivers/block/loop.c 2012-05-21 18:06:43.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/drivers/block/loop.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/drivers/block/loop.c linux-3.4.24-vs2.3.3.9/drivers/block/loop.c +--- linux-3.4.24/drivers/block/loop.c 2012-05-21 16:06:43.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/drivers/block/loop.c 2012-05-21 16:15:04.000000000 +0000 @@ -76,6 +76,7 @@ #include #include @@ -936,7 +936,7 @@ diff -NurpP --minimal linux-3.4.23/drivers/block/loop.c linux-3.4.23-vs2.3.3.9/d memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE); memset(lo->lo_crypt_name, 0, LO_NAME_SIZE); memset(lo->lo_file_name, 0, LO_NAME_SIZE); -@@ -1042,7 +1045,7 @@ loop_set_status(struct loop_device *lo, +@@ -1042,7 +1045,7 @@ loop_set_status(struct loop_device *lo, if (lo->lo_encrypt_key_size && lo->lo_key_owner != uid && @@ -945,7 +945,7 @@ diff -NurpP --minimal linux-3.4.23/drivers/block/loop.c linux-3.4.23-vs2.3.3.9/d return -EPERM; if (lo->lo_state != Lo_bound) return -ENXIO; -@@ -1132,7 +1135,8 @@ loop_get_status(struct loop_device *lo, +@@ -1132,7 +1135,8 @@ loop_get_status(struct loop_device *lo, memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE); info->lo_encrypt_type = lo->lo_encryption ? lo->lo_encryption->number : 0; @@ -967,9 +967,9 @@ diff -NurpP --minimal linux-3.4.23/drivers/block/loop.c linux-3.4.23-vs2.3.3.9/d mutex_lock(&lo->lo_ctl_mutex); lo->lo_refcnt++; mutex_unlock(&lo->lo_ctl_mutex); -diff -NurpP --minimal linux-3.4.23/drivers/block/vroot.c linux-3.4.23-vs2.3.3.9/drivers/block/vroot.c ---- linux-3.4.23/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/drivers/block/vroot.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/drivers/block/vroot.c linux-3.4.24-vs2.3.3.9/drivers/block/vroot.c +--- linux-3.4.24/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/drivers/block/vroot.c 2012-05-21 16:15:04.000000000 +0000 @@ -0,0 +1,291 @@ +/* + * linux/drivers/block/vroot.c @@ -1262,9 +1262,9 @@ diff -NurpP --minimal linux-3.4.23/drivers/block/vroot.c linux-3.4.23-vs2.3.3.9/ + +#endif + -diff -NurpP --minimal linux-3.4.23/drivers/infiniband/Kconfig linux-3.4.23-vs2.3.3.9/drivers/infiniband/Kconfig ---- linux-3.4.23/drivers/infiniband/Kconfig 2012-03-19 19:46:54.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/drivers/infiniband/Kconfig 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/drivers/infiniband/Kconfig linux-3.4.24-vs2.3.3.9/drivers/infiniband/Kconfig +--- linux-3.4.24/drivers/infiniband/Kconfig 2012-03-19 18:46:54.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/drivers/infiniband/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM config INFINIBAND_ADDR_TRANS bool @@ -1274,9 +1274,9 @@ diff -NurpP --minimal linux-3.4.23/drivers/infiniband/Kconfig linux-3.4.23-vs2.3 default y source "drivers/infiniband/hw/mthca/Kconfig" -diff -NurpP --minimal linux-3.4.23/drivers/infiniband/core/addr.c linux-3.4.23-vs2.3.3.9/drivers/infiniband/core/addr.c ---- linux-3.4.23/drivers/infiniband/core/addr.c 2012-05-21 18:06:46.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/drivers/infiniband/core/addr.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/drivers/infiniband/core/addr.c linux-3.4.24-vs2.3.3.9/drivers/infiniband/core/addr.c +--- linux-3.4.24/drivers/infiniband/core/addr.c 2012-05-21 16:06:46.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/drivers/infiniband/core/addr.c 2012-05-21 16:15:04.000000000 +0000 @@ -263,7 +263,7 @@ static int addr6_resolve(struct sockaddr if (ipv6_addr_any(&fl6.saddr)) { @@ -1286,9 +1286,9 @@ diff -NurpP --minimal linux-3.4.23/drivers/infiniband/core/addr.c linux-3.4.23-v if (ret) goto put; -diff -NurpP --minimal linux-3.4.23/drivers/md/dm-ioctl.c linux-3.4.23-vs2.3.3.9/drivers/md/dm-ioctl.c ---- linux-3.4.23/drivers/md/dm-ioctl.c 2012-05-21 18:06:49.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/drivers/md/dm-ioctl.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/drivers/md/dm-ioctl.c linux-3.4.24-vs2.3.3.9/drivers/md/dm-ioctl.c +--- linux-3.4.24/drivers/md/dm-ioctl.c 2012-05-21 16:06:49.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/drivers/md/dm-ioctl.c 2012-05-21 16:15:04.000000000 +0000 @@ -16,6 +16,7 @@ #include #include @@ -1335,7 +1335,7 @@ diff -NurpP --minimal linux-3.4.23/drivers/md/dm-ioctl.c linux-3.4.23-vs2.3.3.9/ if (!hc) { dm_put(md); return NULL; -@@ -445,6 +450,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl +@@ -445,6 +450,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl static int remove_all(struct dm_ioctl *param, size_t param_size) { @@ -1345,7 +1345,7 @@ diff -NurpP --minimal linux-3.4.23/drivers/md/dm-ioctl.c linux-3.4.23-vs2.3.3.9/ dm_hash_remove_all(1); param->data_size = 0; return 0; -@@ -492,6 +500,8 @@ static int list_devices(struct dm_ioctl +@@ -492,6 +500,8 @@ static int list_devices(struct dm_ioctl */ for (i = 0; i < NUM_BUCKETS; i++) { list_for_each_entry (hc, _name_buckets + i, name_list) { @@ -1354,7 +1354,7 @@ diff -NurpP --minimal linux-3.4.23/drivers/md/dm-ioctl.c linux-3.4.23-vs2.3.3.9/ needed += sizeof(struct dm_name_list); needed += strlen(hc->name) + 1; needed += ALIGN_MASK; -@@ -515,6 +525,8 @@ static int list_devices(struct dm_ioctl +@@ -515,6 +525,8 @@ static int list_devices(struct dm_ioctl */ for (i = 0; i < NUM_BUCKETS; i++) { list_for_each_entry (hc, _name_buckets + i, name_list) { @@ -1374,9 +1374,9 @@ diff -NurpP --minimal linux-3.4.23/drivers/md/dm-ioctl.c linux-3.4.23-vs2.3.3.9/ return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-3.4.23/drivers/md/dm.c linux-3.4.23-vs2.3.3.9/drivers/md/dm.c ---- linux-3.4.23/drivers/md/dm.c 2012-12-11 12:37:20.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/drivers/md/dm.c 2012-12-08 01:53:53.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/drivers/md/dm.c linux-3.4.24-vs2.3.3.9/drivers/md/dm.c +--- linux-3.4.24/drivers/md/dm.c 2012-12-18 14:00:52.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/drivers/md/dm.c 2012-12-08 00:53:53.000000000 +0000 @@ -19,6 +19,7 @@ #include #include @@ -1393,7 +1393,7 @@ diff -NurpP --minimal linux-3.4.23/drivers/md/dm.c linux-3.4.23-vs2.3.3.9/driver unsigned long flags; -@@ -343,6 +345,7 @@ int dm_deleting_md(struct mapped_device +@@ -343,6 +345,7 @@ int dm_deleting_md(struct mapped_device static int dm_blk_open(struct block_device *bdev, fmode_t mode) { struct mapped_device *md; @@ -1450,9 +1450,9 @@ diff -NurpP --minimal linux-3.4.23/drivers/md/dm.c linux-3.4.23-vs2.3.3.9/driver md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad_queue; -diff -NurpP --minimal linux-3.4.23/drivers/md/dm.h linux-3.4.23-vs2.3.3.9/drivers/md/dm.h ---- linux-3.4.23/drivers/md/dm.h 2012-01-09 16:14:21.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/drivers/md/dm.h 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/drivers/md/dm.h linux-3.4.24-vs2.3.3.9/drivers/md/dm.h +--- linux-3.4.24/drivers/md/dm.h 2012-01-09 15:14:21.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/drivers/md/dm.h 2012-05-21 16:15:04.000000000 +0000 @@ -41,6 +41,8 @@ struct dm_dev_internal { struct dm_table; struct dm_md_mempools; @@ -1462,9 +1462,9 @@ diff -NurpP --minimal linux-3.4.23/drivers/md/dm.h linux-3.4.23-vs2.3.3.9/driver /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-3.4.23/drivers/net/tun.c linux-3.4.23-vs2.3.3.9/drivers/net/tun.c ---- linux-3.4.23/drivers/net/tun.c 2012-12-11 12:37:22.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/drivers/net/tun.c 2012-09-01 10:50:48.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/drivers/net/tun.c linux-3.4.24-vs2.3.3.9/drivers/net/tun.c +--- linux-3.4.24/drivers/net/tun.c 2012-12-18 14:00:55.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/drivers/net/tun.c 2012-09-01 08:50:48.000000000 +0000 @@ -64,6 +64,7 @@ #include #include @@ -1481,7 +1481,7 @@ diff -NurpP --minimal linux-3.4.23/drivers/net/tun.c linux-3.4.23-vs2.3.3.9/driv struct net_device *dev; netdev_features_t set_features; -@@ -910,6 +912,7 @@ static void tun_setup(struct net_device +@@ -910,6 +912,7 @@ static void tun_setup(struct net_device tun->owner = -1; tun->group = -1; @@ -1489,7 +1489,7 @@ diff -NurpP --minimal linux-3.4.23/drivers/net/tun.c linux-3.4.23-vs2.3.3.9/driv dev->ethtool_ops = &tun_ethtool_ops; dev->destructor = tun_free_netdev; -@@ -1068,7 +1071,7 @@ static int tun_set_iff(struct net *net, +@@ -1068,7 +1071,7 @@ static int tun_set_iff(struct net *net, if (((tun->owner != -1 && cred->euid != tun->owner) || (tun->group != -1 && !in_egroup_p(tun->group))) && @@ -1498,7 +1498,7 @@ diff -NurpP --minimal linux-3.4.23/drivers/net/tun.c linux-3.4.23-vs2.3.3.9/driv return -EPERM; err = security_tun_dev_attach(tun->socket.sk); if (err < 0) -@@ -1082,7 +1085,7 @@ static int tun_set_iff(struct net *net, +@@ -1082,7 +1085,7 @@ static int tun_set_iff(struct net *net, char *name; unsigned long flags = 0; @@ -1507,7 +1507,7 @@ diff -NurpP --minimal linux-3.4.23/drivers/net/tun.c linux-3.4.23-vs2.3.3.9/driv return -EPERM; err = security_tun_dev_create(); if (err < 0) -@@ -1152,6 +1155,9 @@ static int tun_set_iff(struct net *net, +@@ -1152,6 +1155,9 @@ static int tun_set_iff(struct net *net, sk->sk_destruct = tun_sock_destruct; @@ -1517,7 +1517,7 @@ diff -NurpP --minimal linux-3.4.23/drivers/net/tun.c linux-3.4.23-vs2.3.3.9/driv err = tun_attach(tun, file); if (err < 0) goto failed; -@@ -1335,6 +1341,16 @@ static long __tun_chr_ioctl(struct file +@@ -1335,6 +1341,16 @@ static long __tun_chr_ioctl(struct file tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group); break; @@ -1534,9 +1534,9 @@ diff -NurpP --minimal linux-3.4.23/drivers/net/tun.c linux-3.4.23-vs2.3.3.9/driv case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-3.4.23/drivers/tty/sysrq.c linux-3.4.23-vs2.3.3.9/drivers/tty/sysrq.c ---- linux-3.4.23/drivers/tty/sysrq.c 2012-05-21 18:07:16.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/drivers/tty/sysrq.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/drivers/tty/sysrq.c linux-3.4.24-vs2.3.3.9/drivers/tty/sysrq.c +--- linux-3.4.24/drivers/tty/sysrq.c 2012-05-21 16:07:16.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/drivers/tty/sysrq.c 2012-05-21 16:15:04.000000000 +0000 @@ -41,6 +41,7 @@ #include #include @@ -1588,9 +1588,9 @@ diff -NurpP --minimal linux-3.4.23/drivers/tty/sysrq.c linux-3.4.23-vs2.3.3.9/dr else retval = -1; return retval; -diff -NurpP --minimal linux-3.4.23/drivers/tty/tty_io.c linux-3.4.23-vs2.3.3.9/drivers/tty/tty_io.c ---- linux-3.4.23/drivers/tty/tty_io.c 2012-05-21 18:07:16.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/drivers/tty/tty_io.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/drivers/tty/tty_io.c linux-3.4.24-vs2.3.3.9/drivers/tty/tty_io.c +--- linux-3.4.24/drivers/tty/tty_io.c 2012-05-21 16:07:16.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/drivers/tty/tty_io.c 2012-05-21 16:15:04.000000000 +0000 @@ -104,6 +104,7 @@ #include @@ -1617,9 +1617,9 @@ diff -NurpP --minimal linux-3.4.23/drivers/tty/tty_io.c linux-3.4.23-vs2.3.3.9/d if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-3.4.23/fs/attr.c linux-3.4.23-vs2.3.3.9/fs/attr.c ---- linux-3.4.23/fs/attr.c 2012-12-11 12:37:25.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/attr.c 2012-06-28 16:45:07.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/attr.c linux-3.4.24-vs2.3.3.9/fs/attr.c +--- linux-3.4.24/fs/attr.c 2012-12-18 14:01:04.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/attr.c 2012-06-28 14:45:07.000000000 +0000 @@ -14,6 +14,9 @@ #include #include @@ -1660,9 +1660,9 @@ diff -NurpP --minimal linux-3.4.23/fs/attr.c linux-3.4.23-vs2.3.3.9/fs/attr.c if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-3.4.23/fs/block_dev.c linux-3.4.23-vs2.3.3.9/fs/block_dev.c ---- linux-3.4.23/fs/block_dev.c 2012-05-21 18:07:18.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/block_dev.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/block_dev.c linux-3.4.24-vs2.3.3.9/fs/block_dev.c +--- linux-3.4.24/fs/block_dev.c 2012-05-21 16:07:18.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/block_dev.c 2012-05-21 16:15:04.000000000 +0000 @@ -27,6 +27,7 @@ #include #include @@ -1700,9 +1700,9 @@ diff -NurpP --minimal linux-3.4.23/fs/block_dev.c linux-3.4.23-vs2.3.3.9/fs/bloc if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-3.4.23/fs/btrfs/ctree.h linux-3.4.23-vs2.3.3.9/fs/btrfs/ctree.h ---- linux-3.4.23/fs/btrfs/ctree.h 2012-05-21 18:07:18.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/btrfs/ctree.h 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/btrfs/ctree.h linux-3.4.24-vs2.3.3.9/fs/btrfs/ctree.h +--- linux-3.4.24/fs/btrfs/ctree.h 2012-05-21 16:07:18.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/btrfs/ctree.h 2012-05-21 16:15:04.000000000 +0000 @@ -668,11 +668,14 @@ struct btrfs_inode_item { /* modification sequence number for NFS */ __le64 sequence; @@ -1736,7 +1736,7 @@ diff -NurpP --minimal linux-3.4.23/fs/btrfs/ctree.h linux-3.4.23-vs2.3.3.9/fs/bt BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32); BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64); BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64); -@@ -1815,6 +1821,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct +@@ -1815,6 +1821,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32); @@ -1755,9 +1755,9 @@ diff -NurpP --minimal linux-3.4.23/fs/btrfs/ctree.h linux-3.4.23-vs2.3.3.9/fs/bt 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.4.23/fs/btrfs/disk-io.c linux-3.4.23-vs2.3.3.9/fs/btrfs/disk-io.c ---- linux-3.4.23/fs/btrfs/disk-io.c 2012-05-21 18:07:18.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/btrfs/disk-io.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/btrfs/disk-io.c linux-3.4.24-vs2.3.3.9/fs/btrfs/disk-io.c +--- linux-3.4.24/fs/btrfs/disk-io.c 2012-05-21 16:07:18.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/btrfs/disk-io.c 2012-05-21 16:15:04.000000000 +0000 @@ -2083,6 +2083,9 @@ int open_ctree(struct super_block *sb, goto fail_alloc; } @@ -1768,9 +1768,9 @@ diff -NurpP --minimal linux-3.4.23/fs/btrfs/disk-io.c linux-3.4.23-vs2.3.3.9/fs/ features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-3.4.23/fs/btrfs/inode.c linux-3.4.23-vs2.3.3.9/fs/btrfs/inode.c ---- linux-3.4.23/fs/btrfs/inode.c 2012-12-11 12:37:25.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/btrfs/inode.c 2012-06-28 16:45:07.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/btrfs/inode.c linux-3.4.24-vs2.3.3.9/fs/btrfs/inode.c +--- linux-3.4.24/fs/btrfs/inode.c 2012-12-18 14:01:04.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/btrfs/inode.c 2012-06-28 14:45:07.000000000 +0000 @@ -39,6 +39,7 @@ #include #include @@ -1835,9 +1835,9 @@ diff -NurpP --minimal linux-3.4.23/fs/btrfs/inode.c linux-3.4.23-vs2.3.3.9/fs/bt .get_acl = btrfs_get_acl, }; -diff -NurpP --minimal linux-3.4.23/fs/btrfs/ioctl.c linux-3.4.23-vs2.3.3.9/fs/btrfs/ioctl.c ---- linux-3.4.23/fs/btrfs/ioctl.c 2012-05-21 18:07:19.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/btrfs/ioctl.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/btrfs/ioctl.c linux-3.4.24-vs2.3.3.9/fs/btrfs/ioctl.c +--- linux-3.4.24/fs/btrfs/ioctl.c 2012-05-21 16:07:19.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/btrfs/ioctl.c 2012-05-21 16:15:04.000000000 +0000 @@ -71,10 +71,13 @@ static unsigned int btrfs_flags_to_ioctl { unsigned int iflags = 0; @@ -2010,9 +2010,9 @@ diff -NurpP --minimal linux-3.4.23/fs/btrfs/ioctl.c linux-3.4.23-vs2.3.3.9/fs/bt if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-3.4.23/fs/btrfs/super.c linux-3.4.23-vs2.3.3.9/fs/btrfs/super.c ---- linux-3.4.23/fs/btrfs/super.c 2012-05-21 18:07:19.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/btrfs/super.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/btrfs/super.c linux-3.4.24-vs2.3.3.9/fs/btrfs/super.c +--- linux-3.4.24/fs/btrfs/super.c 2012-05-21 16:07:19.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/btrfs/super.c 2012-05-21 16:15:04.000000000 +0000 @@ -279,7 +279,7 @@ enum { Opt_no_space_cache, Opt_recovery, Opt_skip_balance, Opt_check_integrity, Opt_check_integrity_including_extent_data, @@ -2068,9 +2068,9 @@ diff -NurpP --minimal linux-3.4.23/fs/btrfs/super.c linux-3.4.23-vs2.3.3.9/fs/bt if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) return 0; -diff -NurpP --minimal linux-3.4.23/fs/char_dev.c linux-3.4.23-vs2.3.3.9/fs/char_dev.c ---- linux-3.4.23/fs/char_dev.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/char_dev.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/char_dev.c linux-3.4.24-vs2.3.3.9/fs/char_dev.c +--- linux-3.4.24/fs/char_dev.c 2012-03-19 18:47:25.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/char_dev.c 2012-05-21 16:15:04.000000000 +0000 @@ -21,6 +21,8 @@ #include #include @@ -2103,9 +2103,9 @@ diff -NurpP --minimal linux-3.4.23/fs/char_dev.c linux-3.4.23-vs2.3.3.9/fs/char_ if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-3.4.23/fs/dcache.c linux-3.4.23-vs2.3.3.9/fs/dcache.c ---- linux-3.4.23/fs/dcache.c 2012-12-11 12:37:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/dcache.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/dcache.c linux-3.4.24-vs2.3.3.9/fs/dcache.c +--- linux-3.4.24/fs/dcache.c 2012-12-18 14:01:04.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/dcache.c 2012-10-22 13:09:53.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -2149,7 +2149,7 @@ diff -NurpP --minimal linux-3.4.23/fs/dcache.c linux-3.4.23-vs2.3.3.9/fs/dcache. spin_lock_init(&dentry->d_lock); seqcount_init(&dentry->d_seq); dentry->d_inode = NULL; -@@ -1941,6 +1949,7 @@ struct dentry *__d_lookup(struct dentry +@@ -1941,6 +1949,7 @@ struct dentry *__d_lookup(struct dentry } dentry->d_count++; @@ -2157,9 +2157,9 @@ diff -NurpP --minimal linux-3.4.23/fs/dcache.c linux-3.4.23-vs2.3.3.9/fs/dcache. found = dentry; spin_unlock(&dentry->d_lock); break; -diff -NurpP --minimal linux-3.4.23/fs/devpts/inode.c linux-3.4.23-vs2.3.3.9/fs/devpts/inode.c ---- linux-3.4.23/fs/devpts/inode.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/devpts/inode.c 2012-05-21 18:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/devpts/inode.c linux-3.4.24-vs2.3.3.9/fs/devpts/inode.c +--- linux-3.4.24/fs/devpts/inode.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/devpts/inode.c 2012-05-21 16:15:04.000000000 +0000 @@ -25,6 +25,7 @@ #include #include @@ -2247,10 +2247,10 @@ diff -NurpP --minimal linux-3.4.23/fs/devpts/inode.c linux-3.4.23-vs2.3.3.9/fs/d inode->i_private = tty; tty->driver_data = inode; -diff -NurpP --minimal linux-3.4.23/fs/ext2/balloc.c linux-3.4.23-vs2.3.3.9/fs/ext2/balloc.c ---- linux-3.4.23/fs/ext2/balloc.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ext2/balloc.c 2012-05-21 18:15:04.000000000 +0200 -@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block +diff -NurpP --minimal linux-3.4.24/fs/ext2/balloc.c linux-3.4.24-vs2.3.3.9/fs/ext2/balloc.c +--- linux-3.4.24/fs/ext2/balloc.c 2012-01-09 15:14:54.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext2/balloc.c 2012-05-21 16:15:04.000000000 +0000 +@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block start = 0; end = EXT2_BLOCKS_PER_GROUP(sb); } @@ -2258,9 +2258,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext2/balloc.c linux-3.4.23-vs2.3.3.9/fs/ex BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-3.4.23/fs/ext2/ext2.h linux-3.4.23-vs2.3.3.9/fs/ext2/ext2.h ---- linux-3.4.23/fs/ext2/ext2.h 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ext2/ext2.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext2/ext2.h linux-3.4.24-vs2.3.3.9/fs/ext2/ext2.h +--- linux-3.4.24/fs/ext2/ext2.h 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext2/ext2.h 2012-05-21 16:15:05.000000000 +0000 @@ -244,8 +244,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) */ @@ -2300,7 +2300,7 @@ diff -NurpP --minimal linux-3.4.23/fs/ext2/ext2.h linux-3.4.23-vs2.3.3.9/fs/ext2 #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt -@@ -757,6 +764,7 @@ extern void ext2_set_inode_flags(struct +@@ -757,6 +764,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, u64 start, u64 len); @@ -2308,18 +2308,18 @@ diff -NurpP --minimal linux-3.4.23/fs/ext2/ext2.h linux-3.4.23-vs2.3.3.9/fs/ext2 /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.4.23/fs/ext2/file.c linux-3.4.23-vs2.3.3.9/fs/ext2/file.c ---- linux-3.4.23/fs/ext2/file.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ext2/file.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext2/file.c linux-3.4.24-vs2.3.3.9/fs/ext2/file.c +--- linux-3.4.24/fs/ext2/file.c 2011-10-24 16:45:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext2/file.c 2012-05-21 16:15:05.000000000 +0000 @@ -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.4.23/fs/ext2/ialloc.c linux-3.4.23-vs2.3.3.9/fs/ext2/ialloc.c ---- linux-3.4.23/fs/ext2/ialloc.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ext2/ialloc.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext2/ialloc.c linux-3.4.24-vs2.3.3.9/fs/ext2/ialloc.c +--- linux-3.4.24/fs/ext2/ialloc.c 2012-03-19 18:47:25.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext2/ialloc.c 2012-05-21 16:15:05.000000000 +0000 @@ -17,6 +17,7 @@ #include #include @@ -2336,9 +2336,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext2/ialloc.c linux-3.4.23-vs2.3.3.9/fs/ex } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.4.23/fs/ext2/inode.c linux-3.4.23-vs2.3.3.9/fs/ext2/inode.c ---- linux-3.4.23/fs/ext2/inode.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ext2/inode.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext2/inode.c linux-3.4.24-vs2.3.3.9/fs/ext2/inode.c +--- linux-3.4.24/fs/ext2/inode.c 2012-03-19 18:47:25.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext2/inode.c 2012-05-21 16:15:05.000000000 +0000 @@ -31,6 +31,7 @@ #include #include @@ -2347,7 +2347,7 @@ diff -NurpP --minimal linux-3.4.23/fs/ext2/inode.c linux-3.4.23-vs2.3.3.9/fs/ext #include "ext2.h" #include "acl.h" #include "xip.h" -@@ -1162,7 +1163,7 @@ static void ext2_truncate_blocks(struct +@@ -1162,7 +1163,7 @@ static void ext2_truncate_blocks(struct return; if (ext2_inode_is_fast_symlink(inode)) return; @@ -2476,7 +2476,7 @@ diff -NurpP --minimal linux-3.4.23/fs/ext2/inode.c linux-3.4.23-vs2.3.3.9/fs/ext raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); raw_inode->i_size = cpu_to_le32(inode->i_size); raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec); -@@ -1530,7 +1565,8 @@ int ext2_setattr(struct dentry *dentry, +@@ -1530,7 +1565,8 @@ int ext2_setattr(struct dentry *dentry, if (is_quota_modification(inode, iattr)) dquot_initialize(inode); if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) || @@ -2486,9 +2486,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext2/inode.c linux-3.4.23-vs2.3.3.9/fs/ext error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-3.4.23/fs/ext2/ioctl.c linux-3.4.23-vs2.3.3.9/fs/ext2/ioctl.c ---- linux-3.4.23/fs/ext2/ioctl.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ext2/ioctl.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext2/ioctl.c linux-3.4.24-vs2.3.3.9/fs/ext2/ioctl.c +--- linux-3.4.24/fs/ext2/ioctl.c 2012-03-19 18:47:25.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext2/ioctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -17,6 +17,16 @@ #include @@ -2538,9 +2538,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext2/ioctl.c linux-3.4.23-vs2.3.3.9/fs/ext flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.4.23/fs/ext2/namei.c linux-3.4.23-vs2.3.3.9/fs/ext2/namei.c ---- linux-3.4.23/fs/ext2/namei.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ext2/namei.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext2/namei.c linux-3.4.24-vs2.3.3.9/fs/ext2/namei.c +--- linux-3.4.24/fs/ext2/namei.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext2/namei.c 2012-05-21 16:15:05.000000000 +0000 @@ -32,6 +32,7 @@ #include @@ -2565,9 +2565,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext2/namei.c linux-3.4.23-vs2.3.3.9/fs/ext .get_acl = ext2_get_acl, }; -diff -NurpP --minimal linux-3.4.23/fs/ext2/super.c linux-3.4.23-vs2.3.3.9/fs/ext2/super.c ---- linux-3.4.23/fs/ext2/super.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ext2/super.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext2/super.c linux-3.4.24-vs2.3.3.9/fs/ext2/super.c +--- linux-3.4.24/fs/ext2/super.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext2/super.c 2012-05-21 16:15:05.000000000 +0000 @@ -393,7 +393,8 @@ enum { Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, @@ -2588,7 +2588,7 @@ diff -NurpP --minimal linux-3.4.23/fs/ext2/super.c linux-3.4.23-vs2.3.3.9/fs/ext {Opt_grpquota, "grpquota"}, {Opt_ignore, "noquota"}, {Opt_quota, "quota"}, -@@ -491,6 +495,20 @@ static int parse_options(char *options, +@@ -491,6 +495,20 @@ static int parse_options(char *options, case Opt_nouid32: set_opt (sbi->s_mount_opt, NO_UID32); break; @@ -2618,10 +2618,11 @@ diff -NurpP --minimal linux-3.4.23/fs/ext2/super.c linux-3.4.23-vs2.3.3.9/fs/ext sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -@@ -1223,6 +1243,14 @@ static int ext2_remount (struct super_bl +@@ -1222,6 +1242,14 @@ static int ext2_remount (struct super_bl + err = -EINVAL; goto restore_opts; } - ++ + if ((sbi->s_mount_opt & EXT2_MOUNT_TAGGED) && + !(sb->s_flags & MS_TAGGED)) { + printk("EXT2-fs: %s: tagging not permitted on remount.\n", @@ -2629,13 +2630,12 @@ diff -NurpP --minimal linux-3.4.23/fs/ext2/super.c linux-3.4.23-vs2.3.3.9/fs/ext + err = -EINVAL; + goto restore_opts; + } -+ + sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); - -diff -NurpP --minimal linux-3.4.23/fs/ext3/ext3.h linux-3.4.23-vs2.3.3.9/fs/ext3/ext3.h ---- linux-3.4.23/fs/ext3/ext3.h 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ext3/ext3.h 2012-05-21 19:13:31.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext3/ext3.h linux-3.4.24-vs2.3.3.9/fs/ext3/ext3.h +--- linux-3.4.24/fs/ext3/ext3.h 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext3/ext3.h 2012-05-21 17:13:31.000000000 +0000 @@ -151,10 +151,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) */ @@ -2679,7 +2679,7 @@ diff -NurpP --minimal linux-3.4.23/fs/ext3/ext3.h linux-3.4.23-vs2.3.3.9/fs/ext3 /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */ #ifndef _LINUX_EXT2_FS_H -@@ -1057,6 +1064,7 @@ extern void ext3_get_inode_flags(struct +@@ -1057,6 +1064,7 @@ extern void ext3_get_inode_flags(struct extern void ext3_set_aops(struct inode *inode); extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, u64 start, u64 len); @@ -2687,9 +2687,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext3/ext3.h linux-3.4.23-vs2.3.3.9/fs/ext3 /* ioctl.c */ extern long ext3_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.4.23/fs/ext3/file.c linux-3.4.23-vs2.3.3.9/fs/ext3/file.c ---- linux-3.4.23/fs/ext3/file.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ext3/file.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext3/file.c linux-3.4.24-vs2.3.3.9/fs/ext3/file.c +--- linux-3.4.24/fs/ext3/file.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext3/file.c 2012-05-21 16:15:05.000000000 +0000 @@ -76,5 +76,6 @@ const struct inode_operations ext3_file_ #endif .get_acl = ext3_get_acl, @@ -2697,9 +2697,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext3/file.c linux-3.4.23-vs2.3.3.9/fs/ext3 + .sync_flags = ext3_sync_flags, }; -diff -NurpP --minimal linux-3.4.23/fs/ext3/ialloc.c linux-3.4.23-vs2.3.3.9/fs/ext3/ialloc.c ---- linux-3.4.23/fs/ext3/ialloc.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ext3/ialloc.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext3/ialloc.c linux-3.4.24-vs2.3.3.9/fs/ext3/ialloc.c +--- linux-3.4.24/fs/ext3/ialloc.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext3/ialloc.c 2012-05-21 16:15:05.000000000 +0000 @@ -14,6 +14,7 @@ #include @@ -2716,9 +2716,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext3/ialloc.c linux-3.4.23-vs2.3.3.9/fs/ex } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.4.23/fs/ext3/inode.c linux-3.4.23-vs2.3.3.9/fs/ext3/inode.c ---- linux-3.4.23/fs/ext3/inode.c 2012-12-11 12:37:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ext3/inode.c 2012-09-16 20:49:11.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext3/inode.c linux-3.4.24-vs2.3.3.9/fs/ext3/inode.c +--- linux-3.4.24/fs/ext3/inode.c 2012-12-18 14:01:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext3/inode.c 2012-09-16 18:49:11.000000000 +0000 @@ -27,6 +27,8 @@ #include #include @@ -2874,7 +2874,7 @@ diff -NurpP --minimal linux-3.4.23/fs/ext3/inode.c linux-3.4.23-vs2.3.3.9/fs/ext raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); disksize = cpu_to_le32(ei->i_disksize); if (disksize != raw_inode->i_size) { -@@ -3274,7 +3311,8 @@ int ext3_setattr(struct dentry *dentry, +@@ -3274,7 +3311,8 @@ int ext3_setattr(struct dentry *dentry, if (is_quota_modification(inode, attr)) dquot_initialize(inode); if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || @@ -2884,7 +2884,7 @@ diff -NurpP --minimal linux-3.4.23/fs/ext3/inode.c linux-3.4.23-vs2.3.3.9/fs/ext handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, -@@ -3296,6 +3334,8 @@ int ext3_setattr(struct dentry *dentry, +@@ -3296,6 +3334,8 @@ int ext3_setattr(struct dentry *dentry, inode->i_uid = attr->ia_uid; if (attr->ia_valid & ATTR_GID) inode->i_gid = attr->ia_gid; @@ -2893,9 +2893,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext3/inode.c linux-3.4.23-vs2.3.3.9/fs/ext error = ext3_mark_inode_dirty(handle, inode); ext3_journal_stop(handle); } -diff -NurpP --minimal linux-3.4.23/fs/ext3/ioctl.c linux-3.4.23-vs2.3.3.9/fs/ext3/ioctl.c ---- linux-3.4.23/fs/ext3/ioctl.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ext3/ioctl.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext3/ioctl.c linux-3.4.24-vs2.3.3.9/fs/ext3/ioctl.c +--- linux-3.4.24/fs/ext3/ioctl.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext3/ioctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -12,6 +12,34 @@ #include #include "ext3.h" @@ -2963,9 +2963,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext3/ioctl.c linux-3.4.23-vs2.3.3.9/fs/ext flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.4.23/fs/ext3/namei.c linux-3.4.23-vs2.3.3.9/fs/ext3/namei.c ---- linux-3.4.23/fs/ext3/namei.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ext3/namei.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext3/namei.c linux-3.4.24-vs2.3.3.9/fs/ext3/namei.c +--- linux-3.4.24/fs/ext3/namei.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext3/namei.c 2012-05-21 16:15:05.000000000 +0000 @@ -25,6 +25,8 @@ */ @@ -2991,9 +2991,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext3/namei.c linux-3.4.23-vs2.3.3.9/fs/ext .get_acl = ext3_get_acl, }; -diff -NurpP --minimal linux-3.4.23/fs/ext3/super.c linux-3.4.23-vs2.3.3.9/fs/ext3/super.c ---- linux-3.4.23/fs/ext3/super.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ext3/super.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext3/super.c linux-3.4.24-vs2.3.3.9/fs/ext3/super.c +--- linux-3.4.24/fs/ext3/super.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext3/super.c 2012-05-21 16:15:05.000000000 +0000 @@ -820,7 +820,8 @@ enum { Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, @@ -3060,9 +3060,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext3/super.c linux-3.4.23-vs2.3.3.9/fs/ext sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.4.23/fs/ext4/ext4.h linux-3.4.23-vs2.3.3.9/fs/ext4/ext4.h ---- linux-3.4.23/fs/ext4/ext4.h 2012-12-11 12:37:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ext4/ext4.h 2012-09-01 10:50:49.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext4/ext4.h linux-3.4.24-vs2.3.3.9/fs/ext4/ext4.h +--- linux-3.4.24/fs/ext4/ext4.h 2012-12-18 14:01:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext4/ext4.h 2012-09-01 08:50:49.000000000 +0000 @@ -380,8 +380,12 @@ struct flex_groups { #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ @@ -3110,9 +3110,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext4/ext4.h linux-3.4.23-vs2.3.3.9/fs/ext4 /* 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.4.23/fs/ext4/file.c linux-3.4.23-vs2.3.3.9/fs/ext4/file.c ---- linux-3.4.23/fs/ext4/file.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ext4/file.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext4/file.c linux-3.4.24-vs2.3.3.9/fs/ext4/file.c +--- linux-3.4.24/fs/ext4/file.c 2012-01-09 15:14:54.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext4/file.c 2012-05-21 16:15:05.000000000 +0000 @@ -258,5 +258,6 @@ const struct inode_operations ext4_file_ #endif .get_acl = ext4_get_acl, @@ -3120,9 +3120,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext4/file.c linux-3.4.23-vs2.3.3.9/fs/ext4 + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-3.4.23/fs/ext4/ialloc.c linux-3.4.23-vs2.3.3.9/fs/ext4/ialloc.c ---- linux-3.4.23/fs/ext4/ialloc.c 2012-12-11 12:37:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ext4/ialloc.c 2012-11-06 18:02:35.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/fs/ext4/ialloc.c linux-3.4.24-vs2.3.3.9/fs/ext4/ialloc.c +--- linux-3.4.24/fs/ext4/ialloc.c 2012-12-18 14:01:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext4/ialloc.c 2012-11-06 17:02:35.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -3139,9 +3139,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext4/ialloc.c linux-3.4.23-vs2.3.3.9/fs/ex } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.4.23/fs/ext4/inode.c linux-3.4.23-vs2.3.3.9/fs/ext4/inode.c ---- linux-3.4.23/fs/ext4/inode.c 2012-12-11 12:37:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ext4/inode.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext4/inode.c linux-3.4.24-vs2.3.3.9/fs/ext4/inode.c +--- linux-3.4.24/fs/ext4/inode.c 2012-12-18 14:01:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext4/inode.c 2012-10-22 13:09:53.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -3300,7 +3300,7 @@ diff -NurpP --minimal linux-3.4.23/fs/ext4/inode.c linux-3.4.23-vs2.3.3.9/fs/ext raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode); -@@ -4111,7 +4146,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -4111,7 +4146,8 @@ int ext4_setattr(struct dentry *dentry, if (is_quota_modification(inode, attr)) dquot_initialize(inode); if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || @@ -3310,7 +3310,7 @@ diff -NurpP --minimal linux-3.4.23/fs/ext4/inode.c linux-3.4.23-vs2.3.3.9/fs/ext handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, -@@ -4133,6 +4169,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -4133,6 +4169,8 @@ int ext4_setattr(struct dentry *dentry, inode->i_uid = attr->ia_uid; if (attr->ia_valid & ATTR_GID) inode->i_gid = attr->ia_gid; @@ -3319,9 +3319,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext4/inode.c linux-3.4.23-vs2.3.3.9/fs/ext error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-3.4.23/fs/ext4/ioctl.c linux-3.4.23-vs2.3.3.9/fs/ext4/ioctl.c ---- linux-3.4.23/fs/ext4/ioctl.c 2012-12-11 12:37:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ext4/ioctl.c 2012-09-01 10:50:49.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext4/ioctl.c linux-3.4.24-vs2.3.3.9/fs/ext4/ioctl.c +--- linux-3.4.24/fs/ext4/ioctl.c 2012-12-18 14:01:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext4/ioctl.c 2012-09-01 08:50:49.000000000 +0000 @@ -14,12 +14,40 @@ #include #include @@ -3386,9 +3386,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext4/ioctl.c linux-3.4.23-vs2.3.3.9/fs/ext if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-3.4.23/fs/ext4/namei.c linux-3.4.23-vs2.3.3.9/fs/ext4/namei.c ---- linux-3.4.23/fs/ext4/namei.c 2012-12-11 12:37:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ext4/namei.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext4/namei.c linux-3.4.24-vs2.3.3.9/fs/ext4/namei.c +--- linux-3.4.24/fs/ext4/namei.c 2012-12-18 14:01:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext4/namei.c 2012-10-22 13:09:53.000000000 +0000 @@ -34,6 +34,7 @@ #include #include @@ -3413,9 +3413,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext4/namei.c linux-3.4.23-vs2.3.3.9/fs/ext }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-3.4.23/fs/ext4/super.c linux-3.4.23-vs2.3.3.9/fs/ext4/super.c ---- linux-3.4.23/fs/ext4/super.c 2012-12-11 12:37:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ext4/super.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ext4/super.c linux-3.4.24-vs2.3.3.9/fs/ext4/super.c +--- linux-3.4.24/fs/ext4/super.c 2012-12-18 14:01:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ext4/super.c 2012-10-22 13:09:53.000000000 +0000 @@ -1188,6 +1188,7 @@ enum { Opt_inode_readahead_blks, Opt_journal_ioprio, Opt_dioread_nolock, Opt_dioread_lock, @@ -3480,9 +3480,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ext4/super.c linux-3.4.23-vs2.3.3.9/fs/ext sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.4.23/fs/fcntl.c linux-3.4.23-vs2.3.3.9/fs/fcntl.c ---- linux-3.4.23/fs/fcntl.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/fcntl.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/fcntl.c linux-3.4.24-vs2.3.3.9/fs/fcntl.c +--- linux-3.4.24/fs/fcntl.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/fcntl.c 2012-05-21 16:15:05.000000000 +0000 @@ -20,6 +20,7 @@ #include #include @@ -3509,9 +3509,9 @@ diff -NurpP --minimal linux-3.4.23/fs/fcntl.c linux-3.4.23-vs2.3.3.9/fs/fcntl.c if (unlikely(filp->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) { -diff -NurpP --minimal linux-3.4.23/fs/file.c linux-3.4.23-vs2.3.3.9/fs/file.c ---- linux-3.4.23/fs/file.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/file.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/file.c linux-3.4.24-vs2.3.3.9/fs/file.c +--- linux-3.4.24/fs/file.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/file.c 2012-05-21 16:15:05.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -3537,9 +3537,9 @@ diff -NurpP --minimal linux-3.4.23/fs/file.c linux-3.4.23-vs2.3.3.9/fs/file.c #if 1 /* Sanity check */ if (rcu_dereference_raw(fdt->fd[fd]) != NULL) { -diff -NurpP --minimal linux-3.4.23/fs/file_table.c linux-3.4.23-vs2.3.3.9/fs/file_table.c ---- linux-3.4.23/fs/file_table.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/file_table.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/file_table.c linux-3.4.24-vs2.3.3.9/fs/file_table.c +--- linux-3.4.24/fs/file_table.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/file_table.c 2012-05-21 16:15:05.000000000 +0000 @@ -24,6 +24,8 @@ #include #include @@ -3576,9 +3576,9 @@ diff -NurpP --minimal linux-3.4.23/fs/file_table.c linux-3.4.23-vs2.3.3.9/fs/fil file_sb_list_del(file); file_free(file); } -diff -NurpP --minimal linux-3.4.23/fs/fs_struct.c linux-3.4.23-vs2.3.3.9/fs/fs_struct.c ---- linux-3.4.23/fs/fs_struct.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/fs_struct.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/fs_struct.c linux-3.4.24-vs2.3.3.9/fs/fs_struct.c +--- linux-3.4.24/fs/fs_struct.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/fs_struct.c 2012-05-21 16:15:05.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -3595,7 +3595,7 @@ diff -NurpP --minimal linux-3.4.23/fs/fs_struct.c linux-3.4.23-vs2.3.3.9/fs/fs_s kmem_cache_free(fs_cachep, fs); } -@@ -136,6 +138,7 @@ struct fs_struct *copy_fs_struct(struct +@@ -136,6 +138,7 @@ struct fs_struct *copy_fs_struct(struct fs->pwd = old->pwd; path_get_longterm(&fs->pwd); spin_unlock(&old->lock); @@ -3603,9 +3603,9 @@ diff -NurpP --minimal linux-3.4.23/fs/fs_struct.c linux-3.4.23-vs2.3.3.9/fs/fs_s } return fs; } -diff -NurpP --minimal linux-3.4.23/fs/gfs2/file.c linux-3.4.23-vs2.3.3.9/fs/gfs2/file.c ---- linux-3.4.23/fs/gfs2/file.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/gfs2/file.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/gfs2/file.c linux-3.4.24-vs2.3.3.9/fs/gfs2/file.c +--- linux-3.4.24/fs/gfs2/file.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/gfs2/file.c 2012-05-21 16:15:05.000000000 +0000 @@ -142,6 +142,9 @@ static const u32 fsflags_to_gfs2[32] = { [7] = GFS2_DIF_NOATIME, [12] = GFS2_DIF_EXHASH, @@ -3728,9 +3728,9 @@ diff -NurpP --minimal linux-3.4.23/fs/gfs2/file.c linux-3.4.23-vs2.3.3.9/fs/gfs2 static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-3.4.23/fs/gfs2/inode.h linux-3.4.23-vs2.3.3.9/fs/gfs2/inode.h ---- linux-3.4.23/fs/gfs2/inode.h 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/gfs2/inode.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/gfs2/inode.h linux-3.4.24-vs2.3.3.9/fs/gfs2/inode.h +--- linux-3.4.24/fs/gfs2/inode.h 2012-01-09 15:14:54.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/gfs2/inode.h 2012-05-21 16:15:05.000000000 +0000 @@ -120,6 +120,7 @@ extern const struct file_operations gfs2 extern const struct file_operations gfs2_dir_fops_nolock; @@ -3739,9 +3739,9 @@ diff -NurpP --minimal linux-3.4.23/fs/gfs2/inode.h linux-3.4.23-vs2.3.3.9/fs/gfs #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-3.4.23/fs/inode.c linux-3.4.23-vs2.3.3.9/fs/inode.c ---- linux-3.4.23/fs/inode.c 2012-05-21 18:07:24.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/inode.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/inode.c linux-3.4.24-vs2.3.3.9/fs/inode.c +--- linux-3.4.24/fs/inode.c 2012-05-21 16:07:24.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/inode.c 2012-05-21 16:15:05.000000000 +0000 @@ -17,6 +17,7 @@ #include #include /* for inode_has_buffers */ @@ -3797,9 +3797,9 @@ diff -NurpP --minimal linux-3.4.23/fs/inode.c linux-3.4.23-vs2.3.3.9/fs/inode.c } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-3.4.23/fs/ioctl.c linux-3.4.23-vs2.3.3.9/fs/ioctl.c ---- linux-3.4.23/fs/ioctl.c 2012-05-21 18:07:24.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ioctl.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ioctl.c linux-3.4.24-vs2.3.3.9/fs/ioctl.c +--- linux-3.4.24/fs/ioctl.c 2012-05-21 16:07:24.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ioctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -15,6 +15,9 @@ #include #include @@ -3810,9 +3810,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ioctl.c linux-3.4.23-vs2.3.3.9/fs/ioctl.c #include -diff -NurpP --minimal linux-3.4.23/fs/ioprio.c linux-3.4.23-vs2.3.3.9/fs/ioprio.c ---- linux-3.4.23/fs/ioprio.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ioprio.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ioprio.c linux-3.4.24-vs2.3.3.9/fs/ioprio.c +--- linux-3.4.24/fs/ioprio.c 2012-03-19 18:47:25.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ioprio.c 2012-05-21 16:15:05.000000000 +0000 @@ -28,6 +28,7 @@ #include #include @@ -3821,7 +3821,7 @@ diff -NurpP --minimal linux-3.4.23/fs/ioprio.c linux-3.4.23-vs2.3.3.9/fs/ioprio. int set_task_ioprio(struct task_struct *task, int ioprio) { -@@ -104,6 +105,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which, +@@ -104,6 +105,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which, else pgrp = find_vpid(who); do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { @@ -3830,7 +3830,7 @@ diff -NurpP --minimal linux-3.4.23/fs/ioprio.c linux-3.4.23-vs2.3.3.9/fs/ioprio. ret = set_task_ioprio(p, ioprio); if (ret) break; -@@ -193,6 +196,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, +@@ -193,6 +196,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, else pgrp = find_vpid(who); do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { @@ -3839,9 +3839,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ioprio.c linux-3.4.23-vs2.3.3.9/fs/ioprio. tmpio = get_task_ioprio(p); if (tmpio < 0) continue; -diff -NurpP --minimal linux-3.4.23/fs/jfs/file.c linux-3.4.23-vs2.3.3.9/fs/jfs/file.c ---- linux-3.4.23/fs/jfs/file.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/jfs/file.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/jfs/file.c linux-3.4.24-vs2.3.3.9/fs/jfs/file.c +--- linux-3.4.24/fs/jfs/file.c 2011-10-24 16:45:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/jfs/file.c 2012-05-21 16:15:05.000000000 +0000 @@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s if (is_quota_modification(inode, iattr)) dquot_initialize(inode); @@ -3860,9 +3860,9 @@ diff -NurpP --minimal linux-3.4.23/fs/jfs/file.c linux-3.4.23-vs2.3.3.9/fs/jfs/f }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-3.4.23/fs/jfs/ioctl.c linux-3.4.23-vs2.3.3.9/fs/jfs/ioctl.c ---- linux-3.4.23/fs/jfs/ioctl.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/jfs/ioctl.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/jfs/ioctl.c linux-3.4.24-vs2.3.3.9/fs/jfs/ioctl.c +--- linux-3.4.24/fs/jfs/ioctl.c 2012-03-19 18:47:25.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/jfs/ioctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -11,6 +11,7 @@ #include #include @@ -3920,9 +3920,9 @@ diff -NurpP --minimal linux-3.4.23/fs/jfs/ioctl.c linux-3.4.23-vs2.3.3.9/fs/jfs/ flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-3.4.23/fs/jfs/jfs_dinode.h linux-3.4.23-vs2.3.3.9/fs/jfs/jfs_dinode.h ---- linux-3.4.23/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/jfs/jfs_dinode.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/jfs/jfs_dinode.h linux-3.4.24-vs2.3.3.9/fs/jfs/jfs_dinode.h +--- linux-3.4.24/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/jfs/jfs_dinode.h 2012-05-21 16:15:05.000000000 +0000 @@ -161,9 +161,13 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ @@ -3939,9 +3939,9 @@ diff -NurpP --minimal linux-3.4.23/fs/jfs/jfs_dinode.h linux-3.4.23-vs2.3.3.9/fs #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-3.4.23/fs/jfs/jfs_filsys.h linux-3.4.23-vs2.3.3.9/fs/jfs/jfs_filsys.h ---- linux-3.4.23/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/jfs/jfs_filsys.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/jfs/jfs_filsys.h linux-3.4.24-vs2.3.3.9/fs/jfs/jfs_filsys.h +--- linux-3.4.24/fs/jfs/jfs_filsys.h 2008-12-24 23:26:37.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/jfs/jfs_filsys.h 2012-05-21 16:15:05.000000000 +0000 @@ -263,6 +263,7 @@ #define JFS_NAME_MAX 255 #define JFS_PATH_MAX BPSIZE @@ -3950,9 +3950,9 @@ diff -NurpP --minimal linux-3.4.23/fs/jfs/jfs_filsys.h linux-3.4.23-vs2.3.3.9/fs /* * file system state (superblock state) -diff -NurpP --minimal linux-3.4.23/fs/jfs/jfs_imap.c linux-3.4.23-vs2.3.3.9/fs/jfs/jfs_imap.c ---- linux-3.4.23/fs/jfs/jfs_imap.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/jfs/jfs_imap.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/jfs/jfs_imap.c linux-3.4.24-vs2.3.3.9/fs/jfs/jfs_imap.c +--- linux-3.4.24/fs/jfs/jfs_imap.c 2012-01-09 15:14:54.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/jfs/jfs_imap.c 2012-05-21 16:15:05.000000000 +0000 @@ -46,6 +46,7 @@ #include #include @@ -4012,9 +4012,9 @@ diff -NurpP --minimal linux-3.4.23/fs/jfs/jfs_imap.c linux-3.4.23-vs2.3.3.9/fs/j jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-3.4.23/fs/jfs/jfs_inode.c linux-3.4.23-vs2.3.3.9/fs/jfs/jfs_inode.c ---- linux-3.4.23/fs/jfs/jfs_inode.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/jfs/jfs_inode.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/jfs/jfs_inode.c linux-3.4.24-vs2.3.3.9/fs/jfs/jfs_inode.c +--- linux-3.4.24/fs/jfs/jfs_inode.c 2012-01-09 15:14:54.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/jfs/jfs_inode.c 2012-05-21 16:15:05.000000000 +0000 @@ -18,6 +18,7 @@ #include @@ -4088,9 +4088,9 @@ diff -NurpP --minimal linux-3.4.23/fs/jfs/jfs_inode.c linux-3.4.23-vs2.3.3.9/fs/ } /* -diff -NurpP --minimal linux-3.4.23/fs/jfs/jfs_inode.h linux-3.4.23-vs2.3.3.9/fs/jfs/jfs_inode.h ---- linux-3.4.23/fs/jfs/jfs_inode.h 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/jfs/jfs_inode.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/jfs/jfs_inode.h linux-3.4.24-vs2.3.3.9/fs/jfs/jfs_inode.h +--- linux-3.4.24/fs/jfs/jfs_inode.h 2011-10-24 16:45:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/jfs/jfs_inode.h 2012-05-21 16:15:05.000000000 +0000 @@ -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); @@ -4099,9 +4099,9 @@ diff -NurpP --minimal linux-3.4.23/fs/jfs/jfs_inode.h linux-3.4.23-vs2.3.3.9/fs/ 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.4.23/fs/jfs/namei.c linux-3.4.23-vs2.3.3.9/fs/jfs/namei.c ---- linux-3.4.23/fs/jfs/namei.c 2012-05-21 18:07:25.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/jfs/namei.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/jfs/namei.c linux-3.4.24-vs2.3.3.9/fs/jfs/namei.c +--- linux-3.4.24/fs/jfs/namei.c 2012-05-21 16:07:25.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/jfs/namei.c 2012-05-21 16:15:05.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -4110,7 +4110,7 @@ diff -NurpP --minimal linux-3.4.23/fs/jfs/namei.c linux-3.4.23-vs2.3.3.9/fs/jfs/ #include "jfs_incore.h" #include "jfs_superblock.h" #include "jfs_inode.h" -@@ -1461,6 +1462,7 @@ static struct dentry *jfs_lookup(struct +@@ -1461,6 +1462,7 @@ static struct dentry *jfs_lookup(struct jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum); } @@ -4126,9 +4126,9 @@ diff -NurpP --minimal linux-3.4.23/fs/jfs/namei.c linux-3.4.23-vs2.3.3.9/fs/jfs/ }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-3.4.23/fs/jfs/super.c linux-3.4.23-vs2.3.3.9/fs/jfs/super.c ---- linux-3.4.23/fs/jfs/super.c 2012-05-21 18:07:25.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/jfs/super.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/jfs/super.c linux-3.4.24-vs2.3.3.9/fs/jfs/super.c +--- linux-3.4.24/fs/jfs/super.c 2012-05-21 16:07:25.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/jfs/super.c 2012-05-21 16:15:05.000000000 +0000 @@ -197,7 +197,8 @@ static void jfs_put_super(struct super_b enum { Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, @@ -4150,7 +4150,7 @@ diff -NurpP --minimal linux-3.4.23/fs/jfs/super.c linux-3.4.23-vs2.3.3.9/fs/jfs/ {Opt_ignore, "noquota"}, {Opt_ignore, "quota"}, {Opt_usrquota, "usrquota"}, -@@ -341,6 +346,20 @@ static int parse_options(char *options, +@@ -341,6 +346,20 @@ static int parse_options(char *options, } break; } @@ -4194,9 +4194,9 @@ diff -NurpP --minimal linux-3.4.23/fs/jfs/super.c linux-3.4.23-vs2.3.3.9/fs/jfs/ if (newLVSize) { printk(KERN_ERR "resize option for remount only\n"); -diff -NurpP --minimal linux-3.4.23/fs/libfs.c linux-3.4.23-vs2.3.3.9/fs/libfs.c ---- linux-3.4.23/fs/libfs.c 2012-05-21 18:07:25.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/libfs.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/libfs.c linux-3.4.24-vs2.3.3.9/fs/libfs.c +--- linux-3.4.24/fs/libfs.c 2012-05-21 16:07:25.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/libfs.c 2012-05-21 16:15:05.000000000 +0000 @@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru * both impossible due to the lock on directory. */ @@ -4242,9 +4242,9 @@ diff -NurpP --minimal linux-3.4.23/fs/libfs.c linux-3.4.23-vs2.3.3.9/fs/libfs.c EXPORT_SYMBOL(generic_read_dir); EXPORT_SYMBOL(mount_pseudo); EXPORT_SYMBOL(simple_write_begin); -diff -NurpP --minimal linux-3.4.23/fs/locks.c linux-3.4.23-vs2.3.3.9/fs/locks.c ---- linux-3.4.23/fs/locks.c 2012-12-11 12:37:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/locks.c 2012-09-01 10:50:49.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/locks.c linux-3.4.24-vs2.3.3.9/fs/locks.c +--- linux-3.4.24/fs/locks.c 2012-12-18 14:01:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/locks.c 2012-09-01 08:50:49.000000000 +0000 @@ -126,6 +126,8 @@ #include #include @@ -4405,7 +4405,7 @@ diff -NurpP --minimal linux-3.4.23/fs/locks.c linux-3.4.23-vs2.3.3.9/fs/locks.c return 0; out: -@@ -1847,6 +1880,11 @@ int fcntl_setlk(unsigned int fd, struct +@@ -1847,6 +1880,11 @@ int fcntl_setlk(unsigned int fd, struct if (file_lock == NULL) return -ENOLCK; @@ -4442,9 +4442,9 @@ diff -NurpP --minimal linux-3.4.23/fs/locks.c linux-3.4.23-vs2.3.3.9/fs/locks.c return 0; } -diff -NurpP --minimal linux-3.4.23/fs/mount.h linux-3.4.23-vs2.3.3.9/fs/mount.h ---- linux-3.4.23/fs/mount.h 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/mount.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/mount.h linux-3.4.24-vs2.3.3.9/fs/mount.h +--- linux-3.4.24/fs/mount.h 2012-03-19 18:47:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/mount.h 2012-05-21 16:15:05.000000000 +0000 @@ -47,6 +47,7 @@ struct mount { int mnt_expiry_mark; /* true if marked for expiry */ int mnt_pinned; @@ -4453,9 +4453,9 @@ diff -NurpP --minimal linux-3.4.23/fs/mount.h linux-3.4.23-vs2.3.3.9/fs/mount.h }; static inline struct mount *real_mount(struct vfsmount *mnt) -diff -NurpP --minimal linux-3.4.23/fs/namei.c linux-3.4.23-vs2.3.3.9/fs/namei.c ---- linux-3.4.23/fs/namei.c 2012-05-21 18:07:25.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/namei.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/namei.c linux-3.4.24-vs2.3.3.9/fs/namei.c +--- linux-3.4.24/fs/namei.c 2012-05-21 16:07:25.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/namei.c 2012-05-21 16:15:05.000000000 +0000 @@ -33,6 +33,14 @@ #include #include @@ -4715,7 +4715,7 @@ diff -NurpP --minimal linux-3.4.23/fs/namei.c linux-3.4.23-vs2.3.3.9/fs/namei.c return dentry; eexist: dput(dentry); -@@ -2986,7 +3130,7 @@ int vfs_link(struct dentry *old_dentry, +@@ -2986,7 +3130,7 @@ int vfs_link(struct dentry *old_dentry, /* * A link to an append-only or immutable file cannot be created. */ @@ -4983,9 +4983,9 @@ diff -NurpP --minimal linux-3.4.23/fs/namei.c linux-3.4.23-vs2.3.3.9/fs/namei.c EXPORT_SYMBOL(dentry_unhash); EXPORT_SYMBOL(generic_readlink); +EXPORT_SYMBOL(vx_info_mnt_namespace); -diff -NurpP --minimal linux-3.4.23/fs/namespace.c linux-3.4.23-vs2.3.3.9/fs/namespace.c ---- linux-3.4.23/fs/namespace.c 2012-12-11 12:37:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/namespace.c 2012-06-28 16:45:07.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/namespace.c linux-3.4.24-vs2.3.3.9/fs/namespace.c +--- linux-3.4.24/fs/namespace.c 2012-12-18 14:01:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/namespace.c 2012-06-28 14:45:07.000000000 +0000 @@ -20,6 +20,11 @@ #include /* get_fs_root et.al. */ #include /* fsnotify_vfsmount_delete */ @@ -5172,9 +5172,9 @@ diff -NurpP --minimal linux-3.4.23/fs/namespace.c linux-3.4.23-vs2.3.3.9/fs/name kfree(ns); } -diff -NurpP --minimal linux-3.4.23/fs/nfs/client.c linux-3.4.23-vs2.3.3.9/fs/nfs/client.c ---- linux-3.4.23/fs/nfs/client.c 2012-05-21 18:07:25.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/nfs/client.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/nfs/client.c linux-3.4.24-vs2.3.3.9/fs/nfs/client.c +--- linux-3.4.24/fs/nfs/client.c 2012-05-21 16:07:25.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/nfs/client.c 2012-05-21 16:15:05.000000000 +0000 @@ -802,6 +802,9 @@ static int nfs_init_server_rpcclient(str if (server->flags & NFS_MOUNT_SOFT) server->client->cl_softrtry = 1; @@ -5196,9 +5196,9 @@ diff -NurpP --minimal linux-3.4.23/fs/nfs/client.c linux-3.4.23-vs2.3.3.9/fs/nfs server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-3.4.23/fs/nfs/dir.c linux-3.4.23-vs2.3.3.9/fs/nfs/dir.c ---- linux-3.4.23/fs/nfs/dir.c 2012-12-11 12:37:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/nfs/dir.c 2012-11-19 00:52:29.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/fs/nfs/dir.c linux-3.4.24-vs2.3.3.9/fs/nfs/dir.c +--- linux-3.4.24/fs/nfs/dir.c 2012-12-18 14:01:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/nfs/dir.c 2012-11-18 23:52:29.000000000 +0000 @@ -35,6 +35,7 @@ #include #include @@ -5207,7 +5207,7 @@ diff -NurpP --minimal linux-3.4.23/fs/nfs/dir.c linux-3.4.23-vs2.3.3.9/fs/nfs/di #include "delegation.h" #include "iostat.h" -@@ -1311,6 +1312,7 @@ static struct dentry *nfs_lookup(struct +@@ -1311,6 +1312,7 @@ static struct dentry *nfs_lookup(struct if (IS_ERR(res)) goto out_unblock_sillyrename; @@ -5215,9 +5215,9 @@ diff -NurpP --minimal linux-3.4.23/fs/nfs/dir.c linux-3.4.23-vs2.3.3.9/fs/nfs/di no_entry: res = d_materialise_unique(dentry, inode); if (res != NULL) { -diff -NurpP --minimal linux-3.4.23/fs/nfs/inode.c linux-3.4.23-vs2.3.3.9/fs/nfs/inode.c ---- linux-3.4.23/fs/nfs/inode.c 2012-12-11 12:37:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/nfs/inode.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/nfs/inode.c linux-3.4.24-vs2.3.3.9/fs/nfs/inode.c +--- linux-3.4.24/fs/nfs/inode.c 2012-12-18 14:01:06.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/nfs/inode.c 2012-10-22 13:09:53.000000000 +0000 @@ -40,6 +40,7 @@ #include #include @@ -5369,9 +5369,9 @@ diff -NurpP --minimal linux-3.4.23/fs/nfs/inode.c linux-3.4.23-vs2.3.3.9/fs/nfs/ if (fattr->valid & NFS_ATTR_FATTR_NLINK) { if (inode->i_nlink != fattr->nlink) { invalid |= NFS_INO_INVALID_ATTR; -diff -NurpP --minimal linux-3.4.23/fs/nfs/nfs3xdr.c linux-3.4.23-vs2.3.3.9/fs/nfs/nfs3xdr.c ---- linux-3.4.23/fs/nfs/nfs3xdr.c 2012-05-21 18:07:25.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/nfs/nfs3xdr.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/nfs/nfs3xdr.c linux-3.4.24-vs2.3.3.9/fs/nfs/nfs3xdr.c +--- linux-3.4.24/fs/nfs/nfs3xdr.c 2012-05-21 16:07:25.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/nfs/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000 @@ -20,6 +20,7 @@ #include #include @@ -5517,9 +5517,9 @@ diff -NurpP --minimal linux-3.4.23/fs/nfs/nfs3xdr.c linux-3.4.23-vs2.3.3.9/fs/nf } /* -diff -NurpP --minimal linux-3.4.23/fs/nfs/super.c linux-3.4.23-vs2.3.3.9/fs/nfs/super.c ---- linux-3.4.23/fs/nfs/super.c 2012-12-11 12:37:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/nfs/super.c 2012-11-19 00:52:29.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/fs/nfs/super.c linux-3.4.24-vs2.3.3.9/fs/nfs/super.c +--- linux-3.4.24/fs/nfs/super.c 2012-12-18 14:01:06.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/nfs/super.c 2012-11-18 23:52:29.000000000 +0000 @@ -54,6 +54,7 @@ #include #include @@ -5563,7 +5563,7 @@ diff -NurpP --minimal linux-3.4.23/fs/nfs/super.c linux-3.4.23-vs2.3.3.9/fs/nfs/ { 0, NULL, NULL } }; const struct proc_nfs_info *nfs_infop; -@@ -1286,6 +1294,14 @@ static int nfs_parse_mount_options(char +@@ -1286,6 +1294,14 @@ static int nfs_parse_mount_options(char kfree(mnt->fscache_uniq); mnt->fscache_uniq = NULL; break; @@ -5578,7 +5578,7 @@ diff -NurpP --minimal linux-3.4.23/fs/nfs/super.c linux-3.4.23-vs2.3.3.9/fs/nfs/ /* * options that take numeric values -@@ -1372,6 +1388,12 @@ static int nfs_parse_mount_options(char +@@ -1372,6 +1388,12 @@ static int nfs_parse_mount_options(char goto out_invalid_value; mnt->minorversion = option; break; @@ -5591,9 +5591,9 @@ diff -NurpP --minimal linux-3.4.23/fs/nfs/super.c linux-3.4.23-vs2.3.3.9/fs/nfs/ /* * options that take text values -diff -NurpP --minimal linux-3.4.23/fs/nfsd/auth.c linux-3.4.23-vs2.3.3.9/fs/nfsd/auth.c ---- linux-3.4.23/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/nfsd/auth.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/nfsd/auth.c linux-3.4.24-vs2.3.3.9/fs/nfsd/auth.c +--- linux-3.4.24/fs/nfsd/auth.c 2010-02-25 10:52:05.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/nfsd/auth.c 2012-05-21 16:15:05.000000000 +0000 @@ -1,6 +1,7 @@ /* Copyright (C) 1995, 1996 Olaf Kirch */ @@ -5612,9 +5612,9 @@ diff -NurpP --minimal linux-3.4.23/fs/nfsd/auth.c linux-3.4.23-vs2.3.3.9/fs/nfsd rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-3.4.23/fs/nfsd/nfs3xdr.c linux-3.4.23-vs2.3.3.9/fs/nfsd/nfs3xdr.c ---- linux-3.4.23/fs/nfsd/nfs3xdr.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/nfsd/nfs3xdr.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/nfsd/nfs3xdr.c linux-3.4.24-vs2.3.3.9/fs/nfsd/nfs3xdr.c +--- linux-3.4.24/fs/nfsd/nfs3xdr.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/nfsd/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000 @@ -7,6 +7,7 @@ */ @@ -5665,9 +5665,9 @@ diff -NurpP --minimal linux-3.4.23/fs/nfsd/nfs3xdr.c linux-3.4.23-vs2.3.3.9/fs/n if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-3.4.23/fs/nfsd/nfs4xdr.c linux-3.4.23-vs2.3.3.9/fs/nfsd/nfs4xdr.c ---- linux-3.4.23/fs/nfsd/nfs4xdr.c 2012-12-11 12:37:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/nfsd/nfs4xdr.c 2012-09-01 10:50:49.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/nfsd/nfs4xdr.c linux-3.4.24-vs2.3.3.9/fs/nfsd/nfs4xdr.c +--- linux-3.4.24/fs/nfsd/nfs4xdr.c 2012-12-18 14:01:06.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/nfsd/nfs4xdr.c 2012-09-01 08:50:49.000000000 +0000 @@ -46,6 +46,7 @@ #include #include @@ -5697,9 +5697,9 @@ diff -NurpP --minimal linux-3.4.23/fs/nfsd/nfs4xdr.c linux-3.4.23-vs2.3.3.9/fs/n if (status == nfserr_resource) goto out_resource; if (status) -diff -NurpP --minimal linux-3.4.23/fs/nfsd/nfsxdr.c linux-3.4.23-vs2.3.3.9/fs/nfsd/nfsxdr.c ---- linux-3.4.23/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/nfsd/nfsxdr.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/nfsd/nfsxdr.c linux-3.4.24-vs2.3.3.9/fs/nfsd/nfsxdr.c +--- linux-3.4.24/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/nfsd/nfsxdr.c 2012-05-21 16:15:05.000000000 +0000 @@ -6,6 +6,7 @@ #include "xdr.h" @@ -5748,9 +5748,9 @@ diff -NurpP --minimal linux-3.4.23/fs/nfsd/nfsxdr.c linux-3.4.23-vs2.3.3.9/fs/nf if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-3.4.23/fs/ocfs2/dlmglue.c linux-3.4.23-vs2.3.3.9/fs/ocfs2/dlmglue.c ---- linux-3.4.23/fs/ocfs2/dlmglue.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ocfs2/dlmglue.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ocfs2/dlmglue.c linux-3.4.24-vs2.3.3.9/fs/ocfs2/dlmglue.c +--- linux-3.4.24/fs/ocfs2/dlmglue.c 2012-01-09 15:14:55.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ocfs2/dlmglue.c 2012-05-21 16:15:05.000000000 +0000 @@ -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); @@ -5767,9 +5767,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ocfs2/dlmglue.c linux-3.4.23-vs2.3.3.9/fs/ 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.4.23/fs/ocfs2/dlmglue.h linux-3.4.23-vs2.3.3.9/fs/ocfs2/dlmglue.h ---- linux-3.4.23/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ocfs2/dlmglue.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ocfs2/dlmglue.h linux-3.4.24-vs2.3.3.9/fs/ocfs2/dlmglue.h +--- linux-3.4.24/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ocfs2/dlmglue.h 2012-05-21 16:15:05.000000000 +0000 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { __be16 lvb_inlink; __be32 lvb_iattr; @@ -5780,9 +5780,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ocfs2/dlmglue.h linux-3.4.23-vs2.3.3.9/fs/ }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-3.4.23/fs/ocfs2/file.c linux-3.4.23-vs2.3.3.9/fs/ocfs2/file.c ---- linux-3.4.23/fs/ocfs2/file.c 2012-12-11 12:37:30.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ocfs2/file.c 2012-07-18 00:29:43.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ocfs2/file.c linux-3.4.24-vs2.3.3.9/fs/ocfs2/file.c +--- linux-3.4.24/fs/ocfs2/file.c 2012-12-18 14:01:09.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ocfs2/file.c 2012-07-17 22:29:43.000000000 +0000 @@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry, attr->ia_valid &= ~ATTR_SIZE; @@ -5792,9 +5792,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ocfs2/file.c linux-3.4.23-vs2.3.3.9/fs/ocf if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-3.4.23/fs/ocfs2/inode.c linux-3.4.23-vs2.3.3.9/fs/ocfs2/inode.c ---- linux-3.4.23/fs/ocfs2/inode.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ocfs2/inode.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ocfs2/inode.c linux-3.4.24-vs2.3.3.9/fs/ocfs2/inode.c +--- linux-3.4.24/fs/ocfs2/inode.c 2012-01-09 15:14:55.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ocfs2/inode.c 2012-05-21 16:15:05.000000000 +0000 @@ -28,6 +28,7 @@ #include #include @@ -5803,7 +5803,7 @@ diff -NurpP --minimal linux-3.4.23/fs/ocfs2/inode.c linux-3.4.23-vs2.3.3.9/fs/oc #include -@@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode +@@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode { unsigned int flags = OCFS2_I(inode)->ip_attr; @@ -5818,7 +5818,7 @@ diff -NurpP --minimal linux-3.4.23/fs/ocfs2/inode.c linux-3.4.23-vs2.3.3.9/fs/oc if (flags & OCFS2_SYNC_FL) inode->i_flags |= S_SYNC; -@@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode +@@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode inode->i_flags |= S_NOATIME; if (flags & OCFS2_DIRSYNC_FL) inode->i_flags |= S_DIRSYNC; @@ -5891,9 +5891,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ocfs2/inode.c linux-3.4.23-vs2.3.3.9/fs/oc /* Fast symlinks will have i_size but no allocated clusters. */ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) -diff -NurpP --minimal linux-3.4.23/fs/ocfs2/inode.h linux-3.4.23-vs2.3.3.9/fs/ocfs2/inode.h ---- linux-3.4.23/fs/ocfs2/inode.h 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ocfs2/inode.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ocfs2/inode.h linux-3.4.24-vs2.3.3.9/fs/ocfs2/inode.h +--- linux-3.4.24/fs/ocfs2/inode.h 2012-01-09 15:14:55.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ocfs2/inode.h 2012-05-21 16:15:05.000000000 +0000 @@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i void ocfs2_set_inode_flags(struct inode *inode); @@ -5902,9 +5902,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ocfs2/inode.h linux-3.4.23-vs2.3.3.9/fs/oc static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-3.4.23/fs/ocfs2/ioctl.c linux-3.4.23-vs2.3.3.9/fs/ocfs2/ioctl.c ---- linux-3.4.23/fs/ocfs2/ioctl.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ocfs2/ioctl.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ocfs2/ioctl.c linux-3.4.24-vs2.3.3.9/fs/ocfs2/ioctl.c +--- linux-3.4.24/fs/ocfs2/ioctl.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ocfs2/ioctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i return status; } @@ -5968,9 +5968,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ocfs2/ioctl.c linux-3.4.23-vs2.3.3.9/fs/oc 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.4.23/fs/ocfs2/namei.c linux-3.4.23-vs2.3.3.9/fs/ocfs2/namei.c ---- linux-3.4.23/fs/ocfs2/namei.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ocfs2/namei.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ocfs2/namei.c linux-3.4.24-vs2.3.3.9/fs/ocfs2/namei.c +--- linux-3.4.24/fs/ocfs2/namei.c 2012-03-19 18:47:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ocfs2/namei.c 2012-05-21 16:15:05.000000000 +0000 @@ -41,6 +41,7 @@ #include #include @@ -6001,9 +6001,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ocfs2/namei.c linux-3.4.23-vs2.3.3.9/fs/oc 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.4.23/fs/ocfs2/ocfs2.h linux-3.4.23-vs2.3.3.9/fs/ocfs2/ocfs2.h ---- linux-3.4.23/fs/ocfs2/ocfs2.h 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/ocfs2/ocfs2.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ocfs2/ocfs2.h linux-3.4.24-vs2.3.3.9/fs/ocfs2/ocfs2.h +--- linux-3.4.24/fs/ocfs2/ocfs2.h 2012-01-09 15:14:55.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ocfs2/ocfs2.h 2012-05-21 16:15:05.000000000 +0000 @@ -272,6 +272,7 @@ enum ocfs2_mount_options writes */ OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */ @@ -6012,9 +6012,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ocfs2/ocfs2.h linux-3.4.23-vs2.3.3.9/fs/oc }; #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-3.4.23/fs/ocfs2/ocfs2_fs.h linux-3.4.23-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h ---- linux-3.4.23/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ocfs2/ocfs2_fs.h linux-3.4.24-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h +--- linux-3.4.24/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h 2012-05-21 16:15:05.000000000 +0000 @@ -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 */ @@ -6027,9 +6027,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ocfs2/ocfs2_fs.h linux-3.4.23-vs2.3.3.9/fs #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.4.23/fs/ocfs2/super.c linux-3.4.23-vs2.3.3.9/fs/ocfs2/super.c ---- linux-3.4.23/fs/ocfs2/super.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/ocfs2/super.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/ocfs2/super.c linux-3.4.24-vs2.3.3.9/fs/ocfs2/super.c +--- linux-3.4.24/fs/ocfs2/super.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/ocfs2/super.c 2012-05-21 16:15:05.000000000 +0000 @@ -185,6 +185,7 @@ enum { Opt_coherency_full, Opt_resv_level, @@ -6093,9 +6093,9 @@ diff -NurpP --minimal linux-3.4.23/fs/ocfs2/super.c linux-3.4.23-vs2.3.3.9/fs/oc default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-3.4.23/fs/open.c linux-3.4.23-vs2.3.3.9/fs/open.c ---- linux-3.4.23/fs/open.c 2012-12-11 12:37:30.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/open.c 2012-09-16 20:49:11.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/open.c linux-3.4.24-vs2.3.3.9/fs/open.c +--- linux-3.4.24/fs/open.c 2012-12-18 14:01:09.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/open.c 2012-09-16 18:49:11.000000000 +0000 @@ -30,6 +30,11 @@ #include #include @@ -6187,9 +6187,9 @@ diff -NurpP --minimal linux-3.4.23/fs/open.c linux-3.4.23-vs2.3.3.9/fs/open.c } void put_unused_fd(unsigned int fd) -diff -NurpP --minimal linux-3.4.23/fs/proc/array.c linux-3.4.23-vs2.3.3.9/fs/proc/array.c ---- linux-3.4.23/fs/proc/array.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/proc/array.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/proc/array.c linux-3.4.24-vs2.3.3.9/fs/proc/array.c +--- linux-3.4.24/fs/proc/array.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/proc/array.c 2012-05-21 16:15:05.000000000 +0000 @@ -81,6 +81,8 @@ #include #include @@ -6277,7 +6277,7 @@ diff -NurpP --minimal linux-3.4.23/fs/proc/array.c linux-3.4.23-vs2.3.3.9/fs/pro int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task) { -@@ -353,6 +395,7 @@ int proc_pid_status(struct seq_file *m, +@@ -353,6 +395,7 @@ int proc_pid_status(struct seq_file *m, task_cap(m, task); task_cpus_allowed(m, task); cpuset_task_status_allowed(m, task); @@ -6285,7 +6285,7 @@ diff -NurpP --minimal linux-3.4.23/fs/proc/array.c linux-3.4.23-vs2.3.3.9/fs/pro task_context_switch_counts(m, task); return 0; } -@@ -462,6 +505,17 @@ static int do_task_stat(struct seq_file +@@ -462,6 +505,17 @@ static int do_task_stat(struct seq_file /* convert nsec -> ticks */ start_time = nsec_to_clock_t(start_time); @@ -6303,9 +6303,9 @@ diff -NurpP --minimal linux-3.4.23/fs/proc/array.c linux-3.4.23-vs2.3.3.9/fs/pro seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state); seq_put_decimal_ll(m, ' ', ppid); seq_put_decimal_ll(m, ' ', pgid); -diff -NurpP --minimal linux-3.4.23/fs/proc/base.c linux-3.4.23-vs2.3.3.9/fs/proc/base.c ---- linux-3.4.23/fs/proc/base.c 2012-12-11 12:37:30.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/proc/base.c 2012-06-28 16:45:07.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/proc/base.c linux-3.4.24-vs2.3.3.9/fs/proc/base.c +--- linux-3.4.24/fs/proc/base.c 2012-12-18 14:01:09.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/proc/base.c 2012-06-28 14:45:07.000000000 +0000 @@ -84,6 +84,8 @@ #include #include @@ -6467,9 +6467,9 @@ diff -NurpP --minimal linux-3.4.23/fs/proc/base.c linux-3.4.23-vs2.3.3.9/fs/proc ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-3.4.23/fs/proc/generic.c linux-3.4.23-vs2.3.3.9/fs/proc/generic.c ---- linux-3.4.23/fs/proc/generic.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/proc/generic.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/proc/generic.c linux-3.4.24-vs2.3.3.9/fs/proc/generic.c +--- linux-3.4.24/fs/proc/generic.c 2012-03-19 18:47:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/proc/generic.c 2012-05-21 16:15:05.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -6529,9 +6529,9 @@ diff -NurpP --minimal linux-3.4.23/fs/proc/generic.c linux-3.4.23-vs2.3.3.9/fs/p } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-3.4.23/fs/proc/inode.c linux-3.4.23-vs2.3.3.9/fs/proc/inode.c ---- linux-3.4.23/fs/proc/inode.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/proc/inode.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/proc/inode.c linux-3.4.24-vs2.3.3.9/fs/proc/inode.c +--- linux-3.4.24/fs/proc/inode.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/proc/inode.c 2012-05-21 16:15:05.000000000 +0000 @@ -458,6 +458,8 @@ struct inode *proc_get_inode(struct supe inode->i_uid = de->uid; inode->i_gid = de->gid; @@ -6541,9 +6541,9 @@ diff -NurpP --minimal linux-3.4.23/fs/proc/inode.c linux-3.4.23-vs2.3.3.9/fs/pro if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-3.4.23/fs/proc/internal.h linux-3.4.23-vs2.3.3.9/fs/proc/internal.h ---- linux-3.4.23/fs/proc/internal.h 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/proc/internal.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/proc/internal.h linux-3.4.24-vs2.3.3.9/fs/proc/internal.h +--- linux-3.4.24/fs/proc/internal.h 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/proc/internal.h 2012-05-21 16:15:05.000000000 +0000 @@ -10,6 +10,8 @@ */ @@ -6581,9 +6581,9 @@ diff -NurpP --minimal linux-3.4.23/fs/proc/internal.h linux-3.4.23-vs2.3.3.9/fs/ static inline int proc_fd(struct inode *inode) { return PROC_I(inode)->fd; -diff -NurpP --minimal linux-3.4.23/fs/proc/loadavg.c linux-3.4.23-vs2.3.3.9/fs/proc/loadavg.c ---- linux-3.4.23/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/proc/loadavg.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/proc/loadavg.c linux-3.4.24-vs2.3.3.9/fs/proc/loadavg.c +--- linux-3.4.24/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/proc/loadavg.c 2012-05-21 16:15:05.000000000 +0000 @@ -12,15 +12,27 @@ static int loadavg_proc_show(struct seq_file *m, void *v) @@ -6613,9 +6613,9 @@ diff -NurpP --minimal linux-3.4.23/fs/proc/loadavg.c linux-3.4.23-vs2.3.3.9/fs/p task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-3.4.23/fs/proc/meminfo.c linux-3.4.23-vs2.3.3.9/fs/proc/meminfo.c ---- linux-3.4.23/fs/proc/meminfo.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/proc/meminfo.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/proc/meminfo.c linux-3.4.24-vs2.3.3.9/fs/proc/meminfo.c +--- linux-3.4.24/fs/proc/meminfo.c 2012-01-09 15:14:55.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/proc/meminfo.c 2012-05-21 16:15:05.000000000 +0000 @@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_ allowed = ((totalram_pages - hugetlb_total_pages()) * sysctl_overcommit_ratio / 100) + total_swap_pages; @@ -6626,9 +6626,9 @@ diff -NurpP --minimal linux-3.4.23/fs/proc/meminfo.c linux-3.4.23-vs2.3.3.9/fs/p total_swapcache_pages - i.bufferram; if (cached < 0) cached = 0; -diff -NurpP --minimal linux-3.4.23/fs/proc/root.c linux-3.4.23-vs2.3.3.9/fs/proc/root.c ---- linux-3.4.23/fs/proc/root.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/proc/root.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/proc/root.c linux-3.4.24-vs2.3.3.9/fs/proc/root.c +--- linux-3.4.24/fs/proc/root.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/proc/root.c 2012-05-21 16:15:05.000000000 +0000 @@ -19,9 +19,14 @@ #include #include @@ -6660,9 +6660,9 @@ diff -NurpP --minimal linux-3.4.23/fs/proc/root.c linux-3.4.23-vs2.3.3.9/fs/proc .name = "/proc", }; -diff -NurpP --minimal linux-3.4.23/fs/proc/stat.c linux-3.4.23-vs2.3.3.9/fs/proc/stat.c ---- linux-3.4.23/fs/proc/stat.c 2012-12-11 12:37:30.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/proc/stat.c 2012-11-06 18:02:35.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/fs/proc/stat.c linux-3.4.24-vs2.3.3.9/fs/proc/stat.c +--- linux-3.4.24/fs/proc/stat.c 2012-12-18 14:01:09.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/proc/stat.c 2012-11-06 17:02:35.000000000 +0000 @@ -9,6 +9,7 @@ #include #include @@ -6682,9 +6682,9 @@ diff -NurpP --minimal linux-3.4.23/fs/proc/stat.c linux-3.4.23-vs2.3.3.9/fs/proc jif = boottime.tv_sec; for_each_possible_cpu(i) { -diff -NurpP --minimal linux-3.4.23/fs/proc/uptime.c linux-3.4.23-vs2.3.3.9/fs/proc/uptime.c ---- linux-3.4.23/fs/proc/uptime.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/proc/uptime.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/proc/uptime.c linux-3.4.24-vs2.3.3.9/fs/proc/uptime.c +--- linux-3.4.24/fs/proc/uptime.c 2012-03-19 18:47:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/proc/uptime.c 2012-05-21 16:15:05.000000000 +0000 @@ -5,6 +5,7 @@ #include #include @@ -6704,10 +6704,10 @@ diff -NurpP --minimal linux-3.4.23/fs/proc/uptime.c linux-3.4.23-vs2.3.3.9/fs/pr 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.4.23/fs/proc_namespace.c linux-3.4.23-vs2.3.3.9/fs/proc_namespace.c ---- linux-3.4.23/fs/proc_namespace.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/proc_namespace.c 2012-05-21 18:15:05.000000000 +0200 -@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file +diff -NurpP --minimal linux-3.4.24/fs/proc_namespace.c linux-3.4.24-vs2.3.3.9/fs/proc_namespace.c +--- linux-3.4.24/fs/proc_namespace.c 2012-03-19 18:47:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/proc_namespace.c 2012-05-21 16:15:05.000000000 +0000 +@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file { MS_SYNCHRONOUS, ",sync" }, { MS_DIRSYNC, ",dirsync" }, { MS_MANDLOCK, ",mand" }, @@ -6789,7 +6789,7 @@ diff -NurpP --minimal linux-3.4.23/fs/proc_namespace.c linux-3.4.23-vs2.3.3.9/fs seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id, MAJOR(sb->s_dev), MINOR(sb->s_dev)); if (sb->s_op->show_path) -@@ -187,6 +234,17 @@ static int show_vfsstat(struct seq_file +@@ -187,6 +234,17 @@ static int show_vfsstat(struct seq_file struct super_block *sb = mnt_path.dentry->d_sb; int err = 0; @@ -6807,7 +6807,7 @@ diff -NurpP --minimal linux-3.4.23/fs/proc_namespace.c linux-3.4.23-vs2.3.3.9/fs /* device */ if (sb->s_op->show_devname) { seq_puts(m, "device "); -@@ -203,7 +261,7 @@ static int show_vfsstat(struct seq_file +@@ -203,7 +261,7 @@ static int show_vfsstat(struct seq_file seq_puts(m, " mounted on "); seq_path(m, &mnt_path, " \t\n\\"); seq_putc(m, ' '); @@ -6816,9 +6816,9 @@ diff -NurpP --minimal linux-3.4.23/fs/proc_namespace.c linux-3.4.23-vs2.3.3.9/fs /* file system type */ seq_puts(m, "with fstype "); show_type(m, sb); -diff -NurpP --minimal linux-3.4.23/fs/quota/dquot.c linux-3.4.23-vs2.3.3.9/fs/quota/dquot.c ---- linux-3.4.23/fs/quota/dquot.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/quota/dquot.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/quota/dquot.c linux-3.4.24-vs2.3.3.9/fs/quota/dquot.c +--- linux-3.4.24/fs/quota/dquot.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/quota/dquot.c 2012-05-21 16:15:05.000000000 +0000 @@ -1563,6 +1563,9 @@ int __dquot_alloc_space(struct inode *in struct dquot **dquots = inode->i_dquot; int reserve = flags & DQUOT_SPACE_RESERVE; @@ -6857,9 +6857,9 @@ diff -NurpP --minimal linux-3.4.23/fs/quota/dquot.c linux-3.4.23-vs2.3.3.9/fs/qu /* 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.4.23/fs/quota/quota.c linux-3.4.23-vs2.3.3.9/fs/quota/quota.c ---- linux-3.4.23/fs/quota/quota.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/quota/quota.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/quota/quota.c linux-3.4.24-vs2.3.3.9/fs/quota/quota.c +--- linux-3.4.24/fs/quota/quota.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/quota/quota.c 2012-05-21 16:15:05.000000000 +0000 @@ -8,6 +8,7 @@ #include #include @@ -6947,9 +6947,9 @@ diff -NurpP --minimal linux-3.4.23/fs/quota/quota.c linux-3.4.23-vs2.3.3.9/fs/qu if (quotactl_cmd_write(cmd)) sb = get_super_thawed(bdev); else -diff -NurpP --minimal linux-3.4.23/fs/reiserfs/file.c linux-3.4.23-vs2.3.3.9/fs/reiserfs/file.c ---- linux-3.4.23/fs/reiserfs/file.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/reiserfs/file.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/reiserfs/file.c linux-3.4.24-vs2.3.3.9/fs/reiserfs/file.c +--- linux-3.4.24/fs/reiserfs/file.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/reiserfs/file.c 2012-05-21 16:15:05.000000000 +0000 @@ -319,5 +319,6 @@ const struct inode_operations reiserfs_f .listxattr = reiserfs_listxattr, .removexattr = reiserfs_removexattr, @@ -6957,9 +6957,9 @@ diff -NurpP --minimal linux-3.4.23/fs/reiserfs/file.c linux-3.4.23-vs2.3.3.9/fs/ + .sync_flags = reiserfs_sync_flags, .get_acl = reiserfs_get_acl, }; -diff -NurpP --minimal linux-3.4.23/fs/reiserfs/inode.c linux-3.4.23-vs2.3.3.9/fs/reiserfs/inode.c ---- linux-3.4.23/fs/reiserfs/inode.c 2012-12-11 12:37:30.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/reiserfs/inode.c 2012-12-08 01:53:53.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/fs/reiserfs/inode.c linux-3.4.24-vs2.3.3.9/fs/reiserfs/inode.c +--- linux-3.4.24/fs/reiserfs/inode.c 2012-12-18 14:01:09.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/reiserfs/inode.c 2012-12-08 00:53:53.000000000 +0000 @@ -18,6 +18,7 @@ #include #include @@ -7125,9 +7125,9 @@ diff -NurpP --minimal linux-3.4.23/fs/reiserfs/inode.c linux-3.4.23-vs2.3.3.9/fs mark_inode_dirty(inode); error = journal_end(&th, inode->i_sb, jbegin_count); if (error) -diff -NurpP --minimal linux-3.4.23/fs/reiserfs/ioctl.c linux-3.4.23-vs2.3.3.9/fs/reiserfs/ioctl.c ---- linux-3.4.23/fs/reiserfs/ioctl.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/reiserfs/ioctl.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/reiserfs/ioctl.c linux-3.4.24-vs2.3.3.9/fs/reiserfs/ioctl.c +--- linux-3.4.24/fs/reiserfs/ioctl.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/reiserfs/ioctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -11,6 +11,21 @@ #include #include @@ -7189,9 +7189,9 @@ diff -NurpP --minimal linux-3.4.23/fs/reiserfs/ioctl.c linux-3.4.23-vs2.3.3.9/fs sd_attrs_to_i_attrs(flags, inode); REISERFS_I(inode)->i_attrs = flags; inode->i_ctime = CURRENT_TIME_SEC; -diff -NurpP --minimal linux-3.4.23/fs/reiserfs/namei.c linux-3.4.23-vs2.3.3.9/fs/reiserfs/namei.c ---- linux-3.4.23/fs/reiserfs/namei.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/reiserfs/namei.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/reiserfs/namei.c linux-3.4.24-vs2.3.3.9/fs/reiserfs/namei.c +--- linux-3.4.24/fs/reiserfs/namei.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/reiserfs/namei.c 2012-05-21 16:15:05.000000000 +0000 @@ -18,6 +18,7 @@ #include "acl.h" #include "xattr.h" @@ -7208,9 +7208,9 @@ diff -NurpP --minimal linux-3.4.23/fs/reiserfs/namei.c linux-3.4.23-vs2.3.3.9/fs return d_splice_alias(inode, dentry); } -diff -NurpP --minimal linux-3.4.23/fs/reiserfs/reiserfs.h linux-3.4.23-vs2.3.3.9/fs/reiserfs/reiserfs.h ---- linux-3.4.23/fs/reiserfs/reiserfs.h 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/reiserfs/reiserfs.h 2012-05-21 19:19:33.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/reiserfs/reiserfs.h linux-3.4.24-vs2.3.3.9/fs/reiserfs/reiserfs.h +--- linux-3.4.24/fs/reiserfs/reiserfs.h 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/reiserfs/reiserfs.h 2012-05-21 17:19:33.000000000 +0000 @@ -544,6 +544,7 @@ enum reiserfs_mount_options { REISERFS_EXPOSE_PRIVROOT, REISERFS_BARRIER_NONE, @@ -7249,9 +7249,9 @@ diff -NurpP --minimal linux-3.4.23/fs/reiserfs/reiserfs.h linux-3.4.23-vs2.3.3.9 int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len); -diff -NurpP --minimal linux-3.4.23/fs/reiserfs/super.c linux-3.4.23-vs2.3.3.9/fs/reiserfs/super.c ---- linux-3.4.23/fs/reiserfs/super.c 2012-12-11 12:37:30.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/reiserfs/super.c 2012-12-08 01:53:53.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/fs/reiserfs/super.c linux-3.4.24-vs2.3.3.9/fs/reiserfs/super.c +--- linux-3.4.24/fs/reiserfs/super.c 2012-12-18 14:01:09.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/reiserfs/super.c 2012-12-08 00:53:53.000000000 +0000 @@ -982,6 +982,14 @@ static int reiserfs_parse_options(struct {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT}, {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT}, @@ -7293,9 +7293,9 @@ diff -NurpP --minimal linux-3.4.23/fs/reiserfs/super.c linux-3.4.23-vs2.3.3.9/fs 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.4.23/fs/reiserfs/xattr.c linux-3.4.23-vs2.3.3.9/fs/reiserfs/xattr.c ---- linux-3.4.23/fs/reiserfs/xattr.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/reiserfs/xattr.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/reiserfs/xattr.c linux-3.4.24-vs2.3.3.9/fs/reiserfs/xattr.c +--- linux-3.4.24/fs/reiserfs/xattr.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/reiserfs/xattr.c 2012-05-21 16:15:05.000000000 +0000 @@ -40,6 +40,7 @@ #include #include @@ -7304,9 +7304,9 @@ diff -NurpP --minimal linux-3.4.23/fs/reiserfs/xattr.c linux-3.4.23-vs2.3.3.9/fs #include #include #include -diff -NurpP --minimal linux-3.4.23/fs/stat.c linux-3.4.23-vs2.3.3.9/fs/stat.c ---- linux-3.4.23/fs/stat.c 2012-12-11 12:37:30.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/stat.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/stat.c linux-3.4.24-vs2.3.3.9/fs/stat.c +--- linux-3.4.24/fs/stat.c 2012-12-18 14:01:09.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/stat.c 2012-10-22 13:09:53.000000000 +0000 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -7315,9 +7315,9 @@ diff -NurpP --minimal linux-3.4.23/fs/stat.c linux-3.4.23-vs2.3.3.9/fs/stat.c stat->rdev = inode->i_rdev; stat->size = i_size_read(inode); stat->atime = inode->i_atime; -diff -NurpP --minimal linux-3.4.23/fs/statfs.c linux-3.4.23-vs2.3.3.9/fs/statfs.c ---- linux-3.4.23/fs/statfs.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/statfs.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/statfs.c linux-3.4.24-vs2.3.3.9/fs/statfs.c +--- linux-3.4.24/fs/statfs.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/statfs.c 2012-05-21 16:15:05.000000000 +0000 @@ -7,6 +7,8 @@ #include #include @@ -7336,9 +7336,9 @@ diff -NurpP --minimal linux-3.4.23/fs/statfs.c linux-3.4.23-vs2.3.3.9/fs/statfs. return retval; } -diff -NurpP --minimal linux-3.4.23/fs/super.c linux-3.4.23-vs2.3.3.9/fs/super.c ---- linux-3.4.23/fs/super.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/super.c 2012-05-21 18:59:38.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/super.c linux-3.4.24-vs2.3.3.9/fs/super.c +--- linux-3.4.24/fs/super.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/super.c 2012-05-21 16:59:38.000000000 +0000 @@ -33,6 +33,8 @@ #include #include @@ -7348,7 +7348,7 @@ diff -NurpP --minimal linux-3.4.23/fs/super.c linux-3.4.23-vs2.3.3.9/fs/super.c #include "internal.h" -@@ -1138,6 +1140,13 @@ mount_fs(struct file_system_type *type, +@@ -1138,6 +1140,13 @@ mount_fs(struct file_system_type *type, WARN_ON(sb->s_bdi == &default_backing_dev_info); sb->s_flags |= MS_BORN; @@ -7362,9 +7362,9 @@ diff -NurpP --minimal linux-3.4.23/fs/super.c linux-3.4.23-vs2.3.3.9/fs/super.c error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-3.4.23/fs/sysfs/mount.c linux-3.4.23-vs2.3.3.9/fs/sysfs/mount.c ---- linux-3.4.23/fs/sysfs/mount.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/sysfs/mount.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/sysfs/mount.c linux-3.4.24-vs2.3.3.9/fs/sysfs/mount.c +--- linux-3.4.24/fs/sysfs/mount.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/sysfs/mount.c 2012-05-21 16:15:05.000000000 +0000 @@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super sb->s_blocksize = PAGE_CACHE_SIZE; @@ -7374,9 +7374,9 @@ diff -NurpP --minimal linux-3.4.23/fs/sysfs/mount.c linux-3.4.23-vs2.3.3.9/fs/sy sb->s_op = &sysfs_ops; sb->s_time_gran = 1; -diff -NurpP --minimal linux-3.4.23/fs/utimes.c linux-3.4.23-vs2.3.3.9/fs/utimes.c ---- linux-3.4.23/fs/utimes.c 2011-05-22 16:17:54.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/utimes.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/utimes.c linux-3.4.24-vs2.3.3.9/fs/utimes.c +--- linux-3.4.24/fs/utimes.c 2011-05-22 14:17:54.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/utimes.c 2012-05-21 16:15:05.000000000 +0000 @@ -8,6 +8,8 @@ #include #include @@ -7406,9 +7406,9 @@ diff -NurpP --minimal linux-3.4.23/fs/utimes.c linux-3.4.23-vs2.3.3.9/fs/utimes. if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-3.4.23/fs/xattr.c linux-3.4.23-vs2.3.3.9/fs/xattr.c ---- linux-3.4.23/fs/xattr.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/xattr.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/xattr.c linux-3.4.24-vs2.3.3.9/fs/xattr.c +--- linux-3.4.24/fs/xattr.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xattr.c 2012-05-21 16:15:05.000000000 +0000 @@ -20,6 +20,7 @@ #include #include @@ -7426,9 +7426,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xattr.c linux-3.4.23-vs2.3.3.9/fs/xattr.c return (mask & MAY_WRITE) ? -EPERM : -ENODATA; return 0; } -diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_dinode.h linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_dinode.h ---- linux-3.4.23/fs/xfs/xfs_dinode.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_dinode.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/xfs/xfs_dinode.h linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_dinode.h +--- linux-3.4.24/fs/xfs/xfs_dinode.h 2011-10-24 16:45:31.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_dinode.h 2012-05-21 16:15:05.000000000 +0000 @@ -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 */ @@ -7469,9 +7469,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_dinode.h linux-3.4.23-vs2.3.3.9/fs +#define XFS_DIVFLAG_COW 0x02 #endif /* __XFS_DINODE_H__ */ -diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_fs.h linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_fs.h ---- linux-3.4.23/fs/xfs/xfs_fs.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_fs.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/xfs/xfs_fs.h linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_fs.h +--- linux-3.4.24/fs/xfs/xfs_fs.h 2011-10-24 16:45:31.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_fs.h 2012-05-21 16:15:05.000000000 +0000 @@ -67,6 +67,9 @@ struct fsxattr { #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */ #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */ @@ -7492,9 +7492,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_fs.h linux-3.4.23-vs2.3.3.9/fs/xfs __u32 bs_dmevmask; /* DMIG event mask */ __u16 bs_dmstate; /* DMIG state info */ __u16 bs_aextents; /* attribute number of extents */ -diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_ialloc.c linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_ialloc.c ---- linux-3.4.23/fs/xfs/xfs_ialloc.c 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_ialloc.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/xfs/xfs_ialloc.c linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_ialloc.c +--- linux-3.4.24/fs/xfs/xfs_ialloc.c 2012-03-19 18:47:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_ialloc.c 2012-05-21 16:15:05.000000000 +0000 @@ -37,7 +37,6 @@ #include "xfs_error.h" #include "xfs_bmap.h" @@ -7503,9 +7503,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_ialloc.c linux-3.4.23-vs2.3.3.9/fs /* * Allocation group level functions. */ -diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_inode.c linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_inode.c ---- linux-3.4.23/fs/xfs/xfs_inode.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_inode.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/xfs/xfs_inode.c linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_inode.c +--- linux-3.4.24/fs/xfs/xfs_inode.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_inode.c 2012-05-21 16:15:05.000000000 +0000 @@ -236,6 +236,7 @@ xfs_inotobp( return 0; } @@ -7680,9 +7680,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_inode.c linux-3.4.23-vs2.3.3.9/fs/ /* 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.4.23/fs/xfs/xfs_inode.h linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_inode.h ---- linux-3.4.23/fs/xfs/xfs_inode.h 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_inode.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/xfs/xfs_inode.h linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_inode.h +--- linux-3.4.24/fs/xfs/xfs_inode.h 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_inode.h 2012-05-21 16:15:05.000000000 +0000 @@ -134,7 +134,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 */ @@ -7703,9 +7703,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_inode.h linux-3.4.23-vs2.3.3.9/fs/ 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.4.23/fs/xfs/xfs_ioctl.c linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_ioctl.c ---- linux-3.4.23/fs/xfs/xfs_ioctl.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_ioctl.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/xfs/xfs_ioctl.c linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_ioctl.c +--- linux-3.4.24/fs/xfs/xfs_ioctl.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_ioctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -28,7 +28,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -7774,9 +7774,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_ioctl.c linux-3.4.23-vs2.3.3.9/fs/ return xfs_ioc_setxflags(ip, filp, arg); case XFS_IOC_FSSETDM: { -diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_ioctl.h linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_ioctl.h ---- linux-3.4.23/fs/xfs/xfs_ioctl.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_ioctl.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/xfs/xfs_ioctl.h linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_ioctl.h +--- linux-3.4.24/fs/xfs/xfs_ioctl.h 2011-10-24 16:45:31.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_ioctl.h 2012-05-21 16:15:05.000000000 +0000 @@ -70,6 +70,12 @@ xfs_handle_to_dentry( void __user *uhandle, u32 hlen); @@ -7790,9 +7790,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_ioctl.h linux-3.4.23-vs2.3.3.9/fs/ extern long xfs_file_ioctl( struct file *filp, -diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_iops.c linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_iops.c ---- linux-3.4.23/fs/xfs/xfs_iops.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_iops.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/xfs/xfs_iops.c linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_iops.c +--- linux-3.4.24/fs/xfs/xfs_iops.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_iops.c 2012-05-21 16:15:05.000000000 +0000 @@ -30,6 +30,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -7868,9 +7868,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_iops.c linux-3.4.23-vs2.3.3.9/fs/x switch (inode->i_mode & S_IFMT) { case S_IFBLK: -diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_itable.c linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_itable.c ---- linux-3.4.23/fs/xfs/xfs_itable.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_itable.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/xfs/xfs_itable.c linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_itable.c +--- linux-3.4.24/fs/xfs/xfs_itable.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_itable.c 2012-05-21 16:15:05.000000000 +0000 @@ -97,6 +97,7 @@ xfs_bulkstat_one_int( buf->bs_mode = dic->di_mode; buf->bs_uid = dic->di_uid; @@ -7879,9 +7879,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_itable.c linux-3.4.23-vs2.3.3.9/fs buf->bs_size = dic->di_size; buf->bs_atime.tv_sec = dic->di_atime.t_sec; buf->bs_atime.tv_nsec = dic->di_atime.t_nsec; -diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_linux.h linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_linux.h ---- linux-3.4.23/fs/xfs/xfs_linux.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_linux.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/xfs/xfs_linux.h linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_linux.h +--- linux-3.4.24/fs/xfs/xfs_linux.h 2011-10-24 16:45:31.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_linux.h 2012-05-21 16:15:05.000000000 +0000 @@ -121,6 +121,7 @@ #define current_cpu() (raw_smp_processor_id()) @@ -7890,9 +7890,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_linux.h linux-3.4.23-vs2.3.3.9/fs/ #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.4.23/fs/xfs/xfs_log_recover.c linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_log_recover.c ---- linux-3.4.23/fs/xfs/xfs_log_recover.c 2012-12-11 12:37:30.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_log_recover.c 2012-11-19 00:52:29.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/fs/xfs/xfs_log_recover.c linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_log_recover.c +--- linux-3.4.24/fs/xfs/xfs_log_recover.c 2012-12-18 14:01:09.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_log_recover.c 2012-11-18 23:52:29.000000000 +0000 @@ -2344,7 +2344,8 @@ xlog_recover_inode_pass2( } @@ -7903,9 +7903,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_log_recover.c linux-3.4.23-vs2.3.3 /* the rest is in on-disk format */ if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) { -diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_mount.h linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_mount.h ---- linux-3.4.23/fs/xfs/xfs_mount.h 2012-05-21 18:07:28.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_mount.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/xfs/xfs_mount.h linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_mount.h +--- linux-3.4.24/fs/xfs/xfs_mount.h 2012-05-21 16:07:28.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_mount.h 2012-05-21 16:15:05.000000000 +0000 @@ -251,6 +251,7 @@ typedef struct xfs_mount { allocator */ #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */ @@ -7914,9 +7914,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_mount.h linux-3.4.23-vs2.3.3.9/fs/ /* * Default minimum read and write sizes. -diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_super.c linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_super.c ---- linux-3.4.23/fs/xfs/xfs_super.c 2012-05-21 18:07:28.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_super.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/xfs/xfs_super.c linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_super.c +--- linux-3.4.24/fs/xfs/xfs_super.c 2012-05-21 16:07:28.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_super.c 2012-05-21 16:15:05.000000000 +0000 @@ -113,6 +113,9 @@ mempool_t *xfs_ioend_pool; #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */ #define MNTOPT_DISCARD "discard" /* Discard unused blocks */ @@ -7989,9 +7989,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_super.c linux-3.4.23-vs2.3.3.9/fs/ /* * 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.4.23/fs/xfs/xfs_vnodeops.c linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_vnodeops.c ---- linux-3.4.23/fs/xfs/xfs_vnodeops.c 2012-05-21 18:07:28.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/fs/xfs/xfs_vnodeops.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/fs/xfs/xfs_vnodeops.c linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_vnodeops.c +--- linux-3.4.24/fs/xfs/xfs_vnodeops.c 2012-05-21 16:07:28.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/fs/xfs/xfs_vnodeops.c 2012-05-21 16:15:05.000000000 +0000 @@ -106,6 +106,77 @@ xfs_readlink_bmap( return error; } @@ -8070,9 +8070,9 @@ diff -NurpP --minimal linux-3.4.23/fs/xfs/xfs_vnodeops.c linux-3.4.23-vs2.3.3.9/ int xfs_readlink( xfs_inode_t *ip, -diff -NurpP --minimal linux-3.4.23/include/linux/Kbuild linux-3.4.23-vs2.3.3.9/include/linux/Kbuild ---- linux-3.4.23/include/linux/Kbuild 2012-12-11 12:37:30.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/Kbuild 2012-07-24 11:52:30.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/Kbuild linux-3.4.24-vs2.3.3.9/include/linux/Kbuild +--- linux-3.4.24/include/linux/Kbuild 2012-12-18 14:01:10.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/Kbuild 2012-07-24 09:52:30.000000000 +0000 @@ -18,6 +18,7 @@ header-y += netfilter_bridge/ header-y += netfilter_ipv4/ header-y += netfilter_ipv6/ @@ -8081,9 +8081,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/Kbuild linux-3.4.23-vs2.3.3.9/i header-y += wimax/ objhdr-y += version.h -diff -NurpP --minimal linux-3.4.23/include/linux/capability.h linux-3.4.23-vs2.3.3.9/include/linux/capability.h ---- linux-3.4.23/include/linux/capability.h 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/capability.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/capability.h linux-3.4.24-vs2.3.3.9/include/linux/capability.h +--- linux-3.4.24/include/linux/capability.h 2012-03-19 18:47:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/capability.h 2012-05-21 16:15:05.000000000 +0000 @@ -280,6 +280,7 @@ struct cpu_vfs_cap_data { arbitrary SCSI commands */ /* Allow setting encryption key on loopback filesystem */ @@ -8106,9 +8106,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/capability.h linux-3.4.23-vs2.3 /* * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-3.4.23/include/linux/cred.h linux-3.4.23-vs2.3.3.9/include/linux/cred.h ---- linux-3.4.23/include/linux/cred.h 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/cred.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/cred.h linux-3.4.24-vs2.3.3.9/include/linux/cred.h +--- linux-3.4.24/include/linux/cred.h 2012-03-19 18:47:27.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/cred.h 2012-05-21 16:15:05.000000000 +0000 @@ -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 *); @@ -8149,18 +8149,18 @@ diff -NurpP --minimal linux-3.4.23/include/linux/cred.h linux-3.4.23-vs2.3.3.9/i /** * get_new_cred - Get a reference on a new set of credentials * @cred: The new credentials to reference -diff -NurpP --minimal linux-3.4.23/include/linux/devpts_fs.h linux-3.4.23-vs2.3.3.9/include/linux/devpts_fs.h ---- linux-3.4.23/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/devpts_fs.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/devpts_fs.h linux-3.4.24-vs2.3.3.9/include/linux/devpts_fs.h +--- linux-3.4.24/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/devpts_fs.h 2012-05-21 16:15:05.000000000 +0000 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc #endif - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/fs.h linux-3.4.23-vs2.3.3.9/include/linux/fs.h ---- linux-3.4.23/include/linux/fs.h 2012-05-21 18:07:29.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/linux/fs.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/fs.h linux-3.4.24-vs2.3.3.9/include/linux/fs.h +--- linux-3.4.24/include/linux/fs.h 2012-05-21 16:07:29.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/fs.h 2012-05-21 16:15:05.000000000 +0000 @@ -214,6 +214,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 */ @@ -8322,7 +8322,7 @@ diff -NurpP --minimal linux-3.4.23/include/linux/fs.h linux-3.4.23-vs2.3.3.9/inc void (*truncate_range)(struct inode *, loff_t, loff_t); int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len); -@@ -1680,6 +1718,7 @@ extern ssize_t vfs_readv(struct file *, +@@ -1680,6 +1718,7 @@ extern ssize_t vfs_readv(struct file *, unsigned long, loff_t *); extern ssize_t vfs_writev(struct file *, const struct iovec __user *, unsigned long, loff_t *); @@ -8330,7 +8330,7 @@ diff -NurpP --minimal linux-3.4.23/include/linux/fs.h linux-3.4.23-vs2.3.3.9/inc struct super_operations { struct inode *(*alloc_inode)(struct super_block *sb); -@@ -2509,6 +2548,7 @@ extern int dcache_dir_open(struct inode +@@ -2509,6 +2548,7 @@ extern int dcache_dir_open(struct inode extern int dcache_dir_close(struct inode *, struct file *); extern loff_t dcache_dir_lseek(struct file *, loff_t, int); extern int dcache_readdir(struct file *, void *, filldir_t); @@ -8338,9 +8338,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/fs.h linux-3.4.23-vs2.3.3.9/inc 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.4.23/include/linux/gfs2_ondisk.h linux-3.4.23-vs2.3.3.9/include/linux/gfs2_ondisk.h ---- linux-3.4.23/include/linux/gfs2_ondisk.h 2012-05-21 18:07:29.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/linux/gfs2_ondisk.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/gfs2_ondisk.h linux-3.4.24-vs2.3.3.9/include/linux/gfs2_ondisk.h +--- linux-3.4.24/include/linux/gfs2_ondisk.h 2012-05-21 16:07:29.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/gfs2_ondisk.h 2012-05-21 16:15:05.000000000 +0000 @@ -214,6 +214,9 @@ enum { gfs2fl_NoAtime = 7, gfs2fl_Sync = 8, @@ -8361,9 +8361,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/gfs2_ondisk.h linux-3.4.23-vs2. #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.4.23/include/linux/if_tun.h linux-3.4.23-vs2.3.3.9/include/linux/if_tun.h ---- linux-3.4.23/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/linux/if_tun.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/if_tun.h linux-3.4.24-vs2.3.3.9/include/linux/if_tun.h +--- linux-3.4.24/include/linux/if_tun.h 2010-08-02 14:52:54.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/if_tun.h 2012-05-21 16:15:05.000000000 +0000 @@ -53,6 +53,7 @@ #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog) #define TUNGETVNETHDRSZ _IOR('T', 215, int) @@ -8372,9 +8372,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/if_tun.h linux-3.4.23-vs2.3.3.9 /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-3.4.23/include/linux/init_task.h linux-3.4.23-vs2.3.3.9/include/linux/init_task.h ---- linux-3.4.23/include/linux/init_task.h 2012-12-11 12:37:30.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/init_task.h 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/init_task.h linux-3.4.24-vs2.3.3.9/include/linux/init_task.h +--- linux-3.4.24/include/linux/init_task.h 2012-12-18 14:01:10.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/init_task.h 2012-10-22 13:09:53.000000000 +0000 @@ -210,6 +210,10 @@ extern struct task_group root_task_group INIT_TRACE_RECURSION \ INIT_TASK_RCU_PREEMPT(tsk) \ @@ -8386,9 +8386,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/init_task.h linux-3.4.23-vs2.3. } -diff -NurpP --minimal linux-3.4.23/include/linux/ipc.h linux-3.4.23-vs2.3.3.9/include/linux/ipc.h ---- linux-3.4.23/include/linux/ipc.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/ipc.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/ipc.h linux-3.4.24-vs2.3.3.9/include/linux/ipc.h +--- linux-3.4.24/include/linux/ipc.h 2012-03-19 18:47:28.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/ipc.h 2012-05-21 16:15:05.000000000 +0000 @@ -91,6 +91,7 @@ struct kern_ipc_perm key_t key; uid_t uid; @@ -8397,9 +8397,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/ipc.h linux-3.4.23-vs2.3.3.9/in uid_t cuid; gid_t cgid; umode_t mode; -diff -NurpP --minimal linux-3.4.23/include/linux/ipc_namespace.h linux-3.4.23-vs2.3.3.9/include/linux/ipc_namespace.h ---- linux-3.4.23/include/linux/ipc_namespace.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/linux/ipc_namespace.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/ipc_namespace.h linux-3.4.24-vs2.3.3.9/include/linux/ipc_namespace.h +--- linux-3.4.24/include/linux/ipc_namespace.h 2011-10-24 16:45:32.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/ipc_namespace.h 2012-05-21 16:15:05.000000000 +0000 @@ -101,7 +101,8 @@ static inline int mq_init_ns(struct ipc_ #if defined(CONFIG_IPC_NS) @@ -8426,9 +8426,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/ipc_namespace.h linux-3.4.23-vs } static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) -diff -NurpP --minimal linux-3.4.23/include/linux/loop.h linux-3.4.23-vs2.3.3.9/include/linux/loop.h ---- linux-3.4.23/include/linux/loop.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/loop.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/loop.h linux-3.4.24-vs2.3.3.9/include/linux/loop.h +--- linux-3.4.24/include/linux/loop.h 2012-01-09 15:14:58.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/loop.h 2012-05-21 16:15:05.000000000 +0000 @@ -45,6 +45,7 @@ struct loop_device { struct loop_func_table *lo_encryption; __u32 lo_init[2]; @@ -8437,9 +8437,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/loop.h linux-3.4.23-vs2.3.3.9/i int (*ioctl)(struct loop_device *, int cmd, unsigned long arg); -diff -NurpP --minimal linux-3.4.23/include/linux/magic.h linux-3.4.23-vs2.3.3.9/include/linux/magic.h ---- linux-3.4.23/include/linux/magic.h 2012-05-21 18:07:31.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/linux/magic.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/magic.h linux-3.4.24-vs2.3.3.9/include/linux/magic.h +--- linux-3.4.24/include/linux/magic.h 2012-05-21 16:07:31.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/magic.h 2012-05-21 16:15:05.000000000 +0000 @@ -3,7 +3,7 @@ #define ADFS_SUPER_MAGIC 0xadf5 @@ -8449,9 +8449,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/magic.h linux-3.4.23-vs2.3.3.9/ #define AUTOFS_SUPER_MAGIC 0x0187 #define CODA_SUPER_MAGIC 0x73757245 #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ -diff -NurpP --minimal linux-3.4.23/include/linux/major.h linux-3.4.23-vs2.3.3.9/include/linux/major.h ---- linux-3.4.23/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/linux/major.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/major.h linux-3.4.24-vs2.3.3.9/include/linux/major.h +--- linux-3.4.24/include/linux/major.h 2009-09-10 13:26:25.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/major.h 2012-05-21 16:15:05.000000000 +0000 @@ -15,6 +15,7 @@ #define HD_MAJOR IDE0_MAJOR #define PTY_SLAVE_MAJOR 3 @@ -8460,9 +8460,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/major.h linux-3.4.23-vs2.3.3.9/ #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-3.4.23/include/linux/memcontrol.h linux-3.4.23-vs2.3.3.9/include/linux/memcontrol.h ---- linux-3.4.23/include/linux/memcontrol.h 2012-05-21 18:07:31.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/linux/memcontrol.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/memcontrol.h linux-3.4.24-vs2.3.3.9/include/linux/memcontrol.h +--- linux-3.4.24/include/linux/memcontrol.h 2012-05-21 16:07:31.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/memcontrol.h 2012-05-21 16:15:05.000000000 +0000 @@ -88,6 +88,13 @@ extern struct mem_cgroup *try_get_mem_cg extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg); extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont); @@ -8477,9 +8477,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/memcontrol.h linux-3.4.23-vs2.3 static inline int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup) { -diff -NurpP --minimal linux-3.4.23/include/linux/mm_types.h linux-3.4.23-vs2.3.3.9/include/linux/mm_types.h ---- linux-3.4.23/include/linux/mm_types.h 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/mm_types.h 2012-07-18 00:29:43.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/mm_types.h linux-3.4.24-vs2.3.3.9/include/linux/mm_types.h +--- linux-3.4.24/include/linux/mm_types.h 2012-12-18 14:01:10.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/mm_types.h 2012-07-17 22:29:43.000000000 +0000 @@ -353,6 +353,7 @@ struct mm_struct { /* Architecture-specific MM context */ @@ -8488,9 +8488,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/mm_types.h linux-3.4.23-vs2.3.3 /* Swap token stuff */ /* -diff -NurpP --minimal linux-3.4.23/include/linux/mmzone.h linux-3.4.23-vs2.3.3.9/include/linux/mmzone.h ---- linux-3.4.23/include/linux/mmzone.h 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/mmzone.h 2012-07-18 00:29:43.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/mmzone.h linux-3.4.24-vs2.3.3.9/include/linux/mmzone.h +--- linux-3.4.24/include/linux/mmzone.h 2012-12-18 14:01:10.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/mmzone.h 2012-07-17 22:29:43.000000000 +0000 @@ -684,6 +684,13 @@ typedef struct pglist_data { __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\ }) @@ -8505,9 +8505,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/mmzone.h linux-3.4.23-vs2.3.3.9 #include extern struct mutex zonelists_mutex; -diff -NurpP --minimal linux-3.4.23/include/linux/mount.h linux-3.4.23-vs2.3.3.9/include/linux/mount.h ---- linux-3.4.23/include/linux/mount.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/mount.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/mount.h linux-3.4.24-vs2.3.3.9/include/linux/mount.h +--- linux-3.4.24/include/linux/mount.h 2012-03-19 18:47:28.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/mount.h 2012-05-21 16:15:05.000000000 +0000 @@ -47,6 +47,9 @@ struct mnt_namespace; #define MNT_INTERNAL 0x4000 @@ -8518,9 +8518,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/mount.h linux-3.4.23-vs2.3.3.9/ struct vfsmount { struct dentry *mnt_root; /* root of the mounted tree */ struct super_block *mnt_sb; /* pointer to superblock */ -diff -NurpP --minimal linux-3.4.23/include/linux/net.h linux-3.4.23-vs2.3.3.9/include/linux/net.h ---- linux-3.4.23/include/linux/net.h 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/net.h 2012-09-01 10:51:18.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/net.h linux-3.4.24-vs2.3.3.9/include/linux/net.h +--- linux-3.4.24/include/linux/net.h 2012-12-18 14:01:10.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/net.h 2012-09-01 08:51:18.000000000 +0000 @@ -73,6 +73,7 @@ struct net; #define SOCK_PASSCRED 3 #define SOCK_PASSSEC 4 @@ -8529,9 +8529,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/net.h linux-3.4.23-vs2.3.3.9/in #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-3.4.23/include/linux/netdevice.h linux-3.4.23-vs2.3.3.9/include/linux/netdevice.h ---- linux-3.4.23/include/linux/netdevice.h 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/netdevice.h 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/netdevice.h linux-3.4.24-vs2.3.3.9/include/linux/netdevice.h +--- linux-3.4.24/include/linux/netdevice.h 2012-12-18 14:01:10.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/netdevice.h 2012-10-22 13:09:53.000000000 +0000 @@ -1624,6 +1624,7 @@ extern void netdev_resync_ops(struct ne extern struct net_device *dev_get_by_index(struct net *net, int ifindex); @@ -8540,9 +8540,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/netdevice.h linux-3.4.23-vs2.3. 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.4.23/include/linux/nfs_mount.h linux-3.4.23-vs2.3.3.9/include/linux/nfs_mount.h ---- linux-3.4.23/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/nfs_mount.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/nfs_mount.h linux-3.4.24-vs2.3.3.9/include/linux/nfs_mount.h +--- linux-3.4.24/include/linux/nfs_mount.h 2011-01-05 20:50:31.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/nfs_mount.h 2012-05-21 16:15:05.000000000 +0000 @@ -63,7 +63,8 @@ struct nfs_mount_data { #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ @@ -8553,9 +8553,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/nfs_mount.h linux-3.4.23-vs2.3. /* The following are for internal use only */ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-3.4.23/include/linux/nsproxy.h linux-3.4.23-vs2.3.3.9/include/linux/nsproxy.h ---- linux-3.4.23/include/linux/nsproxy.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/linux/nsproxy.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/nsproxy.h linux-3.4.24-vs2.3.3.9/include/linux/nsproxy.h +--- linux-3.4.24/include/linux/nsproxy.h 2011-10-24 16:45:32.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/nsproxy.h 2012-05-21 16:15:05.000000000 +0000 @@ -3,6 +3,7 @@ #include @@ -8572,7 +8572,7 @@ diff -NurpP --minimal linux-3.4.23/include/linux/nsproxy.h linux-3.4.23-vs2.3.3. void exit_task_namespaces(struct task_struct *tsk); void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new); void free_nsproxy(struct nsproxy *ns); -@@ -70,16 +72,26 @@ int unshare_nsproxy_namespaces(unsigned +@@ -70,16 +72,26 @@ int unshare_nsproxy_namespaces(unsigned struct fs_struct *); int __init nsproxy_cache_init(void); @@ -8605,9 +8605,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/nsproxy.h linux-3.4.23-vs2.3.3. } #endif -diff -NurpP --minimal linux-3.4.23/include/linux/pid.h linux-3.4.23-vs2.3.3.9/include/linux/pid.h ---- linux-3.4.23/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/linux/pid.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/pid.h linux-3.4.24-vs2.3.3.9/include/linux/pid.h +--- linux-3.4.24/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/pid.h 2012-05-21 16:15:05.000000000 +0000 @@ -8,7 +8,8 @@ enum pid_type PIDTYPE_PID, PIDTYPE_PGID, @@ -8626,9 +8626,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/pid.h linux-3.4.23-vs2.3.3.9/in pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-3.4.23/include/linux/proc_fs.h linux-3.4.23-vs2.3.3.9/include/linux/proc_fs.h ---- linux-3.4.23/include/linux/proc_fs.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/proc_fs.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/proc_fs.h linux-3.4.24-vs2.3.3.9/include/linux/proc_fs.h +--- linux-3.4.24/include/linux/proc_fs.h 2012-03-19 18:47:28.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/proc_fs.h 2012-05-21 16:15:05.000000000 +0000 @@ -54,6 +54,7 @@ struct proc_dir_entry { nlink_t nlink; uid_t uid; @@ -8664,9 +8664,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/proc_fs.h linux-3.4.23-vs2.3.3. int fd; union proc_op op; struct proc_dir_entry *pde; -diff -NurpP --minimal linux-3.4.23/include/linux/quotaops.h linux-3.4.23-vs2.3.3.9/include/linux/quotaops.h ---- linux-3.4.23/include/linux/quotaops.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/quotaops.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/quotaops.h linux-3.4.24-vs2.3.3.9/include/linux/quotaops.h +--- linux-3.4.24/include/linux/quotaops.h 2012-01-09 15:14:58.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/quotaops.h 2012-05-21 16:15:05.000000000 +0000 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -8689,7 +8689,7 @@ diff -NurpP --minimal linux-3.4.23/include/linux/quotaops.h linux-3.4.23-vs2.3.3 } static inline int dquot_transfer(struct inode *inode, struct iattr *iattr) -@@ -219,6 +221,10 @@ static inline int dquot_transfer(struct +@@ -219,6 +221,10 @@ static inline int dquot_transfer(struct static inline int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags) { @@ -8708,9 +8708,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/quotaops.h linux-3.4.23-vs2.3.3 } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-3.4.23/include/linux/reboot.h linux-3.4.23-vs2.3.3.9/include/linux/reboot.h ---- linux-3.4.23/include/linux/reboot.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/linux/reboot.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/reboot.h linux-3.4.24-vs2.3.3.9/include/linux/reboot.h +--- linux-3.4.24/include/linux/reboot.h 2011-10-24 16:45:32.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/reboot.h 2012-05-21 16:15:05.000000000 +0000 @@ -33,6 +33,7 @@ #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 @@ -8719,9 +8719,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/reboot.h linux-3.4.23-vs2.3.3.9 #ifdef __KERNEL__ -diff -NurpP --minimal linux-3.4.23/include/linux/sched.h linux-3.4.23-vs2.3.3.9/include/linux/sched.h ---- linux-3.4.23/include/linux/sched.h 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/sched.h 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/sched.h linux-3.4.24-vs2.3.3.9/include/linux/sched.h +--- linux-3.4.24/include/linux/sched.h 2012-12-18 14:01:11.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/sched.h 2012-10-22 13:09:53.000000000 +0000 @@ -1455,6 +1455,14 @@ struct task_struct { #endif seccomp_t seccomp; @@ -8768,9 +8768,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/sched.h linux-3.4.23-vs2.3.3.9/ } -diff -NurpP --minimal linux-3.4.23/include/linux/shmem_fs.h linux-3.4.23-vs2.3.3.9/include/linux/shmem_fs.h ---- linux-3.4.23/include/linux/shmem_fs.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/shmem_fs.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/shmem_fs.h linux-3.4.24-vs2.3.3.9/include/linux/shmem_fs.h +--- linux-3.4.24/include/linux/shmem_fs.h 2012-03-19 18:47:29.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/shmem_fs.h 2012-05-21 16:15:05.000000000 +0000 @@ -8,6 +8,9 @@ /* inode in-kernel data */ @@ -8781,9 +8781,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/shmem_fs.h linux-3.4.23-vs2.3.3 struct shmem_inode_info { spinlock_t lock; unsigned long flags; -diff -NurpP --minimal linux-3.4.23/include/linux/stat.h linux-3.4.23-vs2.3.3.9/include/linux/stat.h ---- linux-3.4.23/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/stat.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/stat.h linux-3.4.24-vs2.3.3.9/include/linux/stat.h +--- linux-3.4.24/include/linux/stat.h 2008-12-24 23:26:37.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/stat.h 2012-05-21 16:15:05.000000000 +0000 @@ -66,6 +66,7 @@ struct kstat { unsigned int nlink; uid_t uid; @@ -8792,9 +8792,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/stat.h linux-3.4.23-vs2.3.3.9/i dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-3.4.23/include/linux/sunrpc/auth.h linux-3.4.23-vs2.3.3.9/include/linux/sunrpc/auth.h ---- linux-3.4.23/include/linux/sunrpc/auth.h 2012-05-21 18:07:32.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/linux/sunrpc/auth.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/sunrpc/auth.h linux-3.4.24-vs2.3.3.9/include/linux/sunrpc/auth.h +--- linux-3.4.24/include/linux/sunrpc/auth.h 2012-05-21 16:07:32.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/sunrpc/auth.h 2012-05-21 16:15:05.000000000 +0000 @@ -25,6 +25,7 @@ struct auth_cred { uid_t uid; @@ -8803,9 +8803,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/sunrpc/auth.h linux-3.4.23-vs2. struct group_info *group_info; const char *principal; unsigned char machine_cred : 1; -diff -NurpP --minimal linux-3.4.23/include/linux/sunrpc/clnt.h linux-3.4.23-vs2.3.3.9/include/linux/sunrpc/clnt.h ---- linux-3.4.23/include/linux/sunrpc/clnt.h 2012-05-21 18:07:32.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/linux/sunrpc/clnt.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/sunrpc/clnt.h linux-3.4.24-vs2.3.3.9/include/linux/sunrpc/clnt.h +--- linux-3.4.24/include/linux/sunrpc/clnt.h 2012-05-21 16:07:32.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/sunrpc/clnt.h 2012-05-21 16:15:05.000000000 +0000 @@ -49,7 +49,8 @@ struct rpc_clnt { unsigned int cl_softrtry : 1,/* soft timeouts */ cl_discrtry : 1,/* disconnect before retry */ @@ -8816,9 +8816,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/sunrpc/clnt.h linux-3.4.23-vs2. struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-3.4.23/include/linux/sysctl.h linux-3.4.23-vs2.3.3.9/include/linux/sysctl.h ---- linux-3.4.23/include/linux/sysctl.h 2012-05-21 18:07:32.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/linux/sysctl.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/sysctl.h linux-3.4.24-vs2.3.3.9/include/linux/sysctl.h +--- linux-3.4.24/include/linux/sysctl.h 2012-05-21 16:07:32.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/sysctl.h 2012-05-21 16:15:05.000000000 +0000 @@ -60,6 +60,7 @@ enum CTL_ABI=9, /* Binary emulation */ CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ @@ -8835,9 +8835,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/sysctl.h linux-3.4.23-vs2.3.3.9 KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-3.4.23/include/linux/sysfs.h linux-3.4.23-vs2.3.3.9/include/linux/sysfs.h ---- linux-3.4.23/include/linux/sysfs.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/sysfs.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/sysfs.h linux-3.4.24-vs2.3.3.9/include/linux/sysfs.h +--- linux-3.4.24/include/linux/sysfs.h 2012-03-19 18:47:29.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/sysfs.h 2012-05-21 16:15:05.000000000 +0000 @@ -19,6 +19,8 @@ #include #include @@ -8847,9 +8847,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/sysfs.h linux-3.4.23-vs2.3.3.9/ struct kobject; struct module; enum kobj_ns_type; -diff -NurpP --minimal linux-3.4.23/include/linux/time.h linux-3.4.23-vs2.3.3.9/include/linux/time.h ---- linux-3.4.23/include/linux/time.h 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/time.h 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/time.h linux-3.4.24-vs2.3.3.9/include/linux/time.h +--- linux-3.4.24/include/linux/time.h 2012-12-18 14:01:11.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/time.h 2012-10-22 13:09:53.000000000 +0000 @@ -281,6 +281,8 @@ static __always_inline void timespec_add a->tv_nsec = ns; } @@ -8859,9 +8859,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/time.h linux-3.4.23-vs2.3.3.9/i #endif /* __KERNEL__ */ /* -diff -NurpP --minimal linux-3.4.23/include/linux/types.h linux-3.4.23-vs2.3.3.9/include/linux/types.h ---- linux-3.4.23/include/linux/types.h 2012-05-21 18:07:32.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/linux/types.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/types.h linux-3.4.24-vs2.3.3.9/include/linux/types.h +--- linux-3.4.24/include/linux/types.h 2012-05-21 16:07:32.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/types.h 2012-05-21 16:15:05.000000000 +0000 @@ -41,6 +41,9 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; @@ -8872,9 +8872,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/types.h linux-3.4.23-vs2.3.3.9/ typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-3.4.23/include/linux/utsname.h linux-3.4.23-vs2.3.3.9/include/linux/utsname.h ---- linux-3.4.23/include/linux/utsname.h 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/utsname.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/utsname.h linux-3.4.24-vs2.3.3.9/include/linux/utsname.h +--- linux-3.4.24/include/linux/utsname.h 2012-01-09 15:14:59.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/utsname.h 2012-05-21 16:15:05.000000000 +0000 @@ -62,7 +62,8 @@ static inline void get_uts_ns(struct uts } @@ -8901,9 +8901,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/utsname.h linux-3.4.23-vs2.3.3. } #endif -diff -NurpP --minimal linux-3.4.23/include/linux/vroot.h linux-3.4.23-vs2.3.3.9/include/linux/vroot.h ---- linux-3.4.23/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vroot.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vroot.h linux-3.4.24-vs2.3.3.9/include/linux/vroot.h +--- linux-3.4.24/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vroot.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,51 @@ + +/* @@ -8956,9 +8956,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vroot.h linux-3.4.23-vs2.3.3.9/ +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vs_base.h linux-3.4.23-vs2.3.3.9/include/linux/vs_base.h ---- linux-3.4.23/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_base.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_base.h linux-3.4.24-vs2.3.3.9/include/linux/vs_base.h +--- linux-3.4.24/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_base.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VS_BASE_H +#define _VS_BASE_H @@ -8970,9 +8970,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_base.h linux-3.4.23-vs2.3.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vs_context.h linux-3.4.23-vs2.3.3.9/include/linux/vs_context.h ---- linux-3.4.23/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_context.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_context.h linux-3.4.24-vs2.3.3.9/include/linux/vs_context.h +--- linux-3.4.24/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_context.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,242 @@ +#ifndef _VS_CONTEXT_H +#define _VS_CONTEXT_H @@ -9216,9 +9216,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_context.h linux-3.4.23-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vs_cowbl.h linux-3.4.23-vs2.3.3.9/include/linux/vs_cowbl.h ---- linux-3.4.23/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_cowbl.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_cowbl.h linux-3.4.24-vs2.3.3.9/include/linux/vs_cowbl.h +--- linux-3.4.24/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_cowbl.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,48 @@ +#ifndef _VS_COWBL_H +#define _VS_COWBL_H @@ -9268,9 +9268,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_cowbl.h linux-3.4.23-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vs_cvirt.h linux-3.4.23-vs2.3.3.9/include/linux/vs_cvirt.h ---- linux-3.4.23/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_cvirt.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_cvirt.h linux-3.4.24-vs2.3.3.9/include/linux/vs_cvirt.h +--- linux-3.4.24/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_cvirt.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,50 @@ +#ifndef _VS_CVIRT_H +#define _VS_CVIRT_H @@ -9322,9 +9322,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_cvirt.h linux-3.4.23-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vs_device.h linux-3.4.23-vs2.3.3.9/include/linux/vs_device.h ---- linux-3.4.23/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_device.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_device.h linux-3.4.24-vs2.3.3.9/include/linux/vs_device.h +--- linux-3.4.24/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_device.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,45 @@ +#ifndef _VS_DEVICE_H +#define _VS_DEVICE_H @@ -9371,9 +9371,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_device.h linux-3.4.23-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vs_dlimit.h linux-3.4.23-vs2.3.3.9/include/linux/vs_dlimit.h ---- linux-3.4.23/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_dlimit.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_dlimit.h linux-3.4.24-vs2.3.3.9/include/linux/vs_dlimit.h +--- linux-3.4.24/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_dlimit.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,215 @@ +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H @@ -9590,9 +9590,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_dlimit.h linux-3.4.23-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vs_inet.h linux-3.4.23-vs2.3.3.9/include/linux/vs_inet.h ---- linux-3.4.23/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_inet.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_inet.h linux-3.4.24-vs2.3.3.9/include/linux/vs_inet.h +--- linux-3.4.24/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_inet.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,353 @@ +#ifndef _VS_INET_H +#define _VS_INET_H @@ -9947,9 +9947,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_inet.h linux-3.4.23-vs2.3.3. +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vs_inet6.h linux-3.4.23-vs2.3.3.9/include/linux/vs_inet6.h ---- linux-3.4.23/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_inet6.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_inet6.h linux-3.4.24-vs2.3.3.9/include/linux/vs_inet6.h +--- linux-3.4.24/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_inet6.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,246 @@ +#ifndef _VS_INET6_H +#define _VS_INET6_H @@ -10197,9 +10197,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_inet6.h linux-3.4.23-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vs_limit.h linux-3.4.23-vs2.3.3.9/include/linux/vs_limit.h ---- linux-3.4.23/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_limit.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_limit.h linux-3.4.24-vs2.3.3.9/include/linux/vs_limit.h +--- linux-3.4.24/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_limit.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,140 @@ +#ifndef _VS_LIMIT_H +#define _VS_LIMIT_H @@ -10341,9 +10341,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_limit.h linux-3.4.23-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vs_network.h linux-3.4.23-vs2.3.3.9/include/linux/vs_network.h ---- linux-3.4.23/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_network.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_network.h linux-3.4.24-vs2.3.3.9/include/linux/vs_network.h +--- linux-3.4.24/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_network.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,169 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -10514,9 +10514,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_network.h linux-3.4.23-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vs_pid.h linux-3.4.23-vs2.3.3.9/include/linux/vs_pid.h ---- linux-3.4.23/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_pid.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_pid.h linux-3.4.24-vs2.3.3.9/include/linux/vs_pid.h +--- linux-3.4.24/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_pid.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,50 @@ +#ifndef _VS_PID_H +#define _VS_PID_H @@ -10568,9 +10568,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_pid.h linux-3.4.23-vs2.3.3.9 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vs_sched.h linux-3.4.23-vs2.3.3.9/include/linux/vs_sched.h ---- linux-3.4.23/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_sched.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_sched.h linux-3.4.24-vs2.3.3.9/include/linux/vs_sched.h +--- linux-3.4.24/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_sched.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,40 @@ +#ifndef _VS_SCHED_H +#define _VS_SCHED_H @@ -10612,9 +10612,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_sched.h linux-3.4.23-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vs_socket.h linux-3.4.23-vs2.3.3.9/include/linux/vs_socket.h ---- linux-3.4.23/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_socket.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_socket.h linux-3.4.24-vs2.3.3.9/include/linux/vs_socket.h +--- linux-3.4.24/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_socket.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,67 @@ +#ifndef _VS_SOCKET_H +#define _VS_SOCKET_H @@ -10683,9 +10683,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_socket.h linux-3.4.23-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vs_tag.h linux-3.4.23-vs2.3.3.9/include/linux/vs_tag.h ---- linux-3.4.23/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_tag.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_tag.h linux-3.4.24-vs2.3.3.9/include/linux/vs_tag.h +--- linux-3.4.24/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_tag.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,47 @@ +#ifndef _VS_TAG_H +#define _VS_TAG_H @@ -10734,9 +10734,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_tag.h linux-3.4.23-vs2.3.3.9 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vs_time.h linux-3.4.23-vs2.3.3.9/include/linux/vs_time.h ---- linux-3.4.23/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vs_time.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vs_time.h linux-3.4.24-vs2.3.3.9/include/linux/vs_time.h +--- linux-3.4.24/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vs_time.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VS_TIME_H +#define _VS_TIME_H @@ -10757,9 +10757,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vs_time.h linux-3.4.23-vs2.3.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/Kbuild linux-3.4.23-vs2.3.3.9/include/linux/vserver/Kbuild ---- linux-3.4.23/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/Kbuild 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/Kbuild linux-3.4.24-vs2.3.3.9/include/linux/vserver/Kbuild +--- linux-3.4.24/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/Kbuild 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,8 @@ + +header-y += context_cmd.h network_cmd.h space_cmd.h \ @@ -10769,9 +10769,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/Kbuild linux-3.4.23-vs2 + +header-y += switch.h network.h monitor.h inode.h device.h + -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/base.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/base.h ---- linux-3.4.23/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/base.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/base.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/base.h +--- linux-3.4.24/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/base.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,178 @@ +#ifndef _VX_BASE_H +#define _VX_BASE_H @@ -10951,9 +10951,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/base.h linux-3.4.23-vs2 +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/cacct.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/cacct.h ---- linux-3.4.23/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/cacct.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/cacct.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/cacct.h +--- linux-3.4.24/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/cacct.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,15 @@ +#ifndef _VX_CACCT_H +#define _VX_CACCT_H @@ -10970,9 +10970,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/cacct.h linux-3.4.23-vs +}; + +#endif /* _VX_CACCT_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/cacct_cmd.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/cacct_cmd.h ---- linux-3.4.23/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/cacct_cmd.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/cacct_cmd.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/cacct_cmd.h +--- linux-3.4.24/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/cacct_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef _VX_CACCT_CMD_H +#define _VX_CACCT_CMD_H @@ -10997,9 +10997,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/cacct_cmd.h linux-3.4.2 + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/cacct_def.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/cacct_def.h ---- linux-3.4.23/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/cacct_def.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/cacct_def.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/cacct_def.h +--- linux-3.4.24/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/cacct_def.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,43 @@ +#ifndef _VX_CACCT_DEF_H +#define _VX_CACCT_DEF_H @@ -11044,9 +11044,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/cacct_def.h linux-3.4.2 +#endif + +#endif /* _VX_CACCT_DEF_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/cacct_int.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/cacct_int.h ---- linux-3.4.23/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/cacct_int.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/cacct_int.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/cacct_int.h +--- linux-3.4.24/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/cacct_int.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,21 @@ +#ifndef _VX_CACCT_INT_H +#define _VX_CACCT_INT_H @@ -11069,9 +11069,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/cacct_int.h linux-3.4.2 + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_INT_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/check.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/check.h ---- linux-3.4.23/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/check.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/check.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/check.h +--- linux-3.4.24/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/check.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,89 @@ +#ifndef _VS_CHECK_H +#define _VS_CHECK_H @@ -11162,9 +11162,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/check.h linux-3.4.23-vs +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/context.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/context.h ---- linux-3.4.23/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/context.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/context.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/context.h +--- linux-3.4.24/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/context.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,188 @@ +#ifndef _VX_CONTEXT_H +#define _VX_CONTEXT_H @@ -11354,9 +11354,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/context.h linux-3.4.23- + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/context_cmd.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/context_cmd.h ---- linux-3.4.23/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/context_cmd.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/context_cmd.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/context_cmd.h +--- linux-3.4.24/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/context_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,162 @@ +#ifndef _VX_CONTEXT_CMD_H +#define _VX_CONTEXT_CMD_H @@ -11520,9 +11520,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/context_cmd.h linux-3.4 + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/cvirt.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/cvirt.h ---- linux-3.4.23/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/cvirt.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/cvirt.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/cvirt.h +--- linux-3.4.24/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/cvirt.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,22 @@ +#ifndef _VX_CVIRT_H +#define _VX_CVIRT_H @@ -11546,9 +11546,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/cvirt.h linux-3.4.23-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/cvirt_cmd.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h ---- linux-3.4.23/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/cvirt_cmd.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h +--- linux-3.4.24/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,53 @@ +#ifndef _VX_CVIRT_CMD_H +#define _VX_CVIRT_CMD_H @@ -11603,9 +11603,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/cvirt_cmd.h linux-3.4.2 + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/cvirt_def.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/cvirt_def.h ---- linux-3.4.23/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/cvirt_def.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/cvirt_def.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/cvirt_def.h +--- linux-3.4.24/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/cvirt_def.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,80 @@ +#ifndef _VX_CVIRT_DEF_H +#define _VX_CVIRT_DEF_H @@ -11687,9 +11687,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/cvirt_def.h linux-3.4.2 +#endif + +#endif /* _VX_CVIRT_DEF_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/debug.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/debug.h ---- linux-3.4.23/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/debug.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/debug.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/debug.h +--- linux-3.4.24/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/debug.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,145 @@ +#ifndef _VX_DEBUG_H +#define _VX_DEBUG_H @@ -11836,9 +11836,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/debug.h linux-3.4.23-vs + + +#endif /* _VX_DEBUG_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/debug_cmd.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/debug_cmd.h ---- linux-3.4.23/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/debug_cmd.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/debug_cmd.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/debug_cmd.h +--- linux-3.4.24/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/debug_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,58 @@ +#ifndef _VX_DEBUG_CMD_H +#define _VX_DEBUG_CMD_H @@ -11898,9 +11898,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/debug_cmd.h linux-3.4.2 + +#endif /* __KERNEL__ */ +#endif /* _VX_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/device.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/device.h ---- linux-3.4.23/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/device.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/device.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/device.h +--- linux-3.4.24/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/device.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,15 @@ +#ifndef _VX_DEVICE_H +#define _VX_DEVICE_H @@ -11917,9 +11917,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/device.h linux-3.4.23-v +#else /* _VX_DEVICE_H */ +#warning duplicate inclusion +#endif /* _VX_DEVICE_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/device_cmd.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/device_cmd.h ---- linux-3.4.23/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/device_cmd.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/device_cmd.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/device_cmd.h +--- linux-3.4.24/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/device_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,44 @@ +#ifndef _VX_DEVICE_CMD_H +#define _VX_DEVICE_CMD_H @@ -11965,9 +11965,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/device_cmd.h linux-3.4. + +#endif /* __KERNEL__ */ +#endif /* _VX_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/device_def.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/device_def.h ---- linux-3.4.23/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/device_def.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/device_def.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/device_def.h +--- linux-3.4.24/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/device_def.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,17 @@ +#ifndef _VX_DEVICE_DEF_H +#define _VX_DEVICE_DEF_H @@ -11986,9 +11986,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/device_def.h linux-3.4. +}; + +#endif /* _VX_DEVICE_DEF_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/dlimit.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/dlimit.h ---- linux-3.4.23/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/dlimit.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/dlimit.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/dlimit.h +--- linux-3.4.24/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/dlimit.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,54 @@ +#ifndef _VX_DLIMIT_H +#define _VX_DLIMIT_H @@ -12044,9 +12044,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/dlimit.h linux-3.4.23-v +#else /* _VX_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VX_DLIMIT_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/dlimit_cmd.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h ---- linux-3.4.23/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/dlimit_cmd.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h +--- linux-3.4.24/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,109 @@ +#ifndef _VX_DLIMIT_CMD_H +#define _VX_DLIMIT_CMD_H @@ -12157,9 +12157,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/dlimit_cmd.h linux-3.4. + +#endif /* __KERNEL__ */ +#endif /* _VX_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/global.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/global.h ---- linux-3.4.23/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/global.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/global.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/global.h +--- linux-3.4.24/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/global.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VX_GLOBAL_H +#define _VX_GLOBAL_H @@ -12180,9 +12180,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/global.h linux-3.4.23-v + + +#endif /* _VX_GLOBAL_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/history.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/history.h ---- linux-3.4.23/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/history.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/history.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/history.h +--- linux-3.4.24/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/history.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,197 @@ +#ifndef _VX_HISTORY_H +#define _VX_HISTORY_H @@ -12381,9 +12381,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/history.h linux-3.4.23- +#endif /* CONFIG_VSERVER_HISTORY */ + +#endif /* _VX_HISTORY_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/inode.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/inode.h ---- linux-3.4.23/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/inode.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/inode.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/inode.h +--- linux-3.4.24/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/inode.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,39 @@ +#ifndef _VX_INODE_H +#define _VX_INODE_H @@ -12424,9 +12424,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/inode.h linux-3.4.23-vs +#else /* _VX_INODE_H */ +#warning duplicate inclusion +#endif /* _VX_INODE_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/inode_cmd.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/inode_cmd.h ---- linux-3.4.23/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/inode_cmd.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/inode_cmd.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/inode_cmd.h +--- linux-3.4.24/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/inode_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,59 @@ +#ifndef _VX_INODE_CMD_H +#define _VX_INODE_CMD_H @@ -12487,9 +12487,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/inode_cmd.h linux-3.4.2 + +#endif /* __KERNEL__ */ +#endif /* _VX_INODE_CMD_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/limit.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/limit.h ---- linux-3.4.23/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/limit.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/limit.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/limit.h +--- linux-3.4.24/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/limit.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,71 @@ +#ifndef _VX_LIMIT_H +#define _VX_LIMIT_H @@ -12562,9 +12562,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/limit.h linux-3.4.23-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/limit_cmd.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/limit_cmd.h ---- linux-3.4.23/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/limit_cmd.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/limit_cmd.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/limit_cmd.h +--- linux-3.4.24/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/limit_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,71 @@ +#ifndef _VX_LIMIT_CMD_H +#define _VX_LIMIT_CMD_H @@ -12637,9 +12637,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/limit_cmd.h linux-3.4.2 + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/limit_def.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/limit_def.h ---- linux-3.4.23/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/limit_def.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/limit_def.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/limit_def.h +--- linux-3.4.24/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/limit_def.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,47 @@ +#ifndef _VX_LIMIT_DEF_H +#define _VX_LIMIT_DEF_H @@ -12688,9 +12688,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/limit_def.h linux-3.4.2 +#endif + +#endif /* _VX_LIMIT_DEF_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/limit_int.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/limit_int.h ---- linux-3.4.23/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/limit_int.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/limit_int.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/limit_int.h +--- linux-3.4.24/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/limit_int.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,198 @@ +#ifndef _VX_LIMIT_INT_H +#define _VX_LIMIT_INT_H @@ -12890,9 +12890,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/limit_int.h linux-3.4.2 + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_INT_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/monitor.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/monitor.h ---- linux-3.4.23/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/monitor.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/monitor.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/monitor.h +--- linux-3.4.24/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/monitor.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,96 @@ +#ifndef _VX_MONITOR_H +#define _VX_MONITOR_H @@ -12990,9 +12990,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/monitor.h linux-3.4.23- + + +#endif /* _VX_MONITOR_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/network.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/network.h ---- linux-3.4.23/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/network.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/network.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/network.h +--- linux-3.4.24/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/network.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,148 @@ +#ifndef _VX_NETWORK_H +#define _VX_NETWORK_H @@ -13142,9 +13142,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/network.h linux-3.4.23- + +#endif /* __KERNEL__ */ +#endif /* _VX_NETWORK_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/network_cmd.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/network_cmd.h ---- linux-3.4.23/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/network_cmd.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/network_cmd.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/network_cmd.h +--- linux-3.4.24/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/network_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,164 @@ +#ifndef _VX_NETWORK_CMD_H +#define _VX_NETWORK_CMD_H @@ -13310,9 +13310,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/network_cmd.h linux-3.4 + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/percpu.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/percpu.h ---- linux-3.4.23/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/percpu.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/percpu.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/percpu.h +--- linux-3.4.24/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/percpu.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VX_PERCPU_H +#define _VX_PERCPU_H @@ -13328,9 +13328,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/percpu.h linux-3.4.23-v +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + +#endif /* _VX_PERCPU_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/pid.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/pid.h ---- linux-3.4.23/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/pid.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/pid.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/pid.h +--- linux-3.4.24/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/pid.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,51 @@ +#ifndef _VSERVER_PID_H +#define _VSERVER_PID_H @@ -13383,9 +13383,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/pid.h linux-3.4.23-vs2. +} + +#endif -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/sched.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/sched.h ---- linux-3.4.23/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/sched.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/sched.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/sched.h +--- linux-3.4.24/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/sched.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef _VX_SCHED_H +#define _VX_SCHED_H @@ -13410,9 +13410,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/sched.h linux-3.4.23-vs +#else /* _VX_SCHED_H */ +#warning duplicate inclusion +#endif /* _VX_SCHED_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/sched_cmd.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/sched_cmd.h ---- linux-3.4.23/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/sched_cmd.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/sched_cmd.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/sched_cmd.h +--- linux-3.4.24/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/sched_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,21 @@ +#ifndef _VX_SCHED_CMD_H +#define _VX_SCHED_CMD_H @@ -13435,9 +13435,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/sched_cmd.h linux-3.4.2 + +#endif /* __KERNEL__ */ +#endif /* _VX_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/sched_def.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/sched_def.h ---- linux-3.4.23/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/sched_def.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/sched_def.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/sched_def.h +--- linux-3.4.24/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/sched_def.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,38 @@ +#ifndef _VX_SCHED_DEF_H +#define _VX_SCHED_DEF_H @@ -13477,9 +13477,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/sched_def.h linux-3.4.2 +#endif + +#endif /* _VX_SCHED_DEF_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/signal.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/signal.h ---- linux-3.4.23/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/signal.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/signal.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/signal.h +--- linux-3.4.24/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/signal.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VX_SIGNAL_H +#define _VX_SIGNAL_H @@ -13495,9 +13495,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/signal.h linux-3.4.23-v +#else /* _VX_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VX_SIGNAL_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/signal_cmd.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/signal_cmd.h ---- linux-3.4.23/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/signal_cmd.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/signal_cmd.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/signal_cmd.h +--- linux-3.4.24/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/signal_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,43 @@ +#ifndef _VX_SIGNAL_CMD_H +#define _VX_SIGNAL_CMD_H @@ -13542,9 +13542,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/signal_cmd.h linux-3.4. + +#endif /* __KERNEL__ */ +#endif /* _VX_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/space.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/space.h ---- linux-3.4.23/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/space.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/space.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/space.h +--- linux-3.4.24/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/space.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,12 @@ +#ifndef _VX_SPACE_H +#define _VX_SPACE_H @@ -13558,9 +13558,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/space.h linux-3.4.23-vs +#else /* _VX_SPACE_H */ +#warning duplicate inclusion +#endif /* _VX_SPACE_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/space_cmd.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/space_cmd.h ---- linux-3.4.23/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/space_cmd.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/space_cmd.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/space_cmd.h +--- linux-3.4.24/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/space_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,38 @@ +#ifndef _VX_SPACE_CMD_H +#define _VX_SPACE_CMD_H @@ -13600,9 +13600,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/space_cmd.h linux-3.4.2 + +#endif /* __KERNEL__ */ +#endif /* _VX_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/switch.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/switch.h ---- linux-3.4.23/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/switch.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/switch.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/switch.h +--- linux-3.4.24/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/switch.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,98 @@ +#ifndef _VX_SWITCH_H +#define _VX_SWITCH_H @@ -13702,9 +13702,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/switch.h linux-3.4.23-v + +#endif /* _VX_SWITCH_H */ + -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/tag.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/tag.h ---- linux-3.4.23/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/tag.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/tag.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/tag.h +--- linux-3.4.24/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/tag.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,143 @@ +#ifndef _DX_TAG_H +#define _DX_TAG_H @@ -13849,9 +13849,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/tag.h linux-3.4.23-vs2. +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-3.4.23/include/linux/vserver/tag_cmd.h linux-3.4.23-vs2.3.3.9/include/linux/vserver/tag_cmd.h ---- linux-3.4.23/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/linux/vserver/tag_cmd.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/linux/vserver/tag_cmd.h linux-3.4.24-vs2.3.3.9/include/linux/vserver/tag_cmd.h +--- linux-3.4.24/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/linux/vserver/tag_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,22 @@ +#ifndef _VX_TAG_CMD_H +#define _VX_TAG_CMD_H @@ -13875,9 +13875,9 @@ diff -NurpP --minimal linux-3.4.23/include/linux/vserver/tag_cmd.h linux-3.4.23- + +#endif /* __KERNEL__ */ +#endif /* _VX_TAG_CMD_H */ -diff -NurpP --minimal linux-3.4.23/include/net/addrconf.h linux-3.4.23-vs2.3.3.9/include/net/addrconf.h ---- linux-3.4.23/include/net/addrconf.h 2012-05-21 18:07:33.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/net/addrconf.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/net/addrconf.h linux-3.4.24-vs2.3.3.9/include/net/addrconf.h +--- linux-3.4.24/include/net/addrconf.h 2012-05-21 16:07:33.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/net/addrconf.h 2012-05-21 16:15:05.000000000 +0000 @@ -80,7 +80,8 @@ extern int ipv6_dev_get_saddr(struct n struct net_device *dev, const struct in6_addr *daddr, @@ -13888,9 +13888,9 @@ diff -NurpP --minimal linux-3.4.23/include/net/addrconf.h linux-3.4.23-vs2.3.3.9 extern int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags); -diff -NurpP --minimal linux-3.4.23/include/net/af_unix.h linux-3.4.23-vs2.3.3.9/include/net/af_unix.h ---- linux-3.4.23/include/net/af_unix.h 2012-05-21 18:07:33.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/include/net/af_unix.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/net/af_unix.h linux-3.4.24-vs2.3.3.9/include/net/af_unix.h +--- linux-3.4.24/include/net/af_unix.h 2012-05-21 16:07:33.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/net/af_unix.h 2012-05-21 16:15:05.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -13899,9 +13899,9 @@ diff -NurpP --minimal linux-3.4.23/include/net/af_unix.h linux-3.4.23-vs2.3.3.9/ #include extern void unix_inflight(struct file *fp); -diff -NurpP --minimal linux-3.4.23/include/net/inet_timewait_sock.h linux-3.4.23-vs2.3.3.9/include/net/inet_timewait_sock.h ---- linux-3.4.23/include/net/inet_timewait_sock.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/net/inet_timewait_sock.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/net/inet_timewait_sock.h linux-3.4.24-vs2.3.3.9/include/net/inet_timewait_sock.h +--- linux-3.4.24/include/net/inet_timewait_sock.h 2012-03-19 18:47:29.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/net/inet_timewait_sock.h 2012-05-21 16:15:05.000000000 +0000 @@ -112,6 +112,10 @@ struct inet_timewait_sock { #define tw_net __tw_common.skc_net #define tw_daddr __tw_common.skc_daddr @@ -13913,10 +13913,10 @@ diff -NurpP --minimal linux-3.4.23/include/net/inet_timewait_sock.h linux-3.4.23 int tw_timeout; volatile unsigned char tw_substate; unsigned char tw_rcv_wscale; -diff -NurpP --minimal linux-3.4.23/include/net/ip6_route.h linux-3.4.23-vs2.3.3.9/include/net/ip6_route.h ---- linux-3.4.23/include/net/ip6_route.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/net/ip6_route.h 2012-05-21 18:15:05.000000000 +0200 -@@ -88,7 +88,8 @@ extern int ip6_route_get_saddr(struct +diff -NurpP --minimal linux-3.4.24/include/net/ip6_route.h linux-3.4.24-vs2.3.3.9/include/net/ip6_route.h +--- linux-3.4.24/include/net/ip6_route.h 2012-03-19 18:47:29.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/net/ip6_route.h 2012-05-21 16:15:05.000000000 +0000 +@@ -88,7 +88,8 @@ extern int ip6_route_get_saddr(struct struct rt6_info *rt, const struct in6_addr *daddr, unsigned int prefs, @@ -13926,9 +13926,9 @@ diff -NurpP --minimal linux-3.4.23/include/net/ip6_route.h linux-3.4.23-vs2.3.3. extern struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr, -diff -NurpP --minimal linux-3.4.23/include/net/route.h linux-3.4.23-vs2.3.3.9/include/net/route.h ---- linux-3.4.23/include/net/route.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/net/route.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/net/route.h linux-3.4.24-vs2.3.3.9/include/net/route.h +--- linux-3.4.24/include/net/route.h 2012-03-19 18:47:29.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/net/route.h 2012-05-21 16:15:05.000000000 +0000 @@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab dst_release(&rt->dst); } @@ -13976,9 +13976,9 @@ diff -NurpP --minimal linux-3.4.23/include/net/route.h linux-3.4.23-vs2.3.3.9/in rt = __ip_route_output_key(net, fl4); if (IS_ERR(rt)) return rt; -diff -NurpP --minimal linux-3.4.23/include/net/sock.h linux-3.4.23-vs2.3.3.9/include/net/sock.h ---- linux-3.4.23/include/net/sock.h 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/include/net/sock.h 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/include/net/sock.h linux-3.4.24-vs2.3.3.9/include/net/sock.h +--- linux-3.4.24/include/net/sock.h 2012-12-18 14:01:11.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/include/net/sock.h 2012-10-22 13:09:53.000000000 +0000 @@ -170,6 +170,10 @@ struct sock_common { #ifdef CONFIG_NET_NS struct net *skc_net; @@ -14001,9 +14001,9 @@ diff -NurpP --minimal linux-3.4.23/include/net/sock.h linux-3.4.23-vs2.3.3.9/inc socket_lock_t sk_lock; struct sk_buff_head sk_receive_queue; /* -diff -NurpP --minimal linux-3.4.23/init/Kconfig linux-3.4.23-vs2.3.3.9/init/Kconfig ---- linux-3.4.23/init/Kconfig 2012-05-21 18:07:33.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/init/Kconfig 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/init/Kconfig linux-3.4.24-vs2.3.3.9/init/Kconfig +--- linux-3.4.24/init/Kconfig 2012-05-21 16:07:33.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/init/Kconfig 2012-05-21 16:15:05.000000000 +0000 @@ -579,6 +579,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK menuconfig CGROUPS boolean "Control Group support" @@ -14020,9 +14020,9 @@ diff -NurpP --minimal linux-3.4.23/init/Kconfig linux-3.4.23-vs2.3.3.9/init/Kcon default y help This allows containers, i.e. vservers, to use user namespaces -diff -NurpP --minimal linux-3.4.23/init/main.c linux-3.4.23-vs2.3.3.9/init/main.c ---- linux-3.4.23/init/main.c 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/init/main.c 2012-11-06 18:02:35.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/init/main.c linux-3.4.24-vs2.3.3.9/init/main.c +--- linux-3.4.24/init/main.c 2012-12-18 14:01:12.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/init/main.c 2012-11-06 17:02:35.000000000 +0000 @@ -68,6 +68,7 @@ #include #include @@ -14031,9 +14031,9 @@ diff -NurpP --minimal linux-3.4.23/init/main.c linux-3.4.23-vs2.3.3.9/init/main. #include #include -diff -NurpP --minimal linux-3.4.23/ipc/mqueue.c linux-3.4.23-vs2.3.3.9/ipc/mqueue.c ---- linux-3.4.23/ipc/mqueue.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/ipc/mqueue.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/ipc/mqueue.c linux-3.4.24-vs2.3.3.9/ipc/mqueue.c +--- linux-3.4.24/ipc/mqueue.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/ipc/mqueue.c 2012-05-21 16:15:05.000000000 +0000 @@ -34,6 +34,8 @@ #include #include @@ -14109,9 +14109,9 @@ diff -NurpP --minimal linux-3.4.23/ipc/mqueue.c linux-3.4.23-vs2.3.3.9/ipc/mqueu free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-3.4.23/ipc/msg.c linux-3.4.23-vs2.3.3.9/ipc/msg.c ---- linux-3.4.23/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/ipc/msg.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/ipc/msg.c linux-3.4.24-vs2.3.3.9/ipc/msg.c +--- linux-3.4.24/ipc/msg.c 2011-05-22 14:17:59.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/ipc/msg.c 2012-05-21 16:15:05.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -14128,9 +14128,9 @@ diff -NurpP --minimal linux-3.4.23/ipc/msg.c linux-3.4.23-vs2.3.3.9/ipc/msg.c msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-3.4.23/ipc/namespace.c linux-3.4.23-vs2.3.3.9/ipc/namespace.c ---- linux-3.4.23/ipc/namespace.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/ipc/namespace.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/ipc/namespace.c linux-3.4.24-vs2.3.3.9/ipc/namespace.c +--- linux-3.4.24/ipc/namespace.c 2011-07-22 09:18:12.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/ipc/namespace.c 2012-05-21 16:15:05.000000000 +0000 @@ -13,11 +13,12 @@ #include #include @@ -14171,9 +14171,9 @@ diff -NurpP --minimal linux-3.4.23/ipc/namespace.c linux-3.4.23-vs2.3.3.9/ipc/na } /* -diff -NurpP --minimal linux-3.4.23/ipc/sem.c linux-3.4.23-vs2.3.3.9/ipc/sem.c ---- linux-3.4.23/ipc/sem.c 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/ipc/sem.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/ipc/sem.c linux-3.4.24-vs2.3.3.9/ipc/sem.c +--- linux-3.4.24/ipc/sem.c 2012-01-09 15:14:59.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/ipc/sem.c 2012-05-21 16:15:05.000000000 +0000 @@ -86,6 +86,8 @@ #include #include @@ -14211,9 +14211,9 @@ diff -NurpP --minimal linux-3.4.23/ipc/sem.c linux-3.4.23-vs2.3.3.9/ipc/sem.c security_sem_free(sma); ipc_rcu_putref(sma); } -diff -NurpP --minimal linux-3.4.23/ipc/shm.c linux-3.4.23-vs2.3.3.9/ipc/shm.c ---- linux-3.4.23/ipc/shm.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/ipc/shm.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/ipc/shm.c linux-3.4.24-vs2.3.3.9/ipc/shm.c +--- linux-3.4.24/ipc/shm.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/ipc/shm.c 2012-05-21 16:15:05.000000000 +0000 @@ -39,6 +39,8 @@ #include #include @@ -14269,9 +14269,9 @@ diff -NurpP --minimal linux-3.4.23/ipc/shm.c linux-3.4.23-vs2.3.3.9/ipc/shm.c return error; no_id: -diff -NurpP --minimal linux-3.4.23/kernel/Makefile linux-3.4.23-vs2.3.3.9/kernel/Makefile ---- linux-3.4.23/kernel/Makefile 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/kernel/Makefile 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/Makefile linux-3.4.24-vs2.3.3.9/kernel/Makefile +--- linux-3.4.24/kernel/Makefile 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/Makefile 2012-05-21 16:15:05.000000000 +0000 @@ -25,6 +25,7 @@ endif obj-y += sched/ obj-y += power/ @@ -14280,9 +14280,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/Makefile linux-3.4.23-vs2.3.3.9/kernel obj-$(CONFIG_FREEZER) += freezer.o obj-$(CONFIG_PROFILING) += profile.o obj-$(CONFIG_STACKTRACE) += stacktrace.o -diff -NurpP --minimal linux-3.4.23/kernel/auditsc.c linux-3.4.23-vs2.3.3.9/kernel/auditsc.c ---- linux-3.4.23/kernel/auditsc.c 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/auditsc.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/auditsc.c linux-3.4.24-vs2.3.3.9/kernel/auditsc.c +--- linux-3.4.24/kernel/auditsc.c 2012-03-19 18:47:29.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/auditsc.c 2012-05-21 16:15:05.000000000 +0000 @@ -2308,7 +2308,7 @@ int audit_set_loginuid(uid_t loginuid) if (task->loginuid != -1) return -EPERM; @@ -14292,9 +14292,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/auditsc.c linux-3.4.23-vs2.3.3.9/kerne return -EPERM; #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ -diff -NurpP --minimal linux-3.4.23/kernel/capability.c linux-3.4.23-vs2.3.3.9/kernel/capability.c ---- linux-3.4.23/kernel/capability.c 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/capability.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/capability.c linux-3.4.24-vs2.3.3.9/kernel/capability.c +--- linux-3.4.24/kernel/capability.c 2012-03-19 18:47:29.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/capability.c 2012-05-21 16:15:05.000000000 +0000 @@ -15,6 +15,7 @@ #include #include @@ -14320,9 +14320,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/capability.c linux-3.4.23-vs2.3.3.9/ke /** * has_capability_noaudit - Does a task have a capability (unaudited) in the * initial user ns -diff -NurpP --minimal linux-3.4.23/kernel/compat.c linux-3.4.23-vs2.3.3.9/kernel/compat.c ---- linux-3.4.23/kernel/compat.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/kernel/compat.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/compat.c linux-3.4.24-vs2.3.3.9/kernel/compat.c +--- linux-3.4.24/kernel/compat.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/compat.c 2012-05-21 16:15:05.000000000 +0000 @@ -1054,7 +1054,7 @@ asmlinkage long compat_sys_stime(compat_ if (err) return err; @@ -14332,9 +14332,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/compat.c linux-3.4.23-vs2.3.3.9/kernel return 0; } -diff -NurpP --minimal linux-3.4.23/kernel/cred.c linux-3.4.23-vs2.3.3.9/kernel/cred.c ---- linux-3.4.23/kernel/cred.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/kernel/cred.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/cred.c linux-3.4.24-vs2.3.3.9/kernel/cred.c +--- linux-3.4.24/kernel/cred.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/cred.c 2012-05-21 16:15:05.000000000 +0000 @@ -62,31 +62,6 @@ struct cred init_cred = { #endif }; @@ -14404,9 +14404,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/cred.c linux-3.4.23-vs2.3.3.9/kernel/c EXPORT_SYMBOL(prepare_creds); /* -diff -NurpP --minimal linux-3.4.23/kernel/exit.c linux-3.4.23-vs2.3.3.9/kernel/exit.c ---- linux-3.4.23/kernel/exit.c 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/exit.c 2012-12-08 01:54:06.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/kernel/exit.c linux-3.4.24-vs2.3.3.9/kernel/exit.c +--- linux-3.4.24/kernel/exit.c 2012-12-18 14:01:12.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/exit.c 2012-12-08 00:54:06.000000000 +0000 @@ -48,6 +48,10 @@ #include #include @@ -14514,9 +14514,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/exit.c linux-3.4.23-vs2.3.3.9/kernel/e BUG(); /* Avoid "noreturn function does return". */ for (;;) -diff -NurpP --minimal linux-3.4.23/kernel/fork.c linux-3.4.23-vs2.3.3.9/kernel/fork.c ---- linux-3.4.23/kernel/fork.c 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/fork.c 2012-06-28 16:45:07.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/fork.c linux-3.4.24-vs2.3.3.9/kernel/fork.c +--- linux-3.4.24/kernel/fork.c 2012-12-18 14:01:12.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/fork.c 2012-06-28 14:45:07.000000000 +0000 @@ -68,6 +68,9 @@ #include #include @@ -14536,7 +14536,7 @@ diff -NurpP --minimal linux-3.4.23/kernel/fork.c linux-3.4.23-vs2.3.3.9/kernel/f ftrace_graph_exit_task(tsk); free_task_struct(tsk); } -@@ -507,6 +512,7 @@ static struct mm_struct *mm_init(struct +@@ -507,6 +512,7 @@ static struct mm_struct *mm_init(struct if (likely(!mm_alloc_pgd(mm))) { mm->def_flags = 0; mmu_notifier_mm_init(mm); @@ -14609,9 +14609,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/fork.c linux-3.4.23-vs2.3.3.9/kernel/f write_unlock_irq(&tasklist_lock); proc_fork_connector(p); cgroup_post_fork(p); -diff -NurpP --minimal linux-3.4.23/kernel/kthread.c linux-3.4.23-vs2.3.3.9/kernel/kthread.c ---- linux-3.4.23/kernel/kthread.c 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/kthread.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/kthread.c linux-3.4.24-vs2.3.3.9/kernel/kthread.c +--- linux-3.4.24/kernel/kthread.c 2012-12-18 14:01:12.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/kthread.c 2012-10-22 13:09:53.000000000 +0000 @@ -16,6 +16,7 @@ #include #include @@ -14620,9 +14620,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/kthread.c linux-3.4.23-vs2.3.3.9/kerne #include static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-3.4.23/kernel/nsproxy.c linux-3.4.23-vs2.3.3.9/kernel/nsproxy.c ---- linux-3.4.23/kernel/nsproxy.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/nsproxy.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/nsproxy.c linux-3.4.24-vs2.3.3.9/kernel/nsproxy.c +--- linux-3.4.24/kernel/nsproxy.c 2012-01-09 15:15:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/nsproxy.c 2012-05-21 16:15:05.000000000 +0000 @@ -20,11 +20,14 @@ #include #include @@ -14787,7 +14787,7 @@ diff -NurpP --minimal linux-3.4.23/kernel/nsproxy.c linux-3.4.23-vs2.3.3.9/kerne kmem_cache_free(nsproxy_cachep, ns); } -@@ -187,11 +238,15 @@ int unshare_nsproxy_namespaces(unsigned +@@ -187,11 +238,15 @@ int unshare_nsproxy_namespaces(unsigned { int err = 0; @@ -14804,9 +14804,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/nsproxy.c linux-3.4.23-vs2.3.3.9/kerne return -EPERM; *new_nsp = create_new_namespaces(unshare_flags, current, -diff -NurpP --minimal linux-3.4.23/kernel/pid.c linux-3.4.23-vs2.3.3.9/kernel/pid.c ---- linux-3.4.23/kernel/pid.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/pid.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/pid.c linux-3.4.24-vs2.3.3.9/kernel/pid.c +--- linux-3.4.24/kernel/pid.c 2012-03-19 18:47:30.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/pid.c 2012-05-21 16:15:05.000000000 +0000 @@ -36,6 +36,7 @@ #include #include @@ -14852,7 +14852,7 @@ diff -NurpP --minimal linux-3.4.23/kernel/pid.c linux-3.4.23-vs2.3.3.9/kernel/pi { struct upid *upid; pid_t nr = 0; -@@ -480,6 +484,11 @@ pid_t pid_nr_ns(struct pid *pid, struct +@@ -480,6 +484,11 @@ pid_t pid_nr_ns(struct pid *pid, struct return nr; } @@ -14864,9 +14864,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/pid.c linux-3.4.23-vs2.3.3.9/kernel/pi pid_t pid_vnr(struct pid *pid) { return pid_nr_ns(pid, current->nsproxy->pid_ns); -diff -NurpP --minimal linux-3.4.23/kernel/pid_namespace.c linux-3.4.23-vs2.3.3.9/kernel/pid_namespace.c ---- linux-3.4.23/kernel/pid_namespace.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/kernel/pid_namespace.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/pid_namespace.c linux-3.4.24-vs2.3.3.9/kernel/pid_namespace.c +--- linux-3.4.24/kernel/pid_namespace.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/pid_namespace.c 2012-05-21 16:15:05.000000000 +0000 @@ -16,6 +16,7 @@ #include #include @@ -14891,9 +14891,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/pid_namespace.c linux-3.4.23-vs2.3.3.9 kmem_cache_free(pid_ns_cachep, ns); } -diff -NurpP --minimal linux-3.4.23/kernel/posix-timers.c linux-3.4.23-vs2.3.3.9/kernel/posix-timers.c ---- linux-3.4.23/kernel/posix-timers.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/posix-timers.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/posix-timers.c linux-3.4.24-vs2.3.3.9/kernel/posix-timers.c +--- linux-3.4.24/kernel/posix-timers.c 2012-01-09 15:15:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/posix-timers.c 2012-05-21 16:15:05.000000000 +0000 @@ -47,6 +47,7 @@ #include #include @@ -14929,9 +14929,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/posix-timers.c linux-3.4.23-vs2.3.3.9/ /* If we failed to send the signal the timer stops. */ return ret > 0; } -diff -NurpP --minimal linux-3.4.23/kernel/printk.c linux-3.4.23-vs2.3.3.9/kernel/printk.c ---- linux-3.4.23/kernel/printk.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/kernel/printk.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/printk.c linux-3.4.24-vs2.3.3.9/kernel/printk.c +--- linux-3.4.24/kernel/printk.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/printk.c 2012-05-21 16:15:05.000000000 +0000 @@ -41,6 +41,7 @@ #include #include @@ -14940,7 +14940,7 @@ diff -NurpP --minimal linux-3.4.23/kernel/printk.c linux-3.4.23-vs2.3.3.9/kernel #include -@@ -317,7 +318,7 @@ static int check_syslog_permissions(int +@@ -317,7 +318,7 @@ static int check_syslog_permissions(int return 0; if (syslog_action_restricted(type)) { @@ -14999,9 +14999,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/printk.c linux-3.4.23-vs2.3.3.9/kernel count = len; if (count > log_buf_len) count = log_buf_len; -diff -NurpP --minimal linux-3.4.23/kernel/ptrace.c linux-3.4.23-vs2.3.3.9/kernel/ptrace.c ---- linux-3.4.23/kernel/ptrace.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/kernel/ptrace.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/ptrace.c linux-3.4.24-vs2.3.3.9/kernel/ptrace.c +--- linux-3.4.24/kernel/ptrace.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/ptrace.c 2012-05-21 16:15:05.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -15022,9 +15022,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/ptrace.c linux-3.4.23-vs2.3.3.9/kernel return security_ptrace_access_check(task, mode); } -diff -NurpP --minimal linux-3.4.23/kernel/sched/core.c linux-3.4.23-vs2.3.3.9/kernel/sched/core.c ---- linux-3.4.23/kernel/sched/core.c 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/sched/core.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/sched/core.c linux-3.4.24-vs2.3.3.9/kernel/sched/core.c +--- linux-3.4.24/kernel/sched/core.c 2012-12-18 14:01:12.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/sched/core.c 2012-10-22 13:09:53.000000000 +0000 @@ -72,6 +72,8 @@ #include #include @@ -15096,9 +15096,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/sched/core.c linux-3.4.23-vs2.3.3.9/ke retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-3.4.23/kernel/sched/fair.c linux-3.4.23-vs2.3.3.9/kernel/sched/fair.c ---- linux-3.4.23/kernel/sched/fair.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/kernel/sched/fair.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/sched/fair.c linux-3.4.24-vs2.3.3.9/kernel/sched/fair.c +--- linux-3.4.24/kernel/sched/fair.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/sched/fair.c 2012-05-21 16:15:05.000000000 +0000 @@ -26,6 +26,7 @@ #include #include @@ -15125,9 +15125,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/sched/fair.c linux-3.4.23-vs2.3.3.9/ke update_cfs_load(cfs_rq, 0); account_entity_dequeue(cfs_rq, se); -diff -NurpP --minimal linux-3.4.23/kernel/signal.c linux-3.4.23-vs2.3.3.9/kernel/signal.c ---- linux-3.4.23/kernel/signal.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/kernel/signal.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/signal.c linux-3.4.24-vs2.3.3.9/kernel/signal.c +--- linux-3.4.24/kernel/signal.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/signal.c 2012-05-21 16:15:05.000000000 +0000 @@ -29,6 +29,8 @@ #include #include @@ -15195,7 +15195,7 @@ diff -NurpP --minimal linux-3.4.23/kernel/signal.c linux-3.4.23-vs2.3.3.9/kernel ret = -ESRCH; goto out_unlock; } -@@ -1460,8 +1485,10 @@ static int kill_something_info(int sig, +@@ -1460,8 +1485,10 @@ static int kill_something_info(int sig, struct task_struct * p; for_each_process(p) { @@ -15220,9 +15220,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/signal.c linux-3.4.23-vs2.3.3.9/kernel if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-3.4.23/kernel/softirq.c linux-3.4.23-vs2.3.3.9/kernel/softirq.c ---- linux-3.4.23/kernel/softirq.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/kernel/softirq.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/softirq.c linux-3.4.24-vs2.3.3.9/kernel/softirq.c +--- linux-3.4.24/kernel/softirq.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/softirq.c 2012-05-21 16:15:05.000000000 +0000 @@ -24,6 +24,7 @@ #include #include @@ -15231,9 +15231,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/softirq.c linux-3.4.23-vs2.3.3.9/kerne #define CREATE_TRACE_POINTS #include -diff -NurpP --minimal linux-3.4.23/kernel/sys.c linux-3.4.23-vs2.3.3.9/kernel/sys.c ---- linux-3.4.23/kernel/sys.c 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/sys.c 2012-11-06 18:02:35.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/kernel/sys.c linux-3.4.24-vs2.3.3.9/kernel/sys.c +--- linux-3.4.24/kernel/sys.c 2012-12-18 14:01:12.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/sys.c 2012-11-06 17:02:35.000000000 +0000 @@ -45,6 +45,7 @@ #include #include @@ -15311,7 +15311,7 @@ diff -NurpP --minimal linux-3.4.23/kernel/sys.c linux-3.4.23-vs2.3.3.9/kernel/sy return -EPERM; if (len < 0 || len > __NEW_UTS_LEN) return -EINVAL; -@@ -1455,7 +1470,7 @@ int do_prlimit(struct task_struct *tsk, +@@ -1455,7 +1470,7 @@ int do_prlimit(struct task_struct *tsk, /* Keep the capable check against init_user_ns until cgroups can contain all limits */ if (new_rlim->rlim_max > rlim->rlim_max && @@ -15330,9 +15330,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/sys.c linux-3.4.23-vs2.3.3.9/kernel/sy return 0; return -EPERM; -diff -NurpP --minimal linux-3.4.23/kernel/sysctl.c linux-3.4.23-vs2.3.3.9/kernel/sysctl.c ---- linux-3.4.23/kernel/sysctl.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/kernel/sysctl.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/sysctl.c linux-3.4.24-vs2.3.3.9/kernel/sysctl.c +--- linux-3.4.24/kernel/sysctl.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/sysctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -81,6 +81,7 @@ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) #include @@ -15355,9 +15355,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/sysctl.c linux-3.4.23-vs2.3.3.9/kernel #ifdef CONFIG_CHR_DEV_SG { .procname = "sg-big-buff", -diff -NurpP --minimal linux-3.4.23/kernel/sysctl_binary.c linux-3.4.23-vs2.3.3.9/kernel/sysctl_binary.c ---- linux-3.4.23/kernel/sysctl_binary.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/sysctl_binary.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/sysctl_binary.c linux-3.4.24-vs2.3.3.9/kernel/sysctl_binary.c +--- linux-3.4.24/kernel/sysctl_binary.c 2012-01-09 15:15:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/sysctl_binary.c 2012-05-21 16:15:05.000000000 +0000 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t { CTL_INT, KERN_PANIC, "panic" }, @@ -15366,9 +15366,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/sysctl_binary.c linux-3.4.23-vs2.3.3.9 { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-3.4.23/kernel/time/timekeeping.c linux-3.4.23-vs2.3.3.9/kernel/time/timekeeping.c ---- linux-3.4.23/kernel/time/timekeeping.c 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/time/timekeeping.c 2012-12-08 01:53:53.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/kernel/time/timekeeping.c linux-3.4.24-vs2.3.3.9/kernel/time/timekeeping.c +--- linux-3.4.24/kernel/time/timekeeping.c 2012-12-18 14:01:12.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/time/timekeeping.c 2012-12-08 00:53:53.000000000 +0000 @@ -254,6 +254,7 @@ void getnstimeofday(struct timespec *ts) } while (read_seqretry(&timekeeper.lock, seq)); @@ -15377,10 +15377,10 @@ diff -NurpP --minimal linux-3.4.23/kernel/time/timekeeping.c linux-3.4.23-vs2.3. } EXPORT_SYMBOL(getnstimeofday); -diff -NurpP --minimal linux-3.4.23/kernel/time.c linux-3.4.23-vs2.3.3.9/kernel/time.c ---- linux-3.4.23/kernel/time.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/kernel/time.c 2012-05-21 18:15:05.000000000 +0200 -@@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, +diff -NurpP --minimal linux-3.4.24/kernel/time.c linux-3.4.24-vs2.3.3.9/kernel/time.c +--- linux-3.4.24/kernel/time.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/time.c 2012-05-21 16:15:05.000000000 +0000 +@@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, if (err) return err; @@ -15398,9 +15398,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/time.c linux-3.4.23-vs2.3.3.9/kernel/t return 0; } -diff -NurpP --minimal linux-3.4.23/kernel/timer.c linux-3.4.23-vs2.3.3.9/kernel/timer.c ---- linux-3.4.23/kernel/timer.c 2012-12-11 12:37:31.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/timer.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/timer.c linux-3.4.24-vs2.3.3.9/kernel/timer.c +--- linux-3.4.24/kernel/timer.c 2012-12-18 14:01:12.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/timer.c 2012-10-22 13:09:53.000000000 +0000 @@ -40,6 +40,10 @@ #include #include @@ -15450,9 +15450,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/timer.c linux-3.4.23-vs2.3.3.9/kernel/ SYSCALL_DEFINE0(getuid) { /* Only we change this so SMP safe */ -diff -NurpP --minimal linux-3.4.23/kernel/user_namespace.c linux-3.4.23-vs2.3.3.9/kernel/user_namespace.c ---- linux-3.4.23/kernel/user_namespace.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/user_namespace.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/user_namespace.c linux-3.4.24-vs2.3.3.9/kernel/user_namespace.c +--- linux-3.4.24/kernel/user_namespace.c 2012-01-09 15:15:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/user_namespace.c 2012-05-21 16:15:05.000000000 +0000 @@ -11,6 +11,7 @@ #include #include @@ -15478,9 +15478,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/user_namespace.c linux-3.4.23-vs2.3.3. INIT_WORK(&ns->destroyer, free_user_ns_work); schedule_work(&ns->destroyer); } -diff -NurpP --minimal linux-3.4.23/kernel/utsname.c linux-3.4.23-vs2.3.3.9/kernel/utsname.c ---- linux-3.4.23/kernel/utsname.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/utsname.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/utsname.c linux-3.4.24-vs2.3.3.9/kernel/utsname.c +--- linux-3.4.24/kernel/utsname.c 2012-01-09 15:15:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/utsname.c 2012-05-21 16:15:05.000000000 +0000 @@ -16,14 +16,17 @@ #include #include @@ -15549,9 +15549,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/utsname.c linux-3.4.23-vs2.3.3.9/kerne kfree(ns); } -diff -NurpP --minimal linux-3.4.23/kernel/vserver/Kconfig linux-3.4.23-vs2.3.3.9/kernel/vserver/Kconfig ---- linux-3.4.23/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/Kconfig 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/Kconfig linux-3.4.24-vs2.3.3.9/kernel/vserver/Kconfig +--- linux-3.4.24/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/Kconfig 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,224 @@ +# +# Linux VServer configuration @@ -15777,9 +15777,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/Kconfig linux-3.4.23-vs2.3.3.9 + bool + default n + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/Makefile linux-3.4.23-vs2.3.3.9/kernel/vserver/Makefile ---- linux-3.4.23/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/Makefile 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/Makefile linux-3.4.24-vs2.3.3.9/kernel/vserver/Makefile +--- linux-3.4.24/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/Makefile 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,18 @@ +# +# Makefile for the Linux vserver routines. @@ -15799,9 +15799,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/Makefile linux-3.4.23-vs2.3.3. +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/cacct.c linux-3.4.23-vs2.3.3.9/kernel/vserver/cacct.c ---- linux-3.4.23/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/cacct.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/cacct.c linux-3.4.24-vs2.3.3.9/kernel/vserver/cacct.c +--- linux-3.4.24/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/cacct.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,42 @@ +/* + * linux/kernel/vserver/cacct.c @@ -15845,9 +15845,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/cacct.c linux-3.4.23-vs2.3.3.9 + return 0; +} + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/cacct_init.h linux-3.4.23-vs2.3.3.9/kernel/vserver/cacct_init.h ---- linux-3.4.23/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/cacct_init.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/cacct_init.h linux-3.4.24-vs2.3.3.9/kernel/vserver/cacct_init.h +--- linux-3.4.24/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/cacct_init.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,25 @@ + + @@ -15874,9 +15874,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/cacct_init.h linux-3.4.23-vs2. + return; +} + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/cacct_proc.h linux-3.4.23-vs2.3.3.9/kernel/vserver/cacct_proc.h ---- linux-3.4.23/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/cacct_proc.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/cacct_proc.h linux-3.4.24-vs2.3.3.9/kernel/vserver/cacct_proc.h +--- linux-3.4.24/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/cacct_proc.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,53 @@ +#ifndef _VX_CACCT_PROC_H +#define _VX_CACCT_PROC_H @@ -15931,9 +15931,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/cacct_proc.h linux-3.4.23-vs2. +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-3.4.23/kernel/vserver/context.c linux-3.4.23-vs2.3.3.9/kernel/vserver/context.c ---- linux-3.4.23/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/context.c 2012-06-28 16:45:48.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/context.c linux-3.4.24-vs2.3.3.9/kernel/vserver/context.c +--- linux-3.4.24/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/context.c 2012-06-28 14:45:48.000000000 +0000 @@ -0,0 +1,1119 @@ +/* + * linux/kernel/vserver/context.c @@ -17054,9 +17054,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/context.c linux-3.4.23-vs2.3.3 + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/cvirt.c linux-3.4.23-vs2.3.3.9/kernel/vserver/cvirt.c ---- linux-3.4.23/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/cvirt.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/cvirt.c linux-3.4.24-vs2.3.3.9/kernel/vserver/cvirt.c +--- linux-3.4.24/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/cvirt.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,313 @@ +/* + * linux/kernel/vserver/cvirt.c @@ -17371,9 +17371,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/cvirt.c linux-3.4.23-vs2.3.3.9 + +#endif + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/cvirt_init.h linux-3.4.23-vs2.3.3.9/kernel/vserver/cvirt_init.h ---- linux-3.4.23/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/cvirt_init.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/cvirt_init.h linux-3.4.24-vs2.3.3.9/kernel/vserver/cvirt_init.h +--- linux-3.4.24/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/cvirt_init.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,70 @@ + + @@ -17445,9 +17445,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/cvirt_init.h linux-3.4.23-vs2. + return; +} + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/cvirt_proc.h linux-3.4.23-vs2.3.3.9/kernel/vserver/cvirt_proc.h ---- linux-3.4.23/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/cvirt_proc.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/cvirt_proc.h linux-3.4.24-vs2.3.3.9/kernel/vserver/cvirt_proc.h +--- linux-3.4.24/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/cvirt_proc.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,123 @@ +#ifndef _VX_CVIRT_PROC_H +#define _VX_CVIRT_PROC_H @@ -17572,9 +17572,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/cvirt_proc.h linux-3.4.23-vs2. +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-3.4.23/kernel/vserver/debug.c linux-3.4.23-vs2.3.3.9/kernel/vserver/debug.c ---- linux-3.4.23/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/debug.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/debug.c linux-3.4.24-vs2.3.3.9/kernel/vserver/debug.c +--- linux-3.4.24/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/debug.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,32 @@ +/* + * kernel/vserver/debug.c @@ -17608,9 +17608,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/debug.c linux-3.4.23-vs2.3.3.9 + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/device.c linux-3.4.23-vs2.3.3.9/kernel/vserver/device.c ---- linux-3.4.23/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/device.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/device.c linux-3.4.24-vs2.3.3.9/kernel/vserver/device.c +--- linux-3.4.24/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/device.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,443 @@ +/* + * linux/kernel/vserver/device.c @@ -18055,9 +18055,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/device.c linux-3.4.23-vs2.3.3. +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/dlimit.c linux-3.4.23-vs2.3.3.9/kernel/vserver/dlimit.c ---- linux-3.4.23/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/dlimit.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/dlimit.c linux-3.4.24-vs2.3.3.9/kernel/vserver/dlimit.c +--- linux-3.4.24/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/dlimit.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,531 @@ +/* + * linux/kernel/vserver/dlimit.c @@ -18590,9 +18590,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/dlimit.c linux-3.4.23-vs2.3.3. +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/helper.c linux-3.4.23-vs2.3.3.9/kernel/vserver/helper.c ---- linux-3.4.23/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/helper.c 2012-09-16 20:49:44.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/helper.c linux-3.4.24-vs2.3.3.9/kernel/vserver/helper.c +--- linux-3.4.24/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/helper.c 2012-09-16 18:49:44.000000000 +0000 @@ -0,0 +1,229 @@ +/* + * linux/kernel/vserver/helper.c @@ -18823,9 +18823,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/helper.c linux-3.4.23-vs2.3.3. + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/history.c linux-3.4.23-vs2.3.3.9/kernel/vserver/history.c ---- linux-3.4.23/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/history.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/history.c linux-3.4.24-vs2.3.3.9/kernel/vserver/history.c +--- linux-3.4.24/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/history.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,258 @@ +/* + * kernel/vserver/history.c @@ -19085,9 +19085,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/history.c linux-3.4.23-vs2.3.3 + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/inet.c linux-3.4.23-vs2.3.3.9/kernel/vserver/inet.c ---- linux-3.4.23/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/inet.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/inet.c linux-3.4.24-vs2.3.3.9/kernel/vserver/inet.c +--- linux-3.4.24/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/inet.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,226 @@ + +#include @@ -19315,9 +19315,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/inet.c linux-3.4.23-vs2.3.3.9/ + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/init.c linux-3.4.23-vs2.3.3.9/kernel/vserver/init.c ---- linux-3.4.23/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/init.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/init.c linux-3.4.24-vs2.3.3.9/kernel/vserver/init.c +--- linux-3.4.24/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/init.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,45 @@ +/* + * linux/kernel/init.c @@ -19364,9 +19364,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/init.c linux-3.4.23-vs2.3.3.9/ +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/inode.c linux-3.4.23-vs2.3.3.9/kernel/vserver/inode.c ---- linux-3.4.23/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/inode.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/inode.c linux-3.4.24-vs2.3.3.9/kernel/vserver/inode.c +--- linux-3.4.24/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/inode.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,437 @@ +/* + * linux/kernel/vserver/inode.c @@ -19805,9 +19805,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/inode.c linux-3.4.23-vs2.3.3.9 + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/limit.c linux-3.4.23-vs2.3.3.9/kernel/vserver/limit.c ---- linux-3.4.23/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/limit.c 2012-09-01 11:15:21.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/limit.c linux-3.4.24-vs2.3.3.9/kernel/vserver/limit.c +--- linux-3.4.24/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/limit.c 2012-09-01 09:15:21.000000000 +0000 @@ -0,0 +1,345 @@ +/* + * linux/kernel/vserver/limit.c @@ -20154,9 +20154,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/limit.c linux-3.4.23-vs2.3.3.9 + return cache; +} + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/limit_init.h linux-3.4.23-vs2.3.3.9/kernel/vserver/limit_init.h ---- linux-3.4.23/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/limit_init.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/limit_init.h linux-3.4.24-vs2.3.3.9/kernel/vserver/limit_init.h +--- linux-3.4.24/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/limit_init.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,31 @@ + + @@ -20189,9 +20189,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/limit_init.h linux-3.4.23-vs2. + } +} + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/limit_proc.h linux-3.4.23-vs2.3.3.9/kernel/vserver/limit_proc.h ---- linux-3.4.23/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/limit_proc.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/limit_proc.h linux-3.4.24-vs2.3.3.9/kernel/vserver/limit_proc.h +--- linux-3.4.24/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/limit_proc.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,57 @@ +#ifndef _VX_LIMIT_PROC_H +#define _VX_LIMIT_PROC_H @@ -20250,9 +20250,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/limit_proc.h linux-3.4.23-vs2. +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/network.c linux-3.4.23-vs2.3.3.9/kernel/vserver/network.c ---- linux-3.4.23/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/network.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/network.c linux-3.4.24-vs2.3.3.9/kernel/vserver/network.c +--- linux-3.4.24/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/network.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,912 @@ +/* + * linux/kernel/vserver/network.c @@ -21166,9 +21166,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/network.c linux-3.4.23-vs2.3.3 +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/proc.c linux-3.4.23-vs2.3.3.9/kernel/vserver/proc.c ---- linux-3.4.23/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/proc.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/proc.c linux-3.4.24-vs2.3.3.9/kernel/vserver/proc.c +--- linux-3.4.24/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/proc.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,1103 @@ +/* + * linux/kernel/vserver/proc.c @@ -22273,9 +22273,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/proc.c linux-3.4.23-vs2.3.3.9/ + return buffer - orig; +} + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/sched.c linux-3.4.23-vs2.3.3.9/kernel/vserver/sched.c ---- linux-3.4.23/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/sched.c 2012-05-21 18:25:11.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/sched.c linux-3.4.24-vs2.3.3.9/kernel/vserver/sched.c +--- linux-3.4.24/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/sched.c 2012-05-21 16:25:11.000000000 +0000 @@ -0,0 +1,83 @@ +/* + * linux/kernel/vserver/sched.c @@ -22360,9 +22360,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/sched.c linux-3.4.23-vs2.3.3.9 + return 0; +} + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/sched_init.h linux-3.4.23-vs2.3.3.9/kernel/vserver/sched_init.h ---- linux-3.4.23/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/sched_init.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/sched_init.h linux-3.4.24-vs2.3.3.9/kernel/vserver/sched_init.h +--- linux-3.4.24/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/sched_init.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,27 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) @@ -22391,9 +22391,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/sched_init.h linux-3.4.23-vs2. +{ + return; +} -diff -NurpP --minimal linux-3.4.23/kernel/vserver/sched_proc.h linux-3.4.23-vs2.3.3.9/kernel/vserver/sched_proc.h ---- linux-3.4.23/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/sched_proc.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/sched_proc.h linux-3.4.24-vs2.3.3.9/kernel/vserver/sched_proc.h +--- linux-3.4.24/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/sched_proc.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,32 @@ +#ifndef _VX_SCHED_PROC_H +#define _VX_SCHED_PROC_H @@ -22427,9 +22427,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/sched_proc.h linux-3.4.23-vs2. +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-3.4.23/kernel/vserver/signal.c linux-3.4.23-vs2.3.3.9/kernel/vserver/signal.c ---- linux-3.4.23/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/signal.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/signal.c linux-3.4.24-vs2.3.3.9/kernel/vserver/signal.c +--- linux-3.4.24/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/signal.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,134 @@ +/* + * linux/kernel/vserver/signal.c @@ -22565,9 +22565,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/signal.c linux-3.4.23-vs2.3.3. + return ret; +} + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/space.c linux-3.4.23-vs2.3.3.9/kernel/vserver/space.c ---- linux-3.4.23/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/space.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/space.c linux-3.4.24-vs2.3.3.9/kernel/vserver/space.c +--- linux-3.4.24/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/space.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,436 @@ +/* + * linux/kernel/vserver/space.c @@ -23005,9 +23005,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/space.c linux-3.4.23-vs2.3.3.9 + return 0; +} + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/switch.c linux-3.4.23-vs2.3.3.9/kernel/vserver/switch.c ---- linux-3.4.23/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/switch.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/switch.c linux-3.4.24-vs2.3.3.9/kernel/vserver/switch.c +--- linux-3.4.24/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/switch.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,556 @@ +/* + * linux/kernel/vserver/switch.c @@ -23565,9 +23565,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/switch.c linux-3.4.23-vs2.3.3. +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-3.4.23/kernel/vserver/sysctl.c linux-3.4.23-vs2.3.3.9/kernel/vserver/sysctl.c ---- linux-3.4.23/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/sysctl.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/sysctl.c linux-3.4.24-vs2.3.3.9/kernel/vserver/sysctl.c +--- linux-3.4.24/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/sysctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,247 @@ +/* + * kernel/vserver/sysctl.c @@ -23816,9 +23816,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/sysctl.c linux-3.4.23-vs2.3.3. +EXPORT_SYMBOL_GPL(vs_debug_perm); +EXPORT_SYMBOL_GPL(vs_debug_misc); + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/tag.c linux-3.4.23-vs2.3.3.9/kernel/vserver/tag.c ---- linux-3.4.23/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/tag.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/tag.c linux-3.4.24-vs2.3.3.9/kernel/vserver/tag.c +--- linux-3.4.24/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/tag.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,63 @@ +/* + * linux/kernel/vserver/tag.c @@ -23883,9 +23883,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/tag.c linux-3.4.23-vs2.3.3.9/k +} + + -diff -NurpP --minimal linux-3.4.23/kernel/vserver/vci_config.h linux-3.4.23-vs2.3.3.9/kernel/vserver/vci_config.h ---- linux-3.4.23/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/kernel/vserver/vci_config.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/kernel/vserver/vci_config.h linux-3.4.24-vs2.3.3.9/kernel/vserver/vci_config.h +--- linux-3.4.24/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/kernel/vserver/vci_config.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,76 @@ + +/* interface version */ @@ -23963,9 +23963,9 @@ diff -NurpP --minimal linux-3.4.23/kernel/vserver/vci_config.h linux-3.4.23-vs2. + 0; +} + -diff -NurpP --minimal linux-3.4.23/mm/memcontrol.c linux-3.4.23-vs2.3.3.9/mm/memcontrol.c ---- linux-3.4.23/mm/memcontrol.c 2012-12-11 12:37:32.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/mm/memcontrol.c 2012-12-08 01:53:53.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/mm/memcontrol.c linux-3.4.24-vs2.3.3.9/mm/memcontrol.c +--- linux-3.4.24/mm/memcontrol.c 2012-12-18 14:01:13.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/mm/memcontrol.c 2012-12-08 00:53:53.000000000 +0000 @@ -846,6 +846,31 @@ struct mem_cgroup *mem_cgroup_from_task( struct mem_cgroup, css); } @@ -23998,9 +23998,9 @@ diff -NurpP --minimal linux-3.4.23/mm/memcontrol.c linux-3.4.23-vs2.3.3.9/mm/mem struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) { struct mem_cgroup *memcg = NULL; -diff -NurpP --minimal linux-3.4.23/mm/oom_kill.c linux-3.4.23-vs2.3.3.9/mm/oom_kill.c ---- linux-3.4.23/mm/oom_kill.c 2012-05-21 18:07:35.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/mm/oom_kill.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/mm/oom_kill.c linux-3.4.24-vs2.3.3.9/mm/oom_kill.c +--- linux-3.4.24/mm/oom_kill.c 2012-05-21 16:07:35.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/mm/oom_kill.c 2012-05-21 16:15:05.000000000 +0000 @@ -35,6 +35,8 @@ #include #include @@ -24075,9 +24075,9 @@ diff -NurpP --minimal linux-3.4.23/mm/oom_kill.c linux-3.4.23-vs2.3.3.9/mm/oom_k } if (PTR_ERR(p) != -1UL) { oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, -diff -NurpP --minimal linux-3.4.23/mm/page_alloc.c linux-3.4.23-vs2.3.3.9/mm/page_alloc.c ---- linux-3.4.23/mm/page_alloc.c 2012-12-11 12:37:32.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/mm/page_alloc.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/mm/page_alloc.c linux-3.4.24-vs2.3.3.9/mm/page_alloc.c +--- linux-3.4.24/mm/page_alloc.c 2012-12-18 14:01:13.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/mm/page_alloc.c 2012-10-22 13:09:53.000000000 +0000 @@ -58,6 +58,8 @@ #include #include @@ -24107,9 +24107,9 @@ diff -NurpP --minimal linux-3.4.23/mm/page_alloc.c linux-3.4.23-vs2.3.3.9/mm/pag } #endif -diff -NurpP --minimal linux-3.4.23/mm/pgtable-generic.c linux-3.4.23-vs2.3.3.9/mm/pgtable-generic.c ---- linux-3.4.23/mm/pgtable-generic.c 2012-05-21 18:07:35.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/mm/pgtable-generic.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/mm/pgtable-generic.c linux-3.4.24-vs2.3.3.9/mm/pgtable-generic.c +--- linux-3.4.24/mm/pgtable-generic.c 2012-05-21 16:07:35.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/mm/pgtable-generic.c 2012-05-21 16:15:05.000000000 +0000 @@ -6,6 +6,8 @@ * Copyright (C) 2010 Linus Torvalds */ @@ -24119,10 +24119,10 @@ diff -NurpP --minimal linux-3.4.23/mm/pgtable-generic.c linux-3.4.23-vs2.3.3.9/m #include #include #include -diff -NurpP --minimal linux-3.4.23/mm/shmem.c linux-3.4.23-vs2.3.3.9/mm/shmem.c ---- linux-3.4.23/mm/shmem.c 2012-12-11 12:37:32.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/mm/shmem.c 2012-12-08 01:53:53.000000000 +0100 -@@ -1467,7 +1467,7 @@ static int shmem_statfs(struct dentry *d +diff -NurpP --minimal linux-3.4.24/mm/shmem.c linux-3.4.24-vs2.3.3.9/mm/shmem.c +--- linux-3.4.24/mm/shmem.c 2012-12-18 14:01:13.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/mm/shmem.c 2012-12-18 14:06:36.000000000 +0000 +@@ -1473,7 +1473,7 @@ static int shmem_statfs(struct dentry *d { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); @@ -24131,7 +24131,7 @@ diff -NurpP --minimal linux-3.4.23/mm/shmem.c linux-3.4.23-vs2.3.3.9/mm/shmem.c buf->f_bsize = PAGE_CACHE_SIZE; buf->f_namelen = NAME_MAX; if (sbinfo->max_blocks) { -@@ -2275,7 +2275,7 @@ int shmem_fill_super(struct super_block +@@ -2281,7 +2281,7 @@ int shmem_fill_super(struct super_block sb->s_maxbytes = MAX_LFS_FILESIZE; sb->s_blocksize = PAGE_CACHE_SIZE; sb->s_blocksize_bits = PAGE_CACHE_SHIFT; @@ -24140,9 +24140,9 @@ diff -NurpP --minimal linux-3.4.23/mm/shmem.c linux-3.4.23-vs2.3.3.9/mm/shmem.c sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-3.4.23/mm/slab.c linux-3.4.23-vs2.3.3.9/mm/slab.c ---- linux-3.4.23/mm/slab.c 2012-12-11 12:37:32.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/mm/slab.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/mm/slab.c linux-3.4.24-vs2.3.3.9/mm/slab.c +--- linux-3.4.24/mm/slab.c 2012-12-18 14:01:13.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/mm/slab.c 2012-10-22 13:09:53.000000000 +0000 @@ -413,6 +413,8 @@ static void kmem_list3_init(struct kmem_ #define STATS_INC_FREEMISS(x) do { } while (0) #endif @@ -24176,9 +24176,9 @@ diff -NurpP --minimal linux-3.4.23/mm/slab.c linux-3.4.23-vs2.3.3.9/mm/slab.c kmemcheck_slab_free(cachep, objp, obj_size(cachep)); -diff -NurpP --minimal linux-3.4.23/mm/slab_vs.h linux-3.4.23-vs2.3.3.9/mm/slab_vs.h ---- linux-3.4.23/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/mm/slab_vs.h 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/mm/slab_vs.h linux-3.4.24-vs2.3.3.9/mm/slab_vs.h +--- linux-3.4.24/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/mm/slab_vs.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,29 @@ + +#include @@ -24209,9 +24209,9 @@ diff -NurpP --minimal linux-3.4.23/mm/slab_vs.h linux-3.4.23-vs2.3.3.9/mm/slab_v + atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-3.4.23/mm/swapfile.c linux-3.4.23-vs2.3.3.9/mm/swapfile.c ---- linux-3.4.23/mm/swapfile.c 2012-12-11 12:37:32.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/mm/swapfile.c 2012-06-28 16:45:07.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/mm/swapfile.c linux-3.4.24-vs2.3.3.9/mm/swapfile.c +--- linux-3.4.24/mm/swapfile.c 2012-12-18 14:01:13.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/mm/swapfile.c 2012-06-28 14:45:07.000000000 +0000 @@ -36,6 +36,7 @@ #include #include @@ -24246,9 +24246,9 @@ diff -NurpP --minimal linux-3.4.23/mm/swapfile.c linux-3.4.23-vs2.3.3.9/mm/swapf } /* -diff -NurpP --minimal linux-3.4.23/net/bridge/br_multicast.c linux-3.4.23-vs2.3.3.9/net/bridge/br_multicast.c ---- linux-3.4.23/net/bridge/br_multicast.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/bridge/br_multicast.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/bridge/br_multicast.c linux-3.4.24-vs2.3.3.9/net/bridge/br_multicast.c +--- linux-3.4.24/net/bridge/br_multicast.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/bridge/br_multicast.c 2012-05-21 16:15:05.000000000 +0000 @@ -445,7 +445,7 @@ static struct sk_buff *br_ip6_multicast_ ip6h->hop_limit = 1; ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); @@ -24258,9 +24258,9 @@ diff -NurpP --minimal linux-3.4.23/net/bridge/br_multicast.c linux-3.4.23-vs2.3. kfree_skb(skb); return NULL; } -diff -NurpP --minimal linux-3.4.23/net/core/dev.c linux-3.4.23-vs2.3.3.9/net/core/dev.c ---- linux-3.4.23/net/core/dev.c 2012-12-11 12:37:32.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/core/dev.c 2012-12-08 01:53:53.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/net/core/dev.c linux-3.4.24-vs2.3.3.9/net/core/dev.c +--- linux-3.4.24/net/core/dev.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/core/dev.c 2012-12-08 00:53:53.000000000 +0000 @@ -126,6 +126,7 @@ #include #include @@ -24367,7 +24367,7 @@ diff -NurpP --minimal linux-3.4.23/net/core/dev.c linux-3.4.23-vs2.3.3.9/net/cor for (i = 0; i < NPROTO; i++) { if (gifconf_list[i]) { int done; -@@ -4101,6 +4122,10 @@ static void dev_seq_printf_stats(struct +@@ -4101,6 +4122,10 @@ static void dev_seq_printf_stats(struct struct rtnl_link_stats64 temp; const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp); @@ -24378,9 +24378,9 @@ diff -NurpP --minimal linux-3.4.23/net/core/dev.c linux-3.4.23-vs2.3.3.9/net/cor 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.4.23/net/core/rtnetlink.c linux-3.4.23-vs2.3.3.9/net/core/rtnetlink.c ---- linux-3.4.23/net/core/rtnetlink.c 2012-12-11 12:37:32.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/core/rtnetlink.c 2012-09-01 10:50:49.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/core/rtnetlink.c linux-3.4.24-vs2.3.3.9/net/core/rtnetlink.c +--- linux-3.4.24/net/core/rtnetlink.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/core/rtnetlink.c 2012-09-01 08:50:49.000000000 +0000 @@ -1078,6 +1078,8 @@ static int rtnl_dump_ifinfo(struct sk_bu hlist_for_each_entry_rcu(dev, node, head, index_hlist) { if (idx < s_idx) @@ -24400,9 +24400,9 @@ diff -NurpP --minimal linux-3.4.23/net/core/rtnetlink.c linux-3.4.23-vs2.3.3.9/n skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL); if (skb == NULL) goto errout; -diff -NurpP --minimal linux-3.4.23/net/core/sock.c linux-3.4.23-vs2.3.3.9/net/core/sock.c ---- linux-3.4.23/net/core/sock.c 2012-12-11 12:37:32.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/core/sock.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/core/sock.c linux-3.4.24-vs2.3.3.9/net/core/sock.c +--- linux-3.4.24/net/core/sock.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/core/sock.c 2012-10-22 13:09:53.000000000 +0000 @@ -129,6 +129,10 @@ #include @@ -24435,7 +24435,7 @@ diff -NurpP --minimal linux-3.4.23/net/core/sock.c linux-3.4.23-vs2.3.3.9/net/co sk_prot_free(sk->sk_prot_creator, sk); } -@@ -1315,6 +1326,8 @@ struct sock *sk_clone_lock(const struct +@@ -1315,6 +1326,8 @@ struct sock *sk_clone_lock(const struct /* SANITY */ get_net(sock_net(newsk)); @@ -24444,7 +24444,7 @@ diff -NurpP --minimal linux-3.4.23/net/core/sock.c linux-3.4.23-vs2.3.3.9/net/co sk_node_init(&newsk->sk_node); sock_lock_init(newsk); bh_lock_sock(newsk); -@@ -1371,6 +1384,12 @@ struct sock *sk_clone_lock(const struct +@@ -1371,6 +1384,12 @@ struct sock *sk_clone_lock(const struct smp_wmb(); atomic_set(&newsk->sk_refcnt, 2); @@ -24470,9 +24470,9 @@ diff -NurpP --minimal linux-3.4.23/net/core/sock.c linux-3.4.23-vs2.3.3.9/net/co /* * Before updating sk_refcnt, we must commit prior changes to memory * (Documentation/RCU/rculist_nulls.txt for details) -diff -NurpP --minimal linux-3.4.23/net/ipv4/af_inet.c linux-3.4.23-vs2.3.3.9/net/ipv4/af_inet.c ---- linux-3.4.23/net/ipv4/af_inet.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/af_inet.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv4/af_inet.c linux-3.4.24-vs2.3.3.9/net/ipv4/af_inet.c +--- linux-3.4.24/net/ipv4/af_inet.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/af_inet.c 2012-05-21 16:15:05.000000000 +0000 @@ -118,6 +118,7 @@ #ifdef CONFIG_IP_MROUTE #include @@ -24550,9 +24550,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/af_inet.c linux-3.4.23-vs2.3.3.9/net sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; } -diff -NurpP --minimal linux-3.4.23/net/ipv4/arp.c linux-3.4.23-vs2.3.3.9/net/ipv4/arp.c ---- linux-3.4.23/net/ipv4/arp.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/arp.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv4/arp.c linux-3.4.24-vs2.3.3.9/net/ipv4/arp.c +--- linux-3.4.24/net/ipv4/arp.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/arp.c 2012-05-21 16:15:05.000000000 +0000 @@ -1328,6 +1328,7 @@ static void arp_format_neigh_entry(struc struct net_device *dev = n->dev; int hatype = dev->type; @@ -24569,9 +24569,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/arp.c linux-3.4.23-vs2.3.3.9/net/ipv 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.4.23/net/ipv4/devinet.c linux-3.4.23-vs2.3.3.9/net/ipv4/devinet.c ---- linux-3.4.23/net/ipv4/devinet.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/devinet.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv4/devinet.c linux-3.4.24-vs2.3.3.9/net/ipv4/devinet.c +--- linux-3.4.24/net/ipv4/devinet.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/devinet.c 2012-05-21 16:15:05.000000000 +0000 @@ -517,6 +517,7 @@ struct in_device *inetdev_by_index(struc } EXPORT_SYMBOL(inetdev_by_index); @@ -24638,9 +24638,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/devinet.c linux-3.4.23-vs2.3.3.9/net if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-3.4.23/net/ipv4/fib_trie.c linux-3.4.23-vs2.3.3.9/net/ipv4/fib_trie.c ---- linux-3.4.23/net/ipv4/fib_trie.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/fib_trie.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv4/fib_trie.c linux-3.4.24-vs2.3.3.9/net/ipv4/fib_trie.c +--- linux-3.4.24/net/ipv4/fib_trie.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/fib_trie.c 2012-05-21 16:15:05.000000000 +0000 @@ -2556,6 +2556,7 @@ static int fib_route_seq_show(struct seq || fa->fa_type == RTN_MULTICAST) continue; @@ -24649,9 +24649,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/fib_trie.c linux-3.4.23-vs2.3.3.9/ne if (fi) seq_printf(seq, "%s\t%08X\t%08X\t%04X\t%d\t%u\t" -diff -NurpP --minimal linux-3.4.23/net/ipv4/inet_connection_sock.c linux-3.4.23-vs2.3.3.9/net/ipv4/inet_connection_sock.c ---- linux-3.4.23/net/ipv4/inet_connection_sock.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/inet_connection_sock.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv4/inet_connection_sock.c linux-3.4.24-vs2.3.3.9/net/ipv4/inet_connection_sock.c +--- linux-3.4.24/net/ipv4/inet_connection_sock.c 2012-03-19 18:47:33.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/inet_connection_sock.c 2012-05-21 16:15:05.000000000 +0000 @@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low, } EXPORT_SYMBOL(inet_get_local_port_range); @@ -24690,7 +24690,7 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/inet_connection_sock.c linux-3.4.23- int inet_csk_bind_conflict(const struct sock *sk, const struct inet_bind_bucket *tb) { -@@ -74,9 +105,7 @@ int inet_csk_bind_conflict(const struct +@@ -74,9 +105,7 @@ int inet_csk_bind_conflict(const struct sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) { if (!reuse || !sk2->sk_reuse || sk2->sk_state == TCP_LISTEN) { @@ -24701,9 +24701,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/inet_connection_sock.c linux-3.4.23- break; } } -diff -NurpP --minimal linux-3.4.23/net/ipv4/inet_diag.c linux-3.4.23-vs2.3.3.9/net/ipv4/inet_diag.c ---- linux-3.4.23/net/ipv4/inet_diag.c 2012-12-11 12:37:32.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/inet_diag.c 2012-11-19 00:52:30.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/net/ipv4/inet_diag.c linux-3.4.24-vs2.3.3.9/net/ipv4/inet_diag.c +--- linux-3.4.24/net/ipv4/inet_diag.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/inet_diag.c 2012-11-18 23:52:30.000000000 +0000 @@ -31,6 +31,8 @@ #include @@ -24752,7 +24752,7 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/inet_diag.c linux-3.4.23-vs2.3.3.9/n sk = inet6_lookup(&init_net, hashinfo, (struct in6_addr *)req->id.idiag_dst, req->id.idiag_dport, -@@ -472,6 +478,7 @@ int inet_diag_bc_sk(const struct nlattr +@@ -472,6 +478,7 @@ int inet_diag_bc_sk(const struct nlattr } else #endif { @@ -24814,9 +24814,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/inet_diag.c linux-3.4.23-vs2.3.3.9/n if (num < s_num) goto next_dying; if (r->sdiag_family != AF_UNSPEC && -diff -NurpP --minimal linux-3.4.23/net/ipv4/inet_hashtables.c linux-3.4.23-vs2.3.3.9/net/ipv4/inet_hashtables.c ---- linux-3.4.23/net/ipv4/inet_hashtables.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/inet_hashtables.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv4/inet_hashtables.c linux-3.4.24-vs2.3.3.9/net/ipv4/inet_hashtables.c +--- linux-3.4.24/net/ipv4/inet_hashtables.c 2011-10-24 16:45:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/inet_hashtables.c 2012-05-21 16:15:05.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -24853,9 +24853,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/inet_hashtables.c linux-3.4.23-vs2.3 /* * 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.4.23/net/ipv4/netfilter/nf_nat_helper.c linux-3.4.23-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c ---- linux-3.4.23/net/ipv4/netfilter/nf_nat_helper.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv4/netfilter/nf_nat_helper.c linux-3.4.24-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c +--- linux-3.4.24/net/ipv4/netfilter/nf_nat_helper.c 2012-03-19 18:47:33.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c 2012-05-21 16:15:05.000000000 +0000 @@ -20,6 +20,7 @@ #include @@ -24864,9 +24864,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/netfilter/nf_nat_helper.c linux-3.4. #include #include #include -diff -NurpP --minimal linux-3.4.23/net/ipv4/netfilter.c linux-3.4.23-vs2.3.3.9/net/ipv4/netfilter.c ---- linux-3.4.23/net/ipv4/netfilter.c 2012-01-09 16:15:03.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/netfilter.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv4/netfilter.c linux-3.4.24-vs2.3.3.9/net/ipv4/netfilter.c +--- linux-3.4.24/net/ipv4/netfilter.c 2012-01-09 15:15:03.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/netfilter.c 2012-05-21 16:15:05.000000000 +0000 @@ -6,7 +6,7 @@ #include #include @@ -24876,9 +24876,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/netfilter.c linux-3.4.23-vs2.3.3.9/n #include #include #include -diff -NurpP --minimal linux-3.4.23/net/ipv4/raw.c linux-3.4.23-vs2.3.3.9/net/ipv4/raw.c ---- linux-3.4.23/net/ipv4/raw.c 2012-12-11 12:37:32.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/raw.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv4/raw.c linux-3.4.24-vs2.3.3.9/net/ipv4/raw.c +--- linux-3.4.24/net/ipv4/raw.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/raw.c 2012-10-22 13:09:53.000000000 +0000 @@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru if (net_eq(sock_net(sk), net) && inet->inet_num == num && @@ -24961,7 +24961,7 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/raw.c linux-3.4.23-vs2.3.3.9/net/ipv goto found; } sk = NULL; -@@ -927,7 +947,8 @@ static struct sock *raw_get_next(struct +@@ -927,7 +947,8 @@ static struct sock *raw_get_next(struct sk = sk_next(sk); try_again: ; @@ -24971,9 +24971,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/raw.c linux-3.4.23-vs2.3.3.9/net/ipv if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-3.4.23/net/ipv4/route.c linux-3.4.23-vs2.3.3.9/net/ipv4/route.c ---- linux-3.4.23/net/ipv4/route.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/route.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv4/route.c linux-3.4.24-vs2.3.3.9/net/ipv4/route.c +--- linux-3.4.24/net/ipv4/route.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/route.c 2012-05-21 16:15:05.000000000 +0000 @@ -2696,7 +2696,7 @@ static struct rtable *ip_route_output_sl @@ -24983,9 +24983,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/route.c linux-3.4.23-vs2.3.3.9/net/i rth = ERR_PTR(-ENODEV); if (dev_out == NULL) goto out; -diff -NurpP --minimal linux-3.4.23/net/ipv4/tcp.c linux-3.4.23-vs2.3.3.9/net/ipv4/tcp.c ---- linux-3.4.23/net/ipv4/tcp.c 2012-12-11 12:37:32.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/tcp.c 2012-11-19 00:52:30.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/net/ipv4/tcp.c linux-3.4.24-vs2.3.3.9/net/ipv4/tcp.c +--- linux-3.4.24/net/ipv4/tcp.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/tcp.c 2012-11-18 23:52:30.000000000 +0000 @@ -268,6 +268,7 @@ #include #include @@ -24994,9 +24994,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/tcp.c linux-3.4.23-vs2.3.3.9/net/ipv #include #include -diff -NurpP --minimal linux-3.4.23/net/ipv4/tcp_ipv4.c linux-3.4.23-vs2.3.3.9/net/ipv4/tcp_ipv4.c ---- linux-3.4.23/net/ipv4/tcp_ipv4.c 2012-12-11 12:37:32.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/tcp_ipv4.c 2012-11-06 18:02:35.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/net/ipv4/tcp_ipv4.c linux-3.4.24-vs2.3.3.9/net/ipv4/tcp_ipv4.c +--- linux-3.4.24/net/ipv4/tcp_ipv4.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/tcp_ipv4.c 2012-11-06 17:02:35.000000000 +0000 @@ -2039,6 +2039,12 @@ static void *listening_get_next(struct s req = req->dl_next; while (1) { @@ -25102,9 +25102,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/tcp_ipv4.c linux-3.4.23-vs2.3.3.9/ne destp = ntohs(tw->tw_dport); srcp = ntohs(tw->tw_sport); -diff -NurpP --minimal linux-3.4.23/net/ipv4/tcp_minisocks.c linux-3.4.23-vs2.3.3.9/net/ipv4/tcp_minisocks.c ---- linux-3.4.23/net/ipv4/tcp_minisocks.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/tcp_minisocks.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv4/tcp_minisocks.c linux-3.4.24-vs2.3.3.9/net/ipv4/tcp_minisocks.c +--- linux-3.4.24/net/ipv4/tcp_minisocks.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/tcp_minisocks.c 2012-05-21 16:15:05.000000000 +0000 @@ -23,6 +23,9 @@ #include #include @@ -25115,7 +25115,7 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/tcp_minisocks.c linux-3.4.23-vs2.3.3 #include #include #include -@@ -336,6 +339,11 @@ void tcp_time_wait(struct sock *sk, int +@@ -336,6 +339,11 @@ void tcp_time_wait(struct sock *sk, int tcptw->tw_ts_recent = tp->rx_opt.ts_recent; tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp; @@ -25127,9 +25127,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/tcp_minisocks.c linux-3.4.23-vs2.3.3 #if IS_ENABLED(CONFIG_IPV6) if (tw->tw_family == PF_INET6) { struct ipv6_pinfo *np = inet6_sk(sk); -diff -NurpP --minimal linux-3.4.23/net/ipv4/udp.c linux-3.4.23-vs2.3.3.9/net/ipv4/udp.c ---- linux-3.4.23/net/ipv4/udp.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/ipv4/udp.c 2012-06-28 16:45:36.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv4/udp.c linux-3.4.24-vs2.3.3.9/net/ipv4/udp.c +--- linux-3.4.24/net/ipv4/udp.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv4/udp.c 2012-06-28 14:45:36.000000000 +0000 @@ -298,14 +298,7 @@ fail: } EXPORT_SYMBOL(udp_lib_get_port); @@ -25240,7 +25240,7 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/udp.c linux-3.4.23-vs2.3.3.9/net/ipv if (sk->sk_family == state->family) goto found; } -@@ -1987,7 +2005,9 @@ static struct sock *udp_get_next(struct +@@ -1987,7 +2005,9 @@ static struct sock *udp_get_next(struct do { sk = sk_nulls_next(sk); @@ -25262,9 +25262,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv4/udp.c linux-3.4.23-vs2.3.3.9/net/ipv __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); -diff -NurpP --minimal linux-3.4.23/net/ipv6/Kconfig linux-3.4.23-vs2.3.3.9/net/ipv6/Kconfig ---- linux-3.4.23/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/ipv6/Kconfig 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv6/Kconfig linux-3.4.24-vs2.3.3.9/net/ipv6/Kconfig +--- linux-3.4.24/net/ipv6/Kconfig 2010-08-02 14:52:59.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv6/Kconfig 2012-05-21 16:15:05.000000000 +0000 @@ -4,8 +4,8 @@ # IPv6 as module will cause a CRASH if you try to unload it @@ -25276,9 +25276,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv6/Kconfig linux-3.4.23-vs2.3.3.9/net/i ---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.4.23/net/ipv6/addrconf.c linux-3.4.23-vs2.3.3.9/net/ipv6/addrconf.c ---- linux-3.4.23/net/ipv6/addrconf.c 2012-12-11 12:37:32.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv6/addrconf.c 2012-11-06 18:02:35.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/net/ipv6/addrconf.c linux-3.4.24-vs2.3.3.9/net/ipv6/addrconf.c +--- linux-3.4.24/net/ipv6/addrconf.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv6/addrconf.c 2012-11-06 17:02:35.000000000 +0000 @@ -88,6 +88,8 @@ #include #include @@ -25297,7 +25297,7 @@ diff -NurpP --minimal linux-3.4.23/net/ipv6/addrconf.c linux-3.4.23-vs2.3.3.9/ne { struct ipv6_saddr_score scores[2], *score = &scores[0], *hiscore = &scores[1]; -@@ -1180,6 +1182,8 @@ int ipv6_dev_get_saddr(struct net *net, +@@ -1180,6 +1182,8 @@ int ipv6_dev_get_saddr(struct net *net, dev->name); continue; } @@ -25378,9 +25378,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv6/addrconf.c linux-3.4.23-vs2.3.3.9/ne idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-3.4.23/net/ipv6/af_inet6.c linux-3.4.23-vs2.3.3.9/net/ipv6/af_inet6.c ---- linux-3.4.23/net/ipv6/af_inet6.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/ipv6/af_inet6.c 2012-09-01 11:15:04.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv6/af_inet6.c linux-3.4.24-vs2.3.3.9/net/ipv6/af_inet6.c +--- linux-3.4.24/net/ipv6/af_inet6.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv6/af_inet6.c 2012-09-01 09:15:04.000000000 +0000 @@ -42,6 +42,8 @@ #include #include @@ -25476,9 +25476,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv6/af_inet6.c linux-3.4.23-vs2.3.3.9/ne if (ipv6_addr_any(&np->rcv_saddr)) sin->sin6_addr = np->saddr; else -diff -NurpP --minimal linux-3.4.23/net/ipv6/datagram.c linux-3.4.23-vs2.3.3.9/net/ipv6/datagram.c ---- linux-3.4.23/net/ipv6/datagram.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/ipv6/datagram.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv6/datagram.c linux-3.4.24-vs2.3.3.9/net/ipv6/datagram.c +--- linux-3.4.24/net/ipv6/datagram.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv6/datagram.c 2012-05-21 16:15:05.000000000 +0000 @@ -642,7 +642,7 @@ int datagram_send_ctl(struct net *net, s rcu_read_lock(); @@ -25488,9 +25488,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv6/datagram.c linux-3.4.23-vs2.3.3.9/ne if (!dev) { rcu_read_unlock(); return -ENODEV; -diff -NurpP --minimal linux-3.4.23/net/ipv6/fib6_rules.c linux-3.4.23-vs2.3.3.9/net/ipv6/fib6_rules.c ---- linux-3.4.23/net/ipv6/fib6_rules.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv6/fib6_rules.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv6/fib6_rules.c linux-3.4.24-vs2.3.3.9/net/ipv6/fib6_rules.c +--- linux-3.4.24/net/ipv6/fib6_rules.c 2012-03-19 18:47:33.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv6/fib6_rules.c 2012-05-21 16:15:05.000000000 +0000 @@ -91,7 +91,7 @@ static int fib6_rule_action(struct fib_r ip6_dst_idev(&rt->dst)->dev, &flp6->daddr, @@ -25500,9 +25500,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv6/fib6_rules.c linux-3.4.23-vs2.3.3.9/ goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-3.4.23/net/ipv6/inet6_hashtables.c linux-3.4.23-vs2.3.3.9/net/ipv6/inet6_hashtables.c ---- linux-3.4.23/net/ipv6/inet6_hashtables.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/ipv6/inet6_hashtables.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv6/inet6_hashtables.c linux-3.4.24-vs2.3.3.9/net/ipv6/inet6_hashtables.c +--- linux-3.4.24/net/ipv6/inet6_hashtables.c 2011-10-24 16:45:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv6/inet6_hashtables.c 2012-05-21 16:15:05.000000000 +0000 @@ -16,6 +16,7 @@ #include @@ -25538,9 +25538,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv6/inet6_hashtables.c linux-3.4.23-vs2. } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-3.4.23/net/ipv6/ip6_output.c linux-3.4.23-vs2.3.3.9/net/ipv6/ip6_output.c ---- linux-3.4.23/net/ipv6/ip6_output.c 2012-12-11 12:37:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv6/ip6_output.c 2012-06-28 16:45:07.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv6/ip6_output.c linux-3.4.24-vs2.3.3.9/net/ipv6/ip6_output.c +--- linux-3.4.24/net/ipv6/ip6_output.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv6/ip6_output.c 2012-06-28 14:45:07.000000000 +0000 @@ -966,7 +966,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, @@ -25551,9 +25551,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv6/ip6_output.c linux-3.4.23-vs2.3.3.9/ if (err) goto out_err_release; } -diff -NurpP --minimal linux-3.4.23/net/ipv6/ndisc.c linux-3.4.23-vs2.3.3.9/net/ipv6/ndisc.c ---- linux-3.4.23/net/ipv6/ndisc.c 2012-12-11 12:37:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv6/ndisc.c 2012-11-19 00:52:30.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/net/ipv6/ndisc.c linux-3.4.24-vs2.3.3.9/net/ipv6/ndisc.c +--- linux-3.4.24/net/ipv6/ndisc.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv6/ndisc.c 2012-11-18 23:52:30.000000000 +0000 @@ -575,7 +575,7 @@ static void ndisc_send_na(struct net_dev } else { if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, @@ -25563,9 +25563,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv6/ndisc.c linux-3.4.23-vs2.3.3.9/net/i return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-3.4.23/net/ipv6/raw.c linux-3.4.23-vs2.3.3.9/net/ipv6/raw.c ---- linux-3.4.23/net/ipv6/raw.c 2012-12-11 12:37:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv6/raw.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv6/raw.c linux-3.4.24-vs2.3.3.9/net/ipv6/raw.c +--- linux-3.4.24/net/ipv6/raw.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv6/raw.c 2012-10-22 13:09:53.000000000 +0000 @@ -30,6 +30,7 @@ #include #include @@ -25588,9 +25588,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv6/raw.c linux-3.4.23-vs2.3.3.9/net/ipv /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -diff -NurpP --minimal linux-3.4.23/net/ipv6/route.c linux-3.4.23-vs2.3.3.9/net/ipv6/route.c ---- linux-3.4.23/net/ipv6/route.c 2012-12-11 12:37:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv6/route.c 2012-11-19 00:52:30.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/net/ipv6/route.c linux-3.4.24-vs2.3.3.9/net/ipv6/route.c +--- linux-3.4.24/net/ipv6/route.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv6/route.c 2012-11-18 23:52:30.000000000 +0000 @@ -55,6 +55,7 @@ #include #include @@ -25638,9 +25638,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv6/route.c linux-3.4.23-vs2.3.3.9/net/i seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); #ifdef CONFIG_IPV6_SUBTREES -diff -NurpP --minimal linux-3.4.23/net/ipv6/tcp_ipv6.c linux-3.4.23-vs2.3.3.9/net/ipv6/tcp_ipv6.c ---- linux-3.4.23/net/ipv6/tcp_ipv6.c 2012-12-11 12:37:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv6/tcp_ipv6.c 2012-11-06 18:02:35.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/net/ipv6/tcp_ipv6.c linux-3.4.24-vs2.3.3.9/net/ipv6/tcp_ipv6.c +--- linux-3.4.24/net/ipv6/tcp_ipv6.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv6/tcp_ipv6.c 2012-11-06 17:02:35.000000000 +0000 @@ -71,6 +71,7 @@ #include @@ -25667,9 +25667,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv6/tcp_ipv6.c linux-3.4.23-vs2.3.3.9/ne addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-3.4.23/net/ipv6/udp.c linux-3.4.23-vs2.3.3.9/net/ipv6/udp.c ---- linux-3.4.23/net/ipv6/udp.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/ipv6/udp.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv6/udp.c linux-3.4.24-vs2.3.3.9/net/ipv6/udp.c +--- linux-3.4.24/net/ipv6/udp.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv6/udp.c 2012-05-21 16:15:05.000000000 +0000 @@ -45,41 +45,67 @@ #include #include @@ -25762,9 +25762,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv6/udp.c linux-3.4.23-vs2.3.3.9/net/ipv } if (!ipv6_addr_any(&np->daddr)) { if (!ipv6_addr_equal(&np->daddr, saddr)) -diff -NurpP --minimal linux-3.4.23/net/ipv6/xfrm6_policy.c linux-3.4.23-vs2.3.3.9/net/ipv6/xfrm6_policy.c ---- linux-3.4.23/net/ipv6/xfrm6_policy.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/ipv6/xfrm6_policy.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/ipv6/xfrm6_policy.c linux-3.4.24-vs2.3.3.9/net/ipv6/xfrm6_policy.c +--- linux-3.4.24/net/ipv6/xfrm6_policy.c 2012-03-19 18:47:33.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/ipv6/xfrm6_policy.c 2012-05-21 16:15:05.000000000 +0000 @@ -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, @@ -25774,9 +25774,9 @@ diff -NurpP --minimal linux-3.4.23/net/ipv6/xfrm6_policy.c linux-3.4.23-vs2.3.3. dst_release(dst); return 0; } -diff -NurpP --minimal linux-3.4.23/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.23-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-3.4.23/net/netfilter/ipvs/ip_vs_xmit.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.24-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c +--- linux-3.4.24/net/netfilter/ipvs/ip_vs_xmit.c 2012-03-19 18:47:33.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c 2012-05-21 16:15:05.000000000 +0000 @@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net, return dst; if (ipv6_addr_any(&fl6.saddr) && @@ -25786,9 +25786,9 @@ diff -NurpP --minimal linux-3.4.23/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.23- goto out_err; if (do_xfrm) { dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-3.4.23/net/netlink/af_netlink.c linux-3.4.23-vs2.3.3.9/net/netlink/af_netlink.c ---- linux-3.4.23/net/netlink/af_netlink.c 2012-12-11 12:37:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/netlink/af_netlink.c 2012-11-19 00:52:30.000000000 +0100 +diff -NurpP --minimal linux-3.4.24/net/netlink/af_netlink.c linux-3.4.24-vs2.3.3.9/net/netlink/af_netlink.c +--- linux-3.4.24/net/netlink/af_netlink.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/netlink/af_netlink.c 2012-11-18 23:52:30.000000000 +0000 @@ -55,6 +55,9 @@ #include #include @@ -25828,9 +25828,9 @@ diff -NurpP --minimal linux-3.4.23/net/netlink/af_netlink.c linux-3.4.23-vs2.3.3 s = sk_next(s); if (s) { iter->link = i; -diff -NurpP --minimal linux-3.4.23/net/socket.c linux-3.4.23-vs2.3.3.9/net/socket.c ---- linux-3.4.23/net/socket.c 2012-12-11 12:37:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/socket.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/socket.c linux-3.4.24-vs2.3.3.9/net/socket.c +--- linux-3.4.24/net/socket.c 2012-12-18 14:01:14.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/socket.c 2012-10-22 13:09:53.000000000 +0000 @@ -98,6 +98,10 @@ #include @@ -25937,9 +25937,9 @@ diff -NurpP --minimal linux-3.4.23/net/socket.c linux-3.4.23-vs2.3.3.9/net/socke err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-3.4.23/net/sunrpc/auth.c linux-3.4.23-vs2.3.3.9/net/sunrpc/auth.c ---- linux-3.4.23/net/sunrpc/auth.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/net/sunrpc/auth.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/sunrpc/auth.c linux-3.4.24-vs2.3.3.9/net/sunrpc/auth.c +--- linux-3.4.24/net/sunrpc/auth.c 2011-10-24 16:45:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/sunrpc/auth.c 2012-05-21 16:15:05.000000000 +0000 @@ -14,6 +14,7 @@ #include #include @@ -25964,9 +25964,9 @@ diff -NurpP --minimal linux-3.4.23/net/sunrpc/auth.c linux-3.4.23-vs2.3.3.9/net/ }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-3.4.23/net/sunrpc/auth_unix.c linux-3.4.23-vs2.3.3.9/net/sunrpc/auth_unix.c ---- linux-3.4.23/net/sunrpc/auth_unix.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/sunrpc/auth_unix.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/sunrpc/auth_unix.c linux-3.4.24-vs2.3.3.9/net/sunrpc/auth_unix.c +--- linux-3.4.24/net/sunrpc/auth_unix.c 2012-01-09 15:15:04.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/sunrpc/auth_unix.c 2012-05-21 16:15:05.000000000 +0000 @@ -12,12 +12,14 @@ #include #include @@ -26025,9 +26025,9 @@ diff -NurpP --minimal linux-3.4.23/net/sunrpc/auth_unix.c linux-3.4.23-vs2.3.3.9 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.4.23/net/sunrpc/clnt.c linux-3.4.23-vs2.3.3.9/net/sunrpc/clnt.c ---- linux-3.4.23/net/sunrpc/clnt.c 2012-12-11 12:37:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/sunrpc/clnt.c 2012-09-01 10:50:49.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/sunrpc/clnt.c linux-3.4.24-vs2.3.3.9/net/sunrpc/clnt.c +--- linux-3.4.24/net/sunrpc/clnt.c 2012-12-18 14:01:15.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/sunrpc/clnt.c 2012-09-01 08:50:49.000000000 +0000 @@ -31,6 +31,7 @@ #include #include @@ -26046,9 +26046,9 @@ diff -NurpP --minimal linux-3.4.23/net/sunrpc/clnt.c linux-3.4.23-vs2.3.3.9/net/ return clnt; } EXPORT_SYMBOL_GPL(rpc_create); -diff -NurpP --minimal linux-3.4.23/net/unix/af_unix.c linux-3.4.23-vs2.3.3.9/net/unix/af_unix.c ---- linux-3.4.23/net/unix/af_unix.c 2012-12-11 12:37:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/net/unix/af_unix.c 2012-10-22 15:09:53.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/net/unix/af_unix.c linux-3.4.24-vs2.3.3.9/net/unix/af_unix.c +--- linux-3.4.24/net/unix/af_unix.c 2012-12-18 14:01:15.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/net/unix/af_unix.c 2012-10-22 13:09:53.000000000 +0000 @@ -114,6 +114,8 @@ #include #include @@ -26067,7 +26067,7 @@ diff -NurpP --minimal linux-3.4.23/net/unix/af_unix.c linux-3.4.23-vs2.3.3.9/net if (u->addr->len == len && !memcmp(u->addr->name, sunname, len)) goto found; -@@ -2266,6 +2270,8 @@ static struct sock *unix_seq_idx(struct +@@ -2266,6 +2270,8 @@ static struct sock *unix_seq_idx(struct for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) { if (sock_net(s) != seq_file_net(seq)) continue; @@ -26086,9 +26086,9 @@ diff -NurpP --minimal linux-3.4.23/net/unix/af_unix.c linux-3.4.23-vs2.3.3.9/net sk = next_unix_socket(&iter->i, sk); return sk; } -diff -NurpP --minimal linux-3.4.23/scripts/checksyscalls.sh linux-3.4.23-vs2.3.3.9/scripts/checksyscalls.sh ---- linux-3.4.23/scripts/checksyscalls.sh 2012-03-19 19:47:34.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/scripts/checksyscalls.sh 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/scripts/checksyscalls.sh linux-3.4.24-vs2.3.3.9/scripts/checksyscalls.sh +--- linux-3.4.24/scripts/checksyscalls.sh 2012-03-19 18:47:34.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/scripts/checksyscalls.sh 2012-05-21 16:15:05.000000000 +0000 @@ -193,7 +193,6 @@ cat << EOF #define __IGNORE_afs_syscall #define __IGNORE_getpmsg @@ -26097,9 +26097,9 @@ diff -NurpP --minimal linux-3.4.23/scripts/checksyscalls.sh linux-3.4.23-vs2.3.3 EOF } -diff -NurpP --minimal linux-3.4.23/security/commoncap.c linux-3.4.23-vs2.3.3.9/security/commoncap.c ---- linux-3.4.23/security/commoncap.c 2012-05-21 18:07:41.000000000 +0200 -+++ linux-3.4.23-vs2.3.3.9/security/commoncap.c 2012-05-21 18:15:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/security/commoncap.c linux-3.4.24-vs2.3.3.9/security/commoncap.c +--- linux-3.4.24/security/commoncap.c 2012-05-21 16:07:41.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/security/commoncap.c 2012-05-21 16:15:05.000000000 +0000 @@ -76,14 +76,20 @@ int cap_netlink_send(struct sock *sk, st int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, int cap, int audit) @@ -26132,7 +26132,7 @@ diff -NurpP --minimal linux-3.4.23/security/commoncap.c linux-3.4.23-vs2.3.3.9/s return -EPERM; return 0; } -@@ -638,7 +644,7 @@ int cap_inode_removexattr(struct dentry +@@ -638,7 +644,7 @@ int cap_inode_removexattr(struct dentry if (!strncmp(name, XATTR_SECURITY_PREFIX, sizeof(XATTR_SECURITY_PREFIX) - 1) && @@ -26141,9 +26141,9 @@ diff -NurpP --minimal linux-3.4.23/security/commoncap.c linux-3.4.23-vs2.3.3.9/s return -EPERM; return 0; } -diff -NurpP --minimal linux-3.4.23/security/selinux/hooks.c linux-3.4.23-vs2.3.3.9/security/selinux/hooks.c ---- linux-3.4.23/security/selinux/hooks.c 2012-12-11 12:37:33.000000000 +0100 -+++ linux-3.4.23-vs2.3.3.9/security/selinux/hooks.c 2012-09-01 10:50:49.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/security/selinux/hooks.c linux-3.4.24-vs2.3.3.9/security/selinux/hooks.c +--- linux-3.4.24/security/selinux/hooks.c 2012-12-18 14:01:15.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/security/selinux/hooks.c 2012-09-01 08:50:49.000000000 +0000 @@ -66,7 +66,6 @@ #include #include diff --git a/kernel.spec b/kernel.spec index 8bc3da71..cfa65f39 100644 --- a/kernel.spec +++ b/kernel.spec @@ -91,7 +91,7 @@ %define rel 3 %define basever 3.4 -%define postver .23 +%define postver .24 # __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) @@ -138,7 +138,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz # Source0-md5: 967f72983655e2479f951195953e8480 %if "%{postver}" != ".0" Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2 -# Patch0-md5: e7083612816f44be4bd07c03d7583984 +# Patch0-md5: 3290598b53fd84f3023c2e57418a82ef %endif Source3: kernel-autoconf.h -- 2.44.0