diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2012-12-21 16:05:12 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-12-21 16:05:12 +0000 |
commit | c3b3f60df93382e1c44e8e504dc72e53587177bc (patch) | |
tree | f35a1a26dd59aaff0c5d051bee691638d5e84e9c | |
parent | ff94bda8bd8951ef2085a19f64620c8bc58b6674 (diff) | |
download | aports-c3b3f60df93382e1c44e8e504dc72e53587177bc.tar.bz2 aports-c3b3f60df93382e1c44e8e504dc72e53587177bc.tar.xz |
main/linux-vserver: upgrade to 3.4.24 kernel
-rw-r--r-- | main/linux-vserver/APKBUILD | 8 | ||||
-rw-r--r-- | main/linux-vserver/patch-3.4.24-vs2.3.3.9.diff (renamed from main/linux-vserver/patch-3.4.13-vs2.3.3.8.diff) | 2706 |
2 files changed, 1386 insertions, 1328 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index c4a0803499..24bbfe81c3 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -2,9 +2,9 @@ _flavor=vserver pkgname=linux-${_flavor} -pkgver=3.4.13 +pkgver=3.4.24 pkgrel=0 -_vsver=vs2.3.3.8 +_vsver=vs2.3.3.9 if [ "${pkgver##*.*.*}" = "$pkgver" ]; then _kernver=$pkgver @@ -133,7 +133,7 @@ dev() { } md5sums="967f72983655e2479f951195953e8480 linux-3.4.tar.xz -65c1d3da2074c552e0a405a1c2f44310 patch-3.4.13.xz -a5306ddb3b03c64509a1643bd129aa33 patch-3.4.13-vs2.3.3.8.diff +429bd5732ce4511fde2706e359cd4c9c patch-3.4.24.xz +3660c77d26b869561844bd6b083d9df0 patch-3.4.24-vs2.3.3.9.diff 0b4b3aa4d261b25c06dd3a5228c07ef1 kernelconfig.x86 fbaa6797813e2bb81d7c8feb6a50e28d kernelconfig.x86_64" diff --git a/main/linux-vserver/patch-3.4.13-vs2.3.3.8.diff b/main/linux-vserver/patch-3.4.24-vs2.3.3.9.diff index a1f3b71e79..158cf5e597 100644 --- a/main/linux-vserver/patch-3.4.13-vs2.3.3.8.diff +++ b/main/linux-vserver/patch-3.4.24-vs2.3.3.9.diff @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-3.4.11/Documentation/vserver/debug.txt linux-3.4.11-vs2.3.3.8/Documentation/vserver/debug.txt ---- linux-3.4.11/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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,21 +156,21 @@ diff -NurpP --minimal linux-3.4.11/Documentation/vserver/debug.txt linux-3.4.11- + 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.11/Makefile linux-3.4.11-vs2.3.3.8/Makefile ---- linux-3.4.11/Makefile 2012-09-16 20:46:09.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/Makefile 2012-09-16 21:17:05.000000000 +0200 +diff -NurpP --minimal linux-3.4.24/Makefile linux-3.4.24-vs2.3.3.9/Makefile +--- linux-3.4.24/Makefile 2012-12-18 14:00:43.000000000 +0000 ++++ linux-3.4.24-vs2.3.3.9/Makefile 2012-12-18 14:33:01.000000000 +0000 @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 4 - SUBLEVEL = 13 + SUBLEVEL = 24 -EXTRAVERSION = -+EXTRAVERSION = -vs2.3.3.8 ++EXTRAVERSION = -vs2.3.3.9 NAME = Saber-toothed Squirrel # *DOCUMENTATION* -diff -NurpP --minimal linux-3.4.11/arch/alpha/Kconfig linux-3.4.11-vs2.3.3.8/arch/alpha/Kconfig ---- linux-3.4.11/arch/alpha/Kconfig 2012-05-21 18:06:12.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -180,9 +180,9 @@ diff -NurpP --minimal linux-3.4.11/arch/alpha/Kconfig linux-3.4.11-vs2.3.3.8/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.11/arch/alpha/kernel/entry.S linux-3.4.11-vs2.3.3.8/arch/alpha/kernel/entry.S ---- linux-3.4.11/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -215,9 +215,9 @@ diff -NurpP --minimal linux-3.4.11/arch/alpha/kernel/entry.S linux-3.4.11-vs2.3. ret .end sys_getxpid -diff -NurpP --minimal linux-3.4.11/arch/alpha/kernel/ptrace.c linux-3.4.11-vs2.3.3.8/arch/alpha/kernel/ptrace.c ---- linux-3.4.11/arch/alpha/kernel/ptrace.c 2012-05-21 18:06:12.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/user.h> #include <linux/security.h> @@ -226,9 +226,9 @@ diff -NurpP --minimal linux-3.4.11/arch/alpha/kernel/ptrace.c linux-3.4.11-vs2.3 #include <asm/uaccess.h> #include <asm/pgtable.h> -diff -NurpP --minimal linux-3.4.11/arch/alpha/kernel/systbls.S linux-3.4.11-vs2.3.3.8/arch/alpha/kernel/systbls.S ---- linux-3.4.11/arch/alpha/kernel/systbls.S 2012-01-09 16:13:54.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -238,9 +238,9 @@ diff -NurpP --minimal linux-3.4.11/arch/alpha/kernel/systbls.S linux-3.4.11-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.11/arch/alpha/kernel/traps.c linux-3.4.11-vs2.3.3.8/arch/alpha/kernel/traps.c ---- linux-3.4.11/arch/alpha/kernel/traps.c 2012-05-21 18:06:12.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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()); @@ -251,10 +251,10 @@ diff -NurpP --minimal linux-3.4.11/arch/alpha/kernel/traps.c linux-3.4.11-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.11/arch/arm/Kconfig linux-3.4.11-vs2.3.3.8/arch/arm/Kconfig ---- linux-3.4.11/arch/arm/Kconfig 2012-09-16 20:46:09.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/arch/arm/Kconfig 2012-09-16 20:49:11.000000000 +0200 -@@ -2300,6 +2300,8 @@ source "fs/Kconfig" +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" @@ -263,9 +263,9 @@ diff -NurpP --minimal linux-3.4.11/arch/arm/Kconfig linux-3.4.11-vs2.3.3.8/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.11/arch/arm/kernel/calls.S linux-3.4.11-vs2.3.3.8/arch/arm/kernel/calls.S ---- linux-3.4.11/arch/arm/kernel/calls.S 2012-01-09 16:13:54.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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) @@ -275,9 +275,9 @@ diff -NurpP --minimal linux-3.4.11/arch/arm/kernel/calls.S linux-3.4.11-vs2.3.3. CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-3.4.11/arch/arm/kernel/process.c linux-3.4.11-vs2.3.3.8/arch/arm/kernel/process.c ---- linux-3.4.11/arch/arm/kernel/process.c 2012-09-16 20:46:09.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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) { @@ -288,9 +288,9 @@ diff -NurpP --minimal linux-3.4.11/arch/arm/kernel/process.c linux-3.4.11-vs2.3. __show_regs(regs); dump_stack(); } -diff -NurpP --minimal linux-3.4.11/arch/arm/kernel/traps.c linux-3.4.11-vs2.3.3.8/arch/arm/kernel/traps.c ---- linux-3.4.11/arch/arm/kernel/traps.c 2012-09-16 20:46:09.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/arch/arm/kernel/traps.c 2012-09-01 10:50:48.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(); @@ -302,9 +302,9 @@ diff -NurpP --minimal linux-3.4.11/arch/arm/kernel/traps.c linux-3.4.11-vs2.3.3. if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-3.4.11/arch/cris/Kconfig linux-3.4.11-vs2.3.3.8/arch/cris/Kconfig ---- linux-3.4.11/arch/cris/Kconfig 2012-03-19 19:46:39.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -314,9 +314,9 @@ diff -NurpP --minimal linux-3.4.11/arch/cris/Kconfig linux-3.4.11-vs2.3.3.8/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.11/arch/frv/kernel/kernel_thread.S linux-3.4.11-vs2.3.3.8/arch/frv/kernel/kernel_thread.S ---- linux-3.4.11/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -326,9 +326,9 @@ diff -NurpP --minimal linux-3.4.11/arch/frv/kernel/kernel_thread.S linux-3.4.11- 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.11/arch/h8300/Kconfig linux-3.4.11-vs2.3.3.8/arch/h8300/Kconfig ---- linux-3.4.11/arch/h8300/Kconfig 2012-03-19 19:46:39.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -338,9 +338,9 @@ diff -NurpP --minimal linux-3.4.11/arch/h8300/Kconfig linux-3.4.11-vs2.3.3.8/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.11/arch/ia64/Kconfig linux-3.4.11-vs2.3.3.8/arch/ia64/Kconfig ---- linux-3.4.11/arch/ia64/Kconfig 2012-03-19 19:46:39.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -350,9 +350,9 @@ diff -NurpP --minimal linux-3.4.11/arch/ia64/Kconfig linux-3.4.11-vs2.3.3.8/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.11/arch/ia64/kernel/entry.S linux-3.4.11-vs2.3.3.8/arch/ia64/kernel/entry.S ---- linux-3.4.11/arch/ia64/kernel/entry.S 2012-03-19 19:46:40.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -362,10 +362,10 @@ diff -NurpP --minimal linux-3.4.11/arch/ia64/kernel/entry.S linux-3.4.11-vs2.3.3 data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-3.4.11/arch/ia64/kernel/process.c linux-3.4.11-vs2.3.3.8/arch/ia64/kernel/process.c ---- linux-3.4.11/arch/ia64/kernel/process.c 2012-05-21 18:06:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/arch/ia64/kernel/process.c 2012-05-21 18:15:04.000000000 +0200 -@@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs) +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; print_modules(); @@ -376,9 +376,9 @@ diff -NurpP --minimal linux-3.4.11/arch/ia64/kernel/process.c linux-3.4.11-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.11/arch/ia64/kernel/ptrace.c linux-3.4.11-vs2.3.3.8/arch/ia64/kernel/ptrace.c ---- linux-3.4.11/arch/ia64/kernel/ptrace.c 2012-05-21 18:06:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/regset.h> #include <linux/elf.h> @@ -387,9 +387,9 @@ diff -NurpP --minimal linux-3.4.11/arch/ia64/kernel/ptrace.c linux-3.4.11-vs2.3. #include <asm/pgtable.h> #include <asm/processor.h> -diff -NurpP --minimal linux-3.4.11/arch/ia64/kernel/traps.c linux-3.4.11-vs2.3.3.8/arch/ia64/kernel/traps.c ---- linux-3.4.11/arch/ia64/kernel/traps.c 2012-05-21 18:06:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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(); @@ -414,9 +414,9 @@ diff -NurpP --minimal linux-3.4.11/arch/ia64/kernel/traps.c linux-3.4.11-vs2.3.3 } } } -diff -NurpP --minimal linux-3.4.11/arch/m32r/kernel/traps.c linux-3.4.11-vs2.3.3.8/arch/m32r/kernel/traps.c ---- linux-3.4.11/arch/m32r/kernel/traps.c 2012-05-21 18:06:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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); @@ -429,9 +429,9 @@ diff -NurpP --minimal linux-3.4.11/arch/m32r/kernel/traps.c linux-3.4.11-vs2.3.3 /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-3.4.11/arch/m68k/Kconfig linux-3.4.11-vs2.3.3.8/arch/m68k/Kconfig ---- linux-3.4.11/arch/m68k/Kconfig 2012-05-21 18:06:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -441,9 +441,9 @@ diff -NurpP --minimal linux-3.4.11/arch/m68k/Kconfig linux-3.4.11-vs2.3.3.8/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.11/arch/mips/Kconfig linux-3.4.11-vs2.3.3.8/arch/mips/Kconfig ---- linux-3.4.11/arch/mips/Kconfig 2012-05-21 18:06:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -453,9 +453,9 @@ diff -NurpP --minimal linux-3.4.11/arch/mips/Kconfig linux-3.4.11-vs2.3.3.8/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/ptrace.c linux-3.4.11-vs2.3.3.8/arch/mips/kernel/ptrace.c ---- linux-3.4.11/arch/mips/kernel/ptrace.c 2012-05-21 18:06:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/security.h> #include <linux/audit.h> @@ -474,9 +474,9 @@ diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/ptrace.c linux-3.4.11-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.11/arch/mips/kernel/scall32-o32.S linux-3.4.11-vs2.3.3.8/arch/mips/kernel/scall32-o32.S ---- linux-3.4.11/arch/mips/kernel/scall32-o32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -486,9 +486,9 @@ diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/scall32-o32.S linux-3.4.11-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.11/arch/mips/kernel/scall64-64.S linux-3.4.11-vs2.3.3.8/arch/mips/kernel/scall64-64.S ---- linux-3.4.11/arch/mips/kernel/scall64-64.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -498,9 +498,9 @@ diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/scall64-64.S linux-3.4.11-vs PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/scall64-n32.S linux-3.4.11-vs2.3.3.8/arch/mips/kernel/scall64-n32.S ---- linux-3.4.11/arch/mips/kernel/scall64-n32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -510,9 +510,9 @@ diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/scall64-n32.S linux-3.4.11-v PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/scall64-o32.S linux-3.4.11-vs2.3.3.8/arch/mips/kernel/scall64-o32.S ---- linux-3.4.11/arch/mips/kernel/scall64-o32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -522,9 +522,9 @@ diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/scall64-o32.S linux-3.4.11-v PTR sys_32_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/traps.c linux-3.4.11-vs2.3.3.8/arch/mips/kernel/traps.c ---- linux-3.4.11/arch/mips/kernel/traps.c 2012-05-21 18:06:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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); @@ -539,9 +539,9 @@ diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/traps.c linux-3.4.11-vs2.3.3 if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-3.4.11/arch/parisc/Kconfig linux-3.4.11-vs2.3.3.8/arch/parisc/Kconfig ---- linux-3.4.11/arch/parisc/Kconfig 2012-03-19 19:46:44.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -551,9 +551,9 @@ diff -NurpP --minimal linux-3.4.11/arch/parisc/Kconfig linux-3.4.11-vs2.3.3.8/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.11/arch/parisc/kernel/syscall_table.S linux-3.4.11-vs2.3.3.8/arch/parisc/kernel/syscall_table.S ---- linux-3.4.11/arch/parisc/kernel/syscall_table.S 2011-10-24 18:45:00.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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) @@ -563,9 +563,9 @@ diff -NurpP --minimal linux-3.4.11/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.11/arch/parisc/kernel/traps.c linux-3.4.11-vs2.3.3.8/arch/parisc/kernel/traps.c ---- linux-3.4.11/arch/parisc/kernel/traps.c 2012-05-21 18:06:28.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -589,9 +589,9 @@ diff -NurpP --minimal linux-3.4.11/arch/parisc/kernel/traps.c linux-3.4.11-vs2.3 /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-3.4.11/arch/parisc/mm/fault.c linux-3.4.11-vs2.3.3.8/arch/parisc/mm/fault.c ---- linux-3.4.11/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -604,9 +604,9 @@ diff -NurpP --minimal linux-3.4.11/arch/parisc/mm/fault.c linux-3.4.11-vs2.3.3.8 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.11/arch/powerpc/Kconfig linux-3.4.11-vs2.3.3.8/arch/powerpc/Kconfig ---- linux-3.4.11/arch/powerpc/Kconfig 2012-05-21 18:06:28.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -616,9 +616,9 @@ diff -NurpP --minimal linux-3.4.11/arch/powerpc/Kconfig linux-3.4.11-vs2.3.3.8/a source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-3.4.11/arch/powerpc/include/asm/unistd.h linux-3.4.11-vs2.3.3.8/arch/powerpc/include/asm/unistd.h ---- linux-3.4.11/arch/powerpc/include/asm/unistd.h 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -628,9 +628,9 @@ diff -NurpP --minimal linux-3.4.11/arch/powerpc/include/asm/unistd.h linux-3.4.1 #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-3.4.11/arch/powerpc/kernel/process.c linux-3.4.11-vs2.3.3.8/arch/powerpc/kernel/process.c ---- linux-3.4.11/arch/powerpc/kernel/process.c 2012-09-16 20:46:10.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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); @@ -643,9 +643,9 @@ diff -NurpP --minimal linux-3.4.11/arch/powerpc/kernel/process.c linux-3.4.11-vs #ifdef CONFIG_SMP printk(" CPU: %d", raw_smp_processor_id()); -diff -NurpP --minimal linux-3.4.11/arch/powerpc/kernel/traps.c linux-3.4.11-vs2.3.3.8/arch/powerpc/kernel/traps.c ---- linux-3.4.11/arch/powerpc/kernel/traps.c 2012-09-16 20:46:10.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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) @@ -658,9 +658,9 @@ diff -NurpP --minimal linux-3.4.11/arch/powerpc/kernel/traps.c linux-3.4.11-vs2. regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-3.4.11/arch/s390/Kconfig linux-3.4.11-vs2.3.3.8/arch/s390/Kconfig ---- linux-3.4.11/arch/s390/Kconfig 2012-05-21 18:06:32.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -670,9 +670,9 @@ diff -NurpP --minimal linux-3.4.11/arch/s390/Kconfig linux-3.4.11-vs2.3.3.8/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.11/arch/s390/include/asm/tlb.h linux-3.4.11-vs2.3.3.8/arch/s390/include/asm/tlb.h ---- linux-3.4.11/arch/s390/include/asm/tlb.h 2012-05-21 18:06:32.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/mm.h> #include <linux/pagemap.h> @@ -681,9 +681,9 @@ diff -NurpP --minimal linux-3.4.11/arch/s390/include/asm/tlb.h linux-3.4.11-vs2. #include <asm/processor.h> #include <asm/pgalloc.h> #include <asm/tlbflush.h> -diff -NurpP --minimal linux-3.4.11/arch/s390/include/asm/unistd.h linux-3.4.11-vs2.3.3.8/arch/s390/include/asm/unistd.h ---- linux-3.4.11/arch/s390/include/asm/unistd.h 2012-03-19 19:46:48.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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) @@ -693,9 +693,9 @@ diff -NurpP --minimal linux-3.4.11/arch/s390/include/asm/unistd.h linux-3.4.11-v #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-3.4.11/arch/s390/kernel/ptrace.c linux-3.4.11-vs2.3.3.8/arch/s390/kernel/ptrace.c ---- linux-3.4.11/arch/s390/kernel/ptrace.c 2012-05-21 18:06:32.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/tracehook.h> #include <linux/seccomp.h> @@ -704,9 +704,9 @@ diff -NurpP --minimal linux-3.4.11/arch/s390/kernel/ptrace.c linux-3.4.11-vs2.3. #include <trace/syscall.h> #include <asm/segment.h> #include <asm/page.h> -diff -NurpP --minimal linux-3.4.11/arch/s390/kernel/syscalls.S linux-3.4.11-vs2.3.3.8/arch/s390/kernel/syscalls.S ---- linux-3.4.11/arch/s390/kernel/syscalls.S 2012-01-09 16:14:06.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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) @@ -716,9 +716,9 @@ diff -NurpP --minimal linux-3.4.11/arch/s390/kernel/syscalls.S linux-3.4.11-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.11/arch/sh/Kconfig linux-3.4.11-vs2.3.3.8/arch/sh/Kconfig ---- linux-3.4.11/arch/sh/Kconfig 2012-05-21 18:06:33.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -728,9 +728,9 @@ diff -NurpP --minimal linux-3.4.11/arch/sh/Kconfig linux-3.4.11-vs2.3.3.8/arch/s source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.11/arch/sh/kernel/irq.c linux-3.4.11-vs2.3.3.8/arch/sh/kernel/irq.c ---- linux-3.4.11/arch/sh/kernel/irq.c 2011-07-22 11:17:41.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/ftrace.h> #include <linux/delay.h> @@ -739,9 +739,9 @@ diff -NurpP --minimal linux-3.4.11/arch/sh/kernel/irq.c linux-3.4.11-vs2.3.3.8/a #include <asm/processor.h> #include <asm/machvec.h> #include <asm/uaccess.h> -diff -NurpP --minimal linux-3.4.11/arch/sparc/Kconfig linux-3.4.11-vs2.3.3.8/arch/sparc/Kconfig ---- linux-3.4.11/arch/sparc/Kconfig 2012-09-16 20:46:10.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -751,9 +751,9 @@ diff -NurpP --minimal linux-3.4.11/arch/sparc/Kconfig linux-3.4.11-vs2.3.3.8/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.11/arch/sparc/include/asm/unistd.h linux-3.4.11-vs2.3.3.8/arch/sparc/include/asm/unistd.h ---- linux-3.4.11/arch/sparc/include/asm/unistd.h 2012-01-09 16:14:07.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -763,9 +763,9 @@ diff -NurpP --minimal linux-3.4.11/arch/sparc/include/asm/unistd.h linux-3.4.11- #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-3.4.11/arch/sparc/kernel/systbls_32.S linux-3.4.11-vs2.3.3.8/arch/sparc/kernel/systbls_32.S ---- linux-3.4.11/arch/sparc/kernel/systbls_32.S 2012-01-09 16:14:09.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -775,9 +775,9 @@ diff -NurpP --minimal linux-3.4.11/arch/sparc/kernel/systbls_32.S linux-3.4.11-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.11/arch/sparc/kernel/systbls_64.S linux-3.4.11-vs2.3.3.8/arch/sparc/kernel/systbls_64.S ---- linux-3.4.11/arch/sparc/kernel/systbls_64.S 2012-09-16 20:46:10.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -796,9 +796,9 @@ diff -NurpP --minimal linux-3.4.11/arch/sparc/kernel/systbls_64.S linux-3.4.11-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.11/arch/um/Kconfig.rest linux-3.4.11-vs2.3.3.8/arch/um/Kconfig.rest ---- linux-3.4.11/arch/um/Kconfig.rest 2012-01-09 16:14:09.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -808,14 +808,14 @@ diff -NurpP --minimal linux-3.4.11/arch/um/Kconfig.rest linux-3.4.11-vs2.3.3.8/a source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.11/arch/um/include/shared/kern_constants.h linux-3.4.11-vs2.3.3.8/arch/um/include/shared/kern_constants.h ---- linux-3.4.11/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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.11/arch/um/include/shared/user_constants.h linux-3.4.11-vs2.3.3.8/arch/um/include/shared/user_constants.h ---- linux-3.4.11/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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. @@ -857,9 +857,9 @@ diff -NurpP --minimal linux-3.4.11/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.11/arch/x86/Kconfig linux-3.4.11-vs2.3.3.8/arch/x86/Kconfig ---- linux-3.4.11/arch/x86/Kconfig 2012-05-21 18:06:35.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -869,9 +869,9 @@ diff -NurpP --minimal linux-3.4.11/arch/x86/Kconfig linux-3.4.11-vs2.3.3.8/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.11/arch/x86/syscalls/syscall_32.tbl linux-3.4.11-vs2.3.3.8/arch/x86/syscalls/syscall_32.tbl ---- linux-3.4.11/arch/x86/syscalls/syscall_32.tbl 2012-05-21 18:06:42.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -881,9 +881,9 @@ diff -NurpP --minimal linux-3.4.11/arch/x86/syscalls/syscall_32.tbl linux-3.4.11 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.11/arch/x86/syscalls/syscall_64.tbl linux-3.4.11-vs2.3.3.8/arch/x86/syscalls/syscall_64.tbl ---- linux-3.4.11/arch/x86/syscalls/syscall_64.tbl 2012-09-16 20:46:10.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -893,9 +893,9 @@ diff -NurpP --minimal linux-3.4.11/arch/x86/syscalls/syscall_64.tbl linux-3.4.11 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.11/drivers/block/Kconfig linux-3.4.11-vs2.3.3.8/drivers/block/Kconfig ---- linux-3.4.11/drivers/block/Kconfig 2012-05-21 18:06:43.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -910,9 +910,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/block/Kconfig linux-3.4.11-vs2.3.3.8/ config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-3.4.11/drivers/block/Makefile linux-3.4.11-vs2.3.3.8/drivers/block/Makefile ---- linux-3.4.11/drivers/block/Makefile 2012-03-19 19:46:52.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -921,9 +921,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/block/Makefile linux-3.4.11-vs2.3.3.8 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-3.4.11/drivers/block/loop.c linux-3.4.11-vs2.3.3.8/drivers/block/loop.c ---- linux-3.4.11/drivers/block/loop.c 2012-05-21 18:06:43.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/sysfs.h> #include <linux/miscdevice.h> @@ -948,7 +948,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/block/loop.c linux-3.4.11-vs2.3.3.8/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 && @@ -957,7 +957,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/block/loop.c linux-3.4.11-vs2.3.3.8/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; @@ -979,9 +979,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/block/loop.c linux-3.4.11-vs2.3.3.8/d mutex_lock(&lo->lo_ctl_mutex); lo->lo_refcnt++; mutex_unlock(&lo->lo_ctl_mutex); -diff -NurpP --minimal linux-3.4.11/drivers/block/vroot.c linux-3.4.11-vs2.3.3.8/drivers/block/vroot.c ---- linux-3.4.11/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -1274,9 +1274,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/block/vroot.c linux-3.4.11-vs2.3.3.8/ + +#endif + -diff -NurpP --minimal linux-3.4.11/drivers/infiniband/Kconfig linux-3.4.11-vs2.3.3.8/drivers/infiniband/Kconfig ---- linux-3.4.11/drivers/infiniband/Kconfig 2012-03-19 19:46:54.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -1286,9 +1286,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/infiniband/Kconfig linux-3.4.11-vs2.3 default y source "drivers/infiniband/hw/mthca/Kconfig" -diff -NurpP --minimal linux-3.4.11/drivers/infiniband/core/addr.c linux-3.4.11-vs2.3.3.8/drivers/infiniband/core/addr.c ---- linux-3.4.11/drivers/infiniband/core/addr.c 2012-05-21 18:06:46.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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)) { @@ -1298,9 +1298,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/infiniband/core/addr.c linux-3.4.11-v if (ret) goto put; -diff -NurpP --minimal linux-3.4.11/drivers/md/dm-ioctl.c linux-3.4.11-vs2.3.3.8/drivers/md/dm-ioctl.c ---- linux-3.4.11/drivers/md/dm-ioctl.c 2012-05-21 18:06:49.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/dm-ioctl.h> #include <linux/hdreg.h> @@ -1347,7 +1347,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/md/dm-ioctl.c linux-3.4.11-vs2.3.3.8/ 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) { @@ -1357,7 +1357,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/md/dm-ioctl.c linux-3.4.11-vs2.3.3.8/ 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) { @@ -1366,7 +1366,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/md/dm-ioctl.c linux-3.4.11-vs2.3.3.8/ 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) { @@ -1386,9 +1386,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/md/dm-ioctl.c linux-3.4.11-vs2.3.3.8/ return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-3.4.11/drivers/md/dm.c linux-3.4.11-vs2.3.3.8/drivers/md/dm.c ---- linux-3.4.11/drivers/md/dm.c 2012-05-21 18:06:49.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/drivers/md/dm.c 2012-05-21 18:15:04.000000000 +0200 +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 <linux/idr.h> #include <linux/hdreg.h> @@ -1405,7 +1405,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/md/dm.c linux-3.4.11-vs2.3.3.8/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; @@ -1454,7 +1454,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/md/dm.c linux-3.4.11-vs2.3.3.8/driver /*----------------------------------------------------------------- * CRUD START: * A more elegant soln is in the works that uses the queue -@@ -1850,6 +1862,7 @@ static struct mapped_device *alloc_dev(i +@@ -1876,6 +1888,7 @@ static struct mapped_device *alloc_dev(i INIT_LIST_HEAD(&md->uevent_list); spin_lock_init(&md->uevent_lock); @@ -1462,9 +1462,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/md/dm.c linux-3.4.11-vs2.3.3.8/driver md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad_queue; -diff -NurpP --minimal linux-3.4.11/drivers/md/dm.h linux-3.4.11-vs2.3.3.8/drivers/md/dm.h ---- linux-3.4.11/drivers/md/dm.h 2012-01-09 16:14:21.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -1474,9 +1474,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/md/dm.h linux-3.4.11-vs2.3.3.8/driver /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/drivers/net/tun.c ---- linux-3.4.11/drivers/net/tun.c 2012-09-16 20:46:12.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/nsproxy.h> #include <linux/virtio_net.h> @@ -1493,7 +1493,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/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; @@ -1501,7 +1501,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/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))) && @@ -1510,7 +1510,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/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; @@ -1519,7 +1519,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/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; @@ -1529,7 +1529,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/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; @@ -1546,9 +1546,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/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.11/drivers/tty/sysrq.c linux-3.4.11-vs2.3.3.8/drivers/tty/sysrq.c ---- linux-3.4.11/drivers/tty/sysrq.c 2012-05-21 18:07:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/slab.h> #include <linux/input.h> @@ -1600,9 +1600,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/tty/sysrq.c linux-3.4.11-vs2.3.3.8/dr else retval = -1; return retval; -diff -NurpP --minimal linux-3.4.11/drivers/tty/tty_io.c linux-3.4.11-vs2.3.3.8/drivers/tty/tty_io.c ---- linux-3.4.11/drivers/tty/tty_io.c 2012-05-21 18:07:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/kmod.h> @@ -1629,9 +1629,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/tty/tty_io.c linux-3.4.11-vs2.3.3.8/d if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-3.4.11/fs/attr.c linux-3.4.11-vs2.3.3.8/fs/attr.c ---- linux-3.4.11/fs/attr.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/fcntl.h> #include <linux/security.h> @@ -1672,9 +1672,9 @@ diff -NurpP --minimal linux-3.4.11/fs/attr.c linux-3.4.11-vs2.3.3.8/fs/attr.c if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-3.4.11/fs/block_dev.c linux-3.4.11-vs2.3.3.8/fs/block_dev.c ---- linux-3.4.11/fs/block_dev.c 2012-05-21 18:07:18.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/namei.h> #include <linux/log2.h> @@ -1712,9 +1712,9 @@ diff -NurpP --minimal linux-3.4.11/fs/block_dev.c linux-3.4.11-vs2.3.3.8/fs/bloc if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-3.4.11/fs/btrfs/ctree.h linux-3.4.11-vs2.3.3.8/fs/btrfs/ctree.h ---- linux-3.4.11/fs/btrfs/ctree.h 2012-05-21 18:07:18.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -1748,7 +1748,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/ctree.h linux-3.4.11-vs2.3.3.8/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); @@ -1767,9 +1767,9 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/ctree.h linux-3.4.11-vs2.3.3.8/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.11/fs/btrfs/disk-io.c linux-3.4.11-vs2.3.3.8/fs/btrfs/disk-io.c ---- linux-3.4.11/fs/btrfs/disk-io.c 2012-05-21 18:07:18.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; } @@ -1780,9 +1780,9 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/disk-io.c linux-3.4.11-vs2.3.3.8/fs/ features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-3.4.11/fs/btrfs/inode.c linux-3.4.11-vs2.3.3.8/fs/btrfs/inode.c ---- linux-3.4.11/fs/btrfs/inode.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/slab.h> #include <linux/ratelimit.h> @@ -1847,9 +1847,9 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/inode.c linux-3.4.11-vs2.3.3.8/fs/bt .get_acl = btrfs_get_acl, }; -diff -NurpP --minimal linux-3.4.11/fs/btrfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/btrfs/ioctl.c ---- linux-3.4.11/fs/btrfs/ioctl.c 2012-05-21 18:07:19.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -2022,9 +2022,9 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/bt if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-3.4.11/fs/btrfs/super.c linux-3.4.11-vs2.3.3.8/fs/btrfs/super.c ---- linux-3.4.11/fs/btrfs/super.c 2012-05-21 18:07:19.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -2080,9 +2080,9 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/super.c linux-3.4.11-vs2.3.3.8/fs/bt if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) return 0; -diff -NurpP --minimal linux-3.4.11/fs/char_dev.c linux-3.4.11-vs2.3.3.8/fs/char_dev.c ---- linux-3.4.11/fs/char_dev.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/mutex.h> #include <linux/backing-dev.h> @@ -2115,9 +2115,9 @@ diff -NurpP --minimal linux-3.4.11/fs/char_dev.c linux-3.4.11-vs2.3.3.8/fs/char_ if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-3.4.11/fs/dcache.c linux-3.4.11-vs2.3.3.8/fs/dcache.c ---- linux-3.4.11/fs/dcache.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/fs/dcache.c 2012-05-21 18:15:04.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 <linux/rculist_bl.h> #include <linux/prefetch.h> @@ -2143,7 +2143,7 @@ diff -NurpP --minimal linux-3.4.11/fs/dcache.c linux-3.4.11-vs2.3.3.8/fs/dcache. } static inline void __dget(struct dentry *dentry) -@@ -1254,6 +1258,9 @@ struct dentry *__d_alloc(struct super_bl +@@ -1258,6 +1262,9 @@ struct dentry *__d_alloc(struct super_bl struct dentry *dentry; char *dname; @@ -2153,7 +2153,7 @@ diff -NurpP --minimal linux-3.4.11/fs/dcache.c linux-3.4.11-vs2.3.3.8/fs/dcache. dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL); if (!dentry) return NULL; -@@ -1276,6 +1283,7 @@ struct dentry *__d_alloc(struct super_bl +@@ -1280,6 +1287,7 @@ struct dentry *__d_alloc(struct super_bl dentry->d_count = 1; dentry->d_flags = 0; @@ -2161,7 +2161,7 @@ diff -NurpP --minimal linux-3.4.11/fs/dcache.c linux-3.4.11-vs2.3.3.8/fs/dcache. spin_lock_init(&dentry->d_lock); seqcount_init(&dentry->d_seq); dentry->d_inode = NULL; -@@ -1937,6 +1945,7 @@ struct dentry *__d_lookup(struct dentry +@@ -1941,6 +1949,7 @@ struct dentry *__d_lookup(struct dentry } dentry->d_count++; @@ -2169,9 +2169,9 @@ diff -NurpP --minimal linux-3.4.11/fs/dcache.c linux-3.4.11-vs2.3.3.8/fs/dcache. found = dentry; spin_unlock(&dentry->d_lock); break; -diff -NurpP --minimal linux-3.4.11/fs/devpts/inode.c linux-3.4.11-vs2.3.3.8/fs/devpts/inode.c ---- linux-3.4.11/fs/devpts/inode.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/parser.h> #include <linux/fsnotify.h> @@ -2259,10 +2259,10 @@ diff -NurpP --minimal linux-3.4.11/fs/devpts/inode.c linux-3.4.11-vs2.3.3.8/fs/d inode->i_private = tty; tty->driver_data = inode; -diff -NurpP --minimal linux-3.4.11/fs/ext2/balloc.c linux-3.4.11-vs2.3.3.8/fs/ext2/balloc.c ---- linux-3.4.11/fs/ext2/balloc.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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); } @@ -2270,9 +2270,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/balloc.c linux-3.4.11-vs2.3.3.8/fs/ex BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-3.4.11/fs/ext2/ext2.h linux-3.4.11-vs2.3.3.8/fs/ext2/ext2.h ---- linux-3.4.11/fs/ext2/ext2.h 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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) */ @@ -2312,7 +2312,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/ext2.h linux-3.4.11-vs2.3.3.8/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); @@ -2320,18 +2320,18 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/ext2.h linux-3.4.11-vs2.3.3.8/fs/ext2 /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.4.11/fs/ext2/file.c linux-3.4.11-vs2.3.3.8/fs/ext2/file.c ---- linux-3.4.11/fs/ext2/file.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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.11/fs/ext2/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ext2/ialloc.c ---- linux-3.4.11/fs/ext2/ialloc.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/backing-dev.h> #include <linux/buffer_head.h> @@ -2348,9 +2348,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ex } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.4.11/fs/ext2/inode.c linux-3.4.11-vs2.3.3.8/fs/ext2/inode.c ---- linux-3.4.11/fs/ext2/inode.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/mpage.h> #include <linux/fiemap.h> @@ -2359,7 +2359,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/inode.c linux-3.4.11-vs2.3.3.8/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; @@ -2488,7 +2488,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/inode.c linux-3.4.11-vs2.3.3.8/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) || @@ -2498,9 +2498,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/inode.c linux-3.4.11-vs2.3.3.8/fs/ext error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-3.4.11/fs/ext2/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ext2/ioctl.c ---- linux-3.4.11/fs/ext2/ioctl.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <asm/uaccess.h> @@ -2550,9 +2550,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ext flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.4.11/fs/ext2/namei.c linux-3.4.11-vs2.3.3.8/fs/ext2/namei.c ---- linux-3.4.11/fs/ext2/namei.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/pagemap.h> @@ -2577,9 +2577,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/namei.c linux-3.4.11-vs2.3.3.8/fs/ext .get_acl = ext2_get_acl, }; -diff -NurpP --minimal linux-3.4.11/fs/ext2/super.c linux-3.4.11-vs2.3.3.8/fs/ext2/super.c ---- linux-3.4.11/fs/ext2/super.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -2600,7 +2600,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/super.c linux-3.4.11-vs2.3.3.8/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; @@ -2630,10 +2630,11 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/super.c linux-3.4.11-vs2.3.3.8/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", @@ -2641,13 +2642,12 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/super.c linux-3.4.11-vs2.3.3.8/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.11/fs/ext3/ext3.h linux-3.4.11-vs2.3.3.8/fs/ext3/ext3.h ---- linux-3.4.11/fs/ext3/ext3.h 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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) */ @@ -2691,7 +2691,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/ext3.h linux-3.4.11-vs2.3.3.8/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); @@ -2699,9 +2699,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/ext3.h linux-3.4.11-vs2.3.3.8/fs/ext3 /* ioctl.c */ extern long ext3_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.4.11/fs/ext3/file.c linux-3.4.11-vs2.3.3.8/fs/ext3/file.c ---- linux-3.4.11/fs/ext3/file.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -2709,9 +2709,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/file.c linux-3.4.11-vs2.3.3.8/fs/ext3 + .sync_flags = ext3_sync_flags, }; -diff -NurpP --minimal linux-3.4.11/fs/ext3/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ext3/ialloc.c ---- linux-3.4.11/fs/ext3/ialloc.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/quotaops.h> @@ -2728,9 +2728,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ex } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.4.11/fs/ext3/inode.c linux-3.4.11-vs2.3.3.8/fs/ext3/inode.c ---- linux-3.4.11/fs/ext3/inode.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/writeback.h> #include <linux/mpage.h> @@ -2886,7 +2886,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/inode.c linux-3.4.11-vs2.3.3.8/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) || @@ -2896,7 +2896,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/inode.c linux-3.4.11-vs2.3.3.8/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; @@ -2905,9 +2905,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/inode.c linux-3.4.11-vs2.3.3.8/fs/ext error = ext3_mark_inode_dirty(handle, inode); ext3_journal_stop(handle); } -diff -NurpP --minimal linux-3.4.11/fs/ext3/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ext3/ioctl.c ---- linux-3.4.11/fs/ext3/ioctl.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <asm/uaccess.h> #include "ext3.h" @@ -2975,9 +2975,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ext flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.4.11/fs/ext3/namei.c linux-3.4.11-vs2.3.3.8/fs/ext3/namei.c ---- linux-3.4.11/fs/ext3/namei.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ */ @@ -3003,9 +3003,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/namei.c linux-3.4.11-vs2.3.3.8/fs/ext .get_acl = ext3_get_acl, }; -diff -NurpP --minimal linux-3.4.11/fs/ext3/super.c linux-3.4.11-vs2.3.3.8/fs/ext3/super.c ---- linux-3.4.11/fs/ext3/super.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -3072,9 +3072,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/super.c linux-3.4.11-vs2.3.3.8/fs/ext sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.4.11/fs/ext4/ext4.h linux-3.4.11-vs2.3.3.8/fs/ext4/ext4.h ---- linux-3.4.11/fs/ext4/ext4.h 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -3122,9 +3122,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/ext4.h linux-3.4.11-vs2.3.3.8/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.11/fs/ext4/file.c linux-3.4.11-vs2.3.3.8/fs/ext4/file.c ---- linux-3.4.11/fs/ext4/file.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -3132,9 +3132,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/file.c linux-3.4.11-vs2.3.3.8/fs/ext4 + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-3.4.11/fs/ext4/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ext4/ialloc.c ---- linux-3.4.11/fs/ext4/ialloc.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/fs/ext4/ialloc.c 2012-09-01 10:50:49.000000000 +0200 +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 <linux/random.h> #include <linux/bitops.h> @@ -3143,7 +3143,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ex #include <asm/byteorder.h> #include "ext4.h" -@@ -816,6 +817,7 @@ got: +@@ -815,6 +816,7 @@ got: inode->i_mode = mode; inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; @@ -3151,9 +3151,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ex } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.4.11/fs/ext4/inode.c linux-3.4.11-vs2.3.3.8/fs/ext4/inode.c ---- linux-3.4.11/fs/ext4/inode.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/fs/ext4/inode.c 2012-09-01 10:50:49.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 <linux/printk.h> #include <linux/slab.h> @@ -3162,7 +3162,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/inode.c linux-3.4.11-vs2.3.3.8/fs/ext #include "ext4_jbd2.h" #include "xattr.h" -@@ -3579,41 +3580,64 @@ void ext4_set_inode_flags(struct inode * +@@ -3582,41 +3583,64 @@ void ext4_set_inode_flags(struct inode * { unsigned int flags = EXT4_I(inode)->i_flags; @@ -3234,7 +3234,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/inode.c linux-3.4.11-vs2.3.3.8/fs/ext } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl); } -@@ -3649,6 +3673,8 @@ struct inode *ext4_iget(struct super_blo +@@ -3652,6 +3676,8 @@ struct inode *ext4_iget(struct super_blo journal_t *journal = EXT4_SB(sb)->s_journal; long ret; int block; @@ -3243,7 +3243,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/inode.c linux-3.4.11-vs2.3.3.8/fs/ext inode = iget_locked(sb, ino); if (!inode) -@@ -3664,12 +3690,16 @@ struct inode *ext4_iget(struct super_blo +@@ -3667,12 +3693,16 @@ struct inode *ext4_iget(struct super_blo goto bad_inode; raw_inode = ext4_raw_inode(&iloc); inode->i_mode = le16_to_cpu(raw_inode->i_mode); @@ -3264,16 +3264,16 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/inode.c linux-3.4.11-vs2.3.3.8/fs/ext set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */ -@@ -3888,6 +3918,8 @@ static int ext4_do_update_inode(handle_t +@@ -3891,6 +3921,8 @@ static int ext4_do_update_inode(handle_t struct ext4_inode *raw_inode = ext4_raw_inode(iloc); struct ext4_inode_info *ei = EXT4_I(inode); struct buffer_head *bh = iloc->bh; + uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag); + gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag); int err = 0, rc, block; + int need_datasync = 0; - /* For fields not not tracking in the in-memory inode, -@@ -3898,29 +3930,32 @@ static int ext4_do_update_inode(handle_t +@@ -3902,29 +3934,32 @@ static int ext4_do_update_inode(handle_t ext4_get_inode_flags(ei); raw_inode->i_mode = cpu_to_le16(inode->i_mode); if (!(test_opt(inode->i_sb, NO_UID32))) { @@ -3312,7 +3312,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/inode.c linux-3.4.11-vs2.3.3.8/fs/ext raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode); -@@ -4104,7 +4139,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) || @@ -3322,7 +3322,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/inode.c linux-3.4.11-vs2.3.3.8/fs/ext handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, -@@ -4126,6 +4162,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; @@ -3331,9 +3331,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/inode.c linux-3.4.11-vs2.3.3.8/fs/ext error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-3.4.11/fs/ext4/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ext4/ioctl.c ---- linux-3.4.11/fs/ext4/ioctl.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/compat.h> #include <linux/mount.h> @@ -3398,9 +3398,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ext if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-3.4.11/fs/ext4/namei.c linux-3.4.11-vs2.3.3.8/fs/ext4/namei.c ---- linux-3.4.11/fs/ext4/namei.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/fs/ext4/namei.c 2012-06-28 16:45:07.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 <linux/quotaops.h> #include <linux/buffer_head.h> @@ -3417,7 +3417,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/namei.c linux-3.4.11-vs2.3.3.8/fs/ext } if ((bh = bh_use[ra_ptr++]) == NULL) goto next; -@@ -2593,6 +2595,7 @@ const struct inode_operations ext4_dir_i +@@ -2591,6 +2593,7 @@ const struct inode_operations ext4_dir_i #endif .get_acl = ext4_get_acl, .fiemap = ext4_fiemap, @@ -3425,9 +3425,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/namei.c linux-3.4.11-vs2.3.3.8/fs/ext }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-3.4.11/fs/ext4/super.c linux-3.4.11-vs2.3.3.8/fs/ext4/super.c ---- linux-3.4.11/fs/ext4/super.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/fs/ext4/super.c 2012-09-01 10:50:49.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, @@ -3492,9 +3492,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/super.c linux-3.4.11-vs2.3.3.8/fs/ext sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.4.11/fs/fcntl.c linux-3.4.11-vs2.3.3.8/fs/fcntl.c ---- linux-3.4.11/fs/fcntl.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/signal.h> #include <linux/rcupdate.h> @@ -3521,9 +3521,9 @@ diff -NurpP --minimal linux-3.4.11/fs/fcntl.c linux-3.4.11-vs2.3.3.8/fs/fcntl.c if (unlikely(filp->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) { -diff -NurpP --minimal linux-3.4.11/fs/file.c linux-3.4.11-vs2.3.3.8/fs/file.c ---- linux-3.4.11/fs/file.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/spinlock.h> #include <linux/rcupdate.h> @@ -3549,9 +3549,9 @@ diff -NurpP --minimal linux-3.4.11/fs/file.c linux-3.4.11-vs2.3.3.8/fs/file.c #if 1 /* Sanity check */ if (rcu_dereference_raw(fdt->fd[fd]) != NULL) { -diff -NurpP --minimal linux-3.4.11/fs/file_table.c linux-3.4.11-vs2.3.3.8/fs/file_table.c ---- linux-3.4.11/fs/file_table.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/percpu_counter.h> #include <linux/percpu.h> @@ -3588,9 +3588,9 @@ diff -NurpP --minimal linux-3.4.11/fs/file_table.c linux-3.4.11-vs2.3.3.8/fs/fil file_sb_list_del(file); file_free(file); } -diff -NurpP --minimal linux-3.4.11/fs/fs_struct.c linux-3.4.11-vs2.3.3.8/fs/fs_struct.c ---- linux-3.4.11/fs/fs_struct.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/path.h> #include <linux/slab.h> @@ -3607,7 +3607,7 @@ diff -NurpP --minimal linux-3.4.11/fs/fs_struct.c linux-3.4.11-vs2.3.3.8/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); @@ -3615,9 +3615,9 @@ diff -NurpP --minimal linux-3.4.11/fs/fs_struct.c linux-3.4.11-vs2.3.3.8/fs/fs_s } return fs; } -diff -NurpP --minimal linux-3.4.11/fs/gfs2/file.c linux-3.4.11-vs2.3.3.8/fs/gfs2/file.c ---- linux-3.4.11/fs/gfs2/file.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -3740,9 +3740,9 @@ diff -NurpP --minimal linux-3.4.11/fs/gfs2/file.c linux-3.4.11-vs2.3.3.8/fs/gfs2 static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-3.4.11/fs/gfs2/inode.h linux-3.4.11-vs2.3.3.8/fs/gfs2/inode.h ---- linux-3.4.11/fs/gfs2/inode.h 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -3751,9 +3751,9 @@ diff -NurpP --minimal linux-3.4.11/fs/gfs2/inode.h linux-3.4.11-vs2.3.3.8/fs/gfs #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-3.4.11/fs/inode.c linux-3.4.11-vs2.3.3.8/fs/inode.c ---- linux-3.4.11/fs/inode.c 2012-05-21 18:07:24.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/prefetch.h> #include <linux/buffer_head.h> /* for inode_has_buffers */ @@ -3809,9 +3809,9 @@ diff -NurpP --minimal linux-3.4.11/fs/inode.c linux-3.4.11-vs2.3.3.8/fs/inode.c } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-3.4.11/fs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ioctl.c ---- linux-3.4.11/fs/ioctl.c 2012-05-21 18:07:24.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/writeback.h> #include <linux/buffer_head.h> @@ -3822,9 +3822,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ioctl.c #include <asm/ioctls.h> -diff -NurpP --minimal linux-3.4.11/fs/ioprio.c linux-3.4.11-vs2.3.3.8/fs/ioprio.c ---- linux-3.4.11/fs/ioprio.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/syscalls.h> #include <linux/security.h> @@ -3833,7 +3833,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ioprio.c linux-3.4.11-vs2.3.3.8/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) { @@ -3842,7 +3842,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ioprio.c linux-3.4.11-vs2.3.3.8/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) { @@ -3851,9 +3851,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ioprio.c linux-3.4.11-vs2.3.3.8/fs/ioprio. tmpio = get_task_ioprio(p); if (tmpio < 0) continue; -diff -NurpP --minimal linux-3.4.11/fs/jfs/file.c linux-3.4.11-vs2.3.3.8/fs/jfs/file.c ---- linux-3.4.11/fs/jfs/file.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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); @@ -3872,9 +3872,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/file.c linux-3.4.11-vs2.3.3.8/fs/jfs/f }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-3.4.11/fs/jfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/jfs/ioctl.c ---- linux-3.4.11/fs/jfs/ioctl.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/mount.h> #include <linux/time.h> @@ -3932,9 +3932,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/jfs/ flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_dinode.h linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_dinode.h ---- linux-3.4.11/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -3951,9 +3951,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_dinode.h linux-3.4.11-vs2.3.3.8/fs #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_filsys.h linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_filsys.h ---- linux-3.4.11/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -3962,9 +3962,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_filsys.h linux-3.4.11-vs2.3.3.8/fs /* * file system state (superblock state) -diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_imap.c linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_imap.c ---- linux-3.4.11/fs/jfs/jfs_imap.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/pagemap.h> #include <linux/quotaops.h> @@ -4024,9 +4024,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_imap.c linux-3.4.11-vs2.3.3.8/fs/j jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_inode.c linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_inode.c ---- linux-3.4.11/fs/jfs/jfs_inode.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/fs.h> @@ -4100,9 +4100,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_inode.c linux-3.4.11-vs2.3.3.8/fs/ } /* -diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_inode.h linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_inode.h ---- linux-3.4.11/fs/jfs/jfs_inode.h 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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); @@ -4111,9 +4111,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_inode.h linux-3.4.11-vs2.3.3.8/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.11/fs/jfs/namei.c linux-3.4.11-vs2.3.3.8/fs/jfs/namei.c ---- linux-3.4.11/fs/jfs/namei.c 2012-05-21 18:07:25.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/ctype.h> #include <linux/quotaops.h> @@ -4122,7 +4122,7 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/namei.c linux-3.4.11-vs2.3.3.8/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); } @@ -4138,9 +4138,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/namei.c linux-3.4.11-vs2.3.3.8/fs/jfs/ }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-3.4.11/fs/jfs/super.c linux-3.4.11-vs2.3.3.8/fs/jfs/super.c ---- linux-3.4.11/fs/jfs/super.c 2012-05-21 18:07:25.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -4162,7 +4162,7 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/super.c linux-3.4.11-vs2.3.3.8/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; } @@ -4206,9 +4206,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/super.c linux-3.4.11-vs2.3.3.8/fs/jfs/ if (newLVSize) { printk(KERN_ERR "resize option for remount only\n"); -diff -NurpP --minimal linux-3.4.11/fs/libfs.c linux-3.4.11-vs2.3.3.8/fs/libfs.c ---- linux-3.4.11/fs/libfs.c 2012-05-21 18:07:25.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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. */ @@ -4254,9 +4254,9 @@ diff -NurpP --minimal linux-3.4.11/fs/libfs.c linux-3.4.11-vs2.3.3.8/fs/libfs.c EXPORT_SYMBOL(generic_read_dir); EXPORT_SYMBOL(mount_pseudo); EXPORT_SYMBOL(simple_write_begin); -diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c ---- linux-3.4.11/fs/locks.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/time.h> #include <linux/rcupdate.h> @@ -4417,7 +4417,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/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; @@ -4454,9 +4454,9 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c return 0; } -diff -NurpP --minimal linux-3.4.11/fs/mount.h linux-3.4.11-vs2.3.3.8/fs/mount.h ---- linux-3.4.11/fs/mount.h 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -4465,9 +4465,9 @@ diff -NurpP --minimal linux-3.4.11/fs/mount.h linux-3.4.11-vs2.3.3.8/fs/mount.h }; static inline struct mount *real_mount(struct vfsmount *mnt) -diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c ---- linux-3.4.11/fs/namei.c 2012-05-21 18:07:25.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/device_cgroup.h> #include <linux/fs_struct.h> @@ -4727,7 +4727,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/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. */ @@ -4995,9 +4995,9 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c EXPORT_SYMBOL(dentry_unhash); EXPORT_SYMBOL(generic_readlink); +EXPORT_SYMBOL(vx_info_mnt_namespace); -diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/namespace.c ---- linux-3.4.11/fs/namespace.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/fs_struct.h> /* get_fs_root et.al. */ #include <linux/fsnotify.h> /* fsnotify_vfsmount_delete */ @@ -5184,9 +5184,9 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name kfree(ns); } -diff -NurpP --minimal linux-3.4.11/fs/nfs/client.c linux-3.4.11-vs2.3.3.8/fs/nfs/client.c ---- linux-3.4.11/fs/nfs/client.c 2012-05-21 18:07:25.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -5208,9 +5208,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/client.c linux-3.4.11-vs2.3.3.8/fs/nfs server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-3.4.11/fs/nfs/dir.c linux-3.4.11-vs2.3.3.8/fs/nfs/dir.c ---- linux-3.4.11/fs/nfs/dir.c 2012-05-21 18:07:25.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/fs/nfs/dir.c 2012-05-21 18:15:05.000000000 +0200 +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 <linux/sched.h> #include <linux/kmemleak.h> @@ -5219,7 +5219,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/dir.c linux-3.4.11-vs2.3.3.8/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; @@ -5227,9 +5227,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/dir.c linux-3.4.11-vs2.3.3.8/fs/nfs/di no_entry: res = d_materialise_unique(dentry, inode); if (res != NULL) { -diff -NurpP --minimal linux-3.4.11/fs/nfs/inode.c linux-3.4.11-vs2.3.3.8/fs/nfs/inode.c ---- linux-3.4.11/fs/nfs/inode.c 2012-05-21 18:07:25.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/fs/nfs/inode.c 2012-05-21 18:15:05.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 <linux/compat.h> #include <linux/freezer.h> @@ -5381,9 +5381,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/inode.c linux-3.4.11-vs2.3.3.8/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.11/fs/nfs/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nfs/nfs3xdr.c ---- linux-3.4.11/fs/nfs/nfs3xdr.c 2012-05-21 18:07:25.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/nfs3.h> #include <linux/nfs_fs.h> @@ -5529,9 +5529,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nf } /* -diff -NurpP --minimal linux-3.4.11/fs/nfs/super.c linux-3.4.11-vs2.3.3.8/fs/nfs/super.c ---- linux-3.4.11/fs/nfs/super.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/fs/nfs/super.c 2012-09-16 20:49:11.000000000 +0200 +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 <linux/parser.h> #include <linux/nsproxy.h> @@ -5575,7 +5575,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/super.c linux-3.4.11-vs2.3.3.8/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; @@ -5590,7 +5590,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/super.c linux-3.4.11-vs2.3.3.8/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; @@ -5603,9 +5603,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/super.c linux-3.4.11-vs2.3.3.8/fs/nfs/ /* * options that take text values -diff -NurpP --minimal linux-3.4.11/fs/nfsd/auth.c linux-3.4.11-vs2.3.3.8/fs/nfsd/auth.c ---- linux-3.4.11/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <okir@monad.swb.de> */ @@ -5624,9 +5624,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfsd/auth.c linux-3.4.11-vs2.3.3.8/fs/nfsd rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-3.4.11/fs/nfsd/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nfsd/nfs3xdr.c ---- linux-3.4.11/fs/nfsd/nfs3xdr.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ */ @@ -5677,9 +5677,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfsd/nfs3xdr.c linux-3.4.11-vs2.3.3.8/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.11/fs/nfsd/nfs4xdr.c linux-3.4.11-vs2.3.3.8/fs/nfsd/nfs4xdr.c ---- linux-3.4.11/fs/nfsd/nfs4xdr.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/utsname.h> #include <linux/pagemap.h> @@ -5709,9 +5709,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfsd/nfs4xdr.c linux-3.4.11-vs2.3.3.8/fs/n if (status == nfserr_resource) goto out_resource; if (status) -diff -NurpP --minimal linux-3.4.11/fs/nfsd/nfsxdr.c linux-3.4.11-vs2.3.3.8/fs/nfsd/nfsxdr.c ---- linux-3.4.11/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -5760,9 +5760,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfsd/nfsxdr.c linux-3.4.11-vs2.3.3.8/fs/nf if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-3.4.11/fs/ocfs2/dlmglue.c linux-3.4.11-vs2.3.3.8/fs/ocfs2/dlmglue.c ---- linux-3.4.11/fs/ocfs2/dlmglue.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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); @@ -5779,9 +5779,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/dlmglue.c linux-3.4.11-vs2.3.3.8/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.11/fs/ocfs2/dlmglue.h linux-3.4.11-vs2.3.3.8/fs/ocfs2/dlmglue.h ---- linux-3.4.11/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -5792,9 +5792,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/dlmglue.h linux-3.4.11-vs2.3.3.8/fs/ }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-3.4.11/fs/ocfs2/file.c linux-3.4.11-vs2.3.3.8/fs/ocfs2/file.c ---- linux-3.4.11/fs/ocfs2/file.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -5804,9 +5804,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/file.c linux-3.4.11-vs2.3.3.8/fs/ocf if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-3.4.11/fs/ocfs2/inode.c linux-3.4.11-vs2.3.3.8/fs/ocfs2/inode.c ---- linux-3.4.11/fs/ocfs2/inode.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/highmem.h> #include <linux/pagemap.h> @@ -5815,7 +5815,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/inode.c linux-3.4.11-vs2.3.3.8/fs/oc #include <asm/byteorder.h> -@@ -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; @@ -5830,7 +5830,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/inode.c linux-3.4.11-vs2.3.3.8/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; @@ -5903,9 +5903,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/inode.c linux-3.4.11-vs2.3.3.8/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.11/fs/ocfs2/inode.h linux-3.4.11-vs2.3.3.8/fs/ocfs2/inode.h ---- linux-3.4.11/fs/ocfs2/inode.h 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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); @@ -5914,9 +5914,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/inode.h linux-3.4.11-vs2.3.3.8/fs/oc static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-3.4.11/fs/ocfs2/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ocfs2/ioctl.c ---- linux-3.4.11/fs/ocfs2/ioctl.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; } @@ -5980,9 +5980,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/ioctl.c linux-3.4.11-vs2.3.3.8/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.11/fs/ocfs2/namei.c linux-3.4.11-vs2.3.3.8/fs/ocfs2/namei.c ---- linux-3.4.11/fs/ocfs2/namei.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/slab.h> #include <linux/highmem.h> @@ -6013,9 +6013,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/namei.c linux-3.4.11-vs2.3.3.8/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.11/fs/ocfs2/ocfs2.h linux-3.4.11-vs2.3.3.8/fs/ocfs2/ocfs2.h ---- linux-3.4.11/fs/ocfs2/ocfs2.h 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -6024,9 +6024,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/ocfs2.h linux-3.4.11-vs2.3.3.8/fs/oc }; #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-3.4.11/fs/ocfs2/ocfs2_fs.h linux-3.4.11-vs2.3.3.8/fs/ocfs2/ocfs2_fs.h ---- linux-3.4.11/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -6039,9 +6039,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/ocfs2_fs.h linux-3.4.11-vs2.3.3.8/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.11/fs/ocfs2/super.c linux-3.4.11-vs2.3.3.8/fs/ocfs2/super.c ---- linux-3.4.11/fs/ocfs2/super.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -6105,9 +6105,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/super.c linux-3.4.11-vs2.3.3.8/fs/oc default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-3.4.11/fs/open.c linux-3.4.11-vs2.3.3.8/fs/open.c ---- linux-3.4.11/fs/open.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/fs_struct.h> #include <linux/ima.h> @@ -6199,9 +6199,9 @@ diff -NurpP --minimal linux-3.4.11/fs/open.c linux-3.4.11-vs2.3.3.8/fs/open.c } void put_unused_fd(unsigned int fd) -diff -NurpP --minimal linux-3.4.11/fs/proc/array.c linux-3.4.11-vs2.3.3.8/fs/proc/array.c ---- linux-3.4.11/fs/proc/array.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/pid_namespace.h> #include <linux/ptrace.h> @@ -6289,7 +6289,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/array.c linux-3.4.11-vs2.3.3.8/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); @@ -6297,7 +6297,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/array.c linux-3.4.11-vs2.3.3.8/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); @@ -6315,9 +6315,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/array.c linux-3.4.11-vs2.3.3.8/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.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc/base.c ---- linux-3.4.11/fs/proc/base.c 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/fs_struct.h> #include <linux/slab.h> @@ -6479,9 +6479,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-3.4.11/fs/proc/generic.c linux-3.4.11-vs2.3.3.8/fs/proc/generic.c ---- linux-3.4.11/fs/proc/generic.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/bitops.h> #include <linux/spinlock.h> @@ -6541,9 +6541,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/generic.c linux-3.4.11-vs2.3.3.8/fs/p } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-3.4.11/fs/proc/inode.c linux-3.4.11-vs2.3.3.8/fs/proc/inode.c ---- linux-3.4.11/fs/proc/inode.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -6553,9 +6553,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/inode.c linux-3.4.11-vs2.3.3.8/fs/pro if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-3.4.11/fs/proc/internal.h linux-3.4.11-vs2.3.3.8/fs/proc/internal.h ---- linux-3.4.11/fs/proc/internal.h 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ */ @@ -6593,9 +6593,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/internal.h linux-3.4.11-vs2.3.3.8/fs/ static inline int proc_fd(struct inode *inode) { return PROC_I(inode)->fd; -diff -NurpP --minimal linux-3.4.11/fs/proc/loadavg.c linux-3.4.11-vs2.3.3.8/fs/proc/loadavg.c ---- linux-3.4.11/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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) @@ -6625,9 +6625,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/loadavg.c linux-3.4.11-vs2.3.3.8/fs/p task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-3.4.11/fs/proc/meminfo.c linux-3.4.11-vs2.3.3.8/fs/proc/meminfo.c ---- linux-3.4.11/fs/proc/meminfo.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -6638,9 +6638,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/meminfo.c linux-3.4.11-vs2.3.3.8/fs/p total_swapcache_pages - i.bufferram; if (cached < 0) cached = 0; -diff -NurpP --minimal linux-3.4.11/fs/proc/root.c linux-3.4.11-vs2.3.3.8/fs/proc/root.c ---- linux-3.4.11/fs/proc/root.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/mount.h> #include <linux/pid_namespace.h> @@ -6672,9 +6672,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/root.c linux-3.4.11-vs2.3.3.8/fs/proc .name = "/proc", }; -diff -NurpP --minimal linux-3.4.11/fs/proc/stat.c linux-3.4.11-vs2.3.3.8/fs/proc/stat.c ---- linux-3.4.11/fs/proc/stat.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/fs/proc/stat.c 2012-05-21 18:15:05.000000000 +0200 +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 <linux/slab.h> #include <linux/time.h> @@ -6683,7 +6683,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/stat.c linux-3.4.11-vs2.3.3.8/fs/proc #include <asm/cputime.h> #include <linux/tick.h> -@@ -86,6 +87,10 @@ static int show_stat(struct seq_file *p, +@@ -92,6 +93,10 @@ static int show_stat(struct seq_file *p, irq = softirq = steal = 0; guest = guest_nice = 0; getboottime(&boottime); @@ -6694,9 +6694,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/stat.c linux-3.4.11-vs2.3.3.8/fs/proc jif = boottime.tv_sec; for_each_possible_cpu(i) { -diff -NurpP --minimal linux-3.4.11/fs/proc/uptime.c linux-3.4.11-vs2.3.3.8/fs/proc/uptime.c ---- linux-3.4.11/fs/proc/uptime.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/seq_file.h> #include <linux/time.h> @@ -6716,10 +6716,10 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/uptime.c linux-3.4.11-vs2.3.3.8/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.11/fs/proc_namespace.c linux-3.4.11-vs2.3.3.8/fs/proc_namespace.c ---- linux-3.4.11/fs/proc_namespace.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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" }, @@ -6801,7 +6801,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc_namespace.c linux-3.4.11-vs2.3.3.8/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; @@ -6819,7 +6819,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc_namespace.c linux-3.4.11-vs2.3.3.8/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, ' '); @@ -6828,9 +6828,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc_namespace.c linux-3.4.11-vs2.3.3.8/fs /* file system type */ seq_puts(m, "with fstype "); show_type(m, sb); -diff -NurpP --minimal linux-3.4.11/fs/quota/dquot.c linux-3.4.11-vs2.3.3.8/fs/quota/dquot.c ---- linux-3.4.11/fs/quota/dquot.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -6869,9 +6869,9 @@ diff -NurpP --minimal linux-3.4.11/fs/quota/dquot.c linux-3.4.11-vs2.3.3.8/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.11/fs/quota/quota.c linux-3.4.11-vs2.3.3.8/fs/quota/quota.c ---- linux-3.4.11/fs/quota/quota.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/fs.h> #include <linux/namei.h> @@ -6959,9 +6959,9 @@ diff -NurpP --minimal linux-3.4.11/fs/quota/quota.c linux-3.4.11-vs2.3.3.8/fs/qu if (quotactl_cmd_write(cmd)) sb = get_super_thawed(bdev); else -diff -NurpP --minimal linux-3.4.11/fs/reiserfs/file.c linux-3.4.11-vs2.3.3.8/fs/reiserfs/file.c ---- linux-3.4.11/fs/reiserfs/file.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -6969,9 +6969,9 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/file.c linux-3.4.11-vs2.3.3.8/fs/ + .sync_flags = reiserfs_sync_flags, .get_acl = reiserfs_get_acl, }; -diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs/reiserfs/inode.c ---- linux-3.4.11/fs/reiserfs/inode.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/fs/reiserfs/inode.c 2012-05-21 18:15:05.000000000 +0200 +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 <linux/writeback.h> #include <linux/quotaops.h> @@ -7049,7 +7049,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs set_sd_v2_mtime(sd_v2, inode->i_mtime.tv_sec); set_sd_v2_atime(sd_v2, inode->i_atime.tv_sec); set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec); -@@ -2868,14 +2879,19 @@ int reiserfs_commit_write(struct file *f +@@ -2875,14 +2886,19 @@ int reiserfs_commit_write(struct file *f void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode) { if (reiserfs_attrs(inode->i_sb)) { @@ -7073,7 +7073,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs if (sd_attrs & REISERFS_APPEND_FL) inode->i_flags |= S_APPEND; else -@@ -2888,6 +2904,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs, +@@ -2895,6 +2911,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs, REISERFS_I(inode)->i_flags |= i_nopack_mask; else REISERFS_I(inode)->i_flags &= ~i_nopack_mask; @@ -7089,7 +7089,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs } } -@@ -2898,6 +2923,11 @@ void i_attrs_to_sd_attrs(struct inode *i +@@ -2905,6 +2930,11 @@ void i_attrs_to_sd_attrs(struct inode *i *sd_attrs |= REISERFS_IMMUTABLE_FL; else *sd_attrs &= ~REISERFS_IMMUTABLE_FL; @@ -7101,7 +7101,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs if (inode->i_flags & S_SYNC) *sd_attrs |= REISERFS_SYNC_FL; else -@@ -2910,6 +2940,15 @@ void i_attrs_to_sd_attrs(struct inode *i +@@ -2917,6 +2947,15 @@ void i_attrs_to_sd_attrs(struct inode *i *sd_attrs |= REISERFS_NOTAIL_FL; else *sd_attrs &= ~REISERFS_NOTAIL_FL; @@ -7117,7 +7117,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs } } -@@ -3155,7 +3194,8 @@ int reiserfs_setattr(struct dentry *dent +@@ -3161,7 +3200,8 @@ int reiserfs_setattr(struct dentry *dent } if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || @@ -7127,7 +7127,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs struct reiserfs_transaction_handle th; int jbegin_count = 2 * -@@ -3184,6 +3224,9 @@ int reiserfs_setattr(struct dentry *dent +@@ -3192,6 +3232,9 @@ int reiserfs_setattr(struct dentry *dent inode->i_uid = attr->ia_uid; if (attr->ia_valid & ATTR_GID) inode->i_gid = attr->ia_gid; @@ -7137,9 +7137,9 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs mark_inode_dirty(inode); error = journal_end(&th, inode->i_sb, jbegin_count); if (error) -diff -NurpP --minimal linux-3.4.11/fs/reiserfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/reiserfs/ioctl.c ---- linux-3.4.11/fs/reiserfs/ioctl.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/pagemap.h> #include <linux/compat.h> @@ -7201,9 +7201,9 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/ioctl.c linux-3.4.11-vs2.3.3.8/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.11/fs/reiserfs/namei.c linux-3.4.11-vs2.3.3.8/fs/reiserfs/namei.c ---- linux-3.4.11/fs/reiserfs/namei.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -7220,9 +7220,9 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/namei.c linux-3.4.11-vs2.3.3.8/fs return d_splice_alias(inode, dentry); } -diff -NurpP --minimal linux-3.4.11/fs/reiserfs/reiserfs.h linux-3.4.11-vs2.3.3.8/fs/reiserfs/reiserfs.h ---- linux-3.4.11/fs/reiserfs/reiserfs.h 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -7261,10 +7261,10 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/reiserfs.h linux-3.4.11-vs2.3.3.8 int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len); -diff -NurpP --minimal linux-3.4.11/fs/reiserfs/super.c linux-3.4.11-vs2.3.3.8/fs/reiserfs/super.c ---- linux-3.4.11/fs/reiserfs/super.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/fs/reiserfs/super.c 2012-05-21 18:15:05.000000000 +0200 -@@ -980,6 +980,14 @@ static int reiserfs_parse_options(struct +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}, #endif @@ -7279,7 +7279,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/super.c linux-3.4.11-vs2.3.3.8/fs #ifdef CONFIG_REISERFS_FS_POSIX_ACL {"acl",.setmask = 1 << REISERFS_POSIXACL}, {"noacl",.clrmask = 1 << REISERFS_POSIXACL}, -@@ -1298,6 +1306,14 @@ static int reiserfs_remount(struct super +@@ -1300,6 +1308,14 @@ static int reiserfs_remount(struct super handle_quota_files(s, qf_names, &qfmt); #endif @@ -7294,7 +7294,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/super.c linux-3.4.11-vs2.3.3.8/fs handle_attrs(s); /* Add options that are safe here */ -@@ -1777,6 +1793,10 @@ static int reiserfs_fill_super(struct su +@@ -1792,6 +1808,10 @@ static int reiserfs_fill_super(struct su goto error_unlocked; } @@ -7305,9 +7305,9 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/super.c linux-3.4.11-vs2.3.3.8/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.11/fs/reiserfs/xattr.c linux-3.4.11-vs2.3.3.8/fs/reiserfs/xattr.c ---- linux-3.4.11/fs/reiserfs/xattr.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/errno.h> #include <linux/gfp.h> @@ -7316,9 +7316,9 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/xattr.c linux-3.4.11-vs2.3.3.8/fs #include <linux/file.h> #include <linux/pagemap.h> #include <linux/xattr.h> -diff -NurpP --minimal linux-3.4.11/fs/stat.c linux-3.4.11-vs2.3.3.8/fs/stat.c ---- linux-3.4.11/fs/stat.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/fs/stat.c 2012-05-21 18:15:05.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; @@ -7327,9 +7327,9 @@ diff -NurpP --minimal linux-3.4.11/fs/stat.c linux-3.4.11-vs2.3.3.8/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.11/fs/statfs.c linux-3.4.11-vs2.3.3.8/fs/statfs.c ---- linux-3.4.11/fs/statfs.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/statfs.h> #include <linux/security.h> @@ -7348,9 +7348,9 @@ diff -NurpP --minimal linux-3.4.11/fs/statfs.c linux-3.4.11-vs2.3.3.8/fs/statfs. return retval; } -diff -NurpP --minimal linux-3.4.11/fs/super.c linux-3.4.11-vs2.3.3.8/fs/super.c ---- linux-3.4.11/fs/super.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/rculist_bl.h> #include <linux/cleancache.h> @@ -7360,7 +7360,7 @@ diff -NurpP --minimal linux-3.4.11/fs/super.c linux-3.4.11-vs2.3.3.8/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; @@ -7374,9 +7374,9 @@ diff -NurpP --minimal linux-3.4.11/fs/super.c linux-3.4.11-vs2.3.3.8/fs/super.c error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-3.4.11/fs/sysfs/mount.c linux-3.4.11-vs2.3.3.8/fs/sysfs/mount.c ---- linux-3.4.11/fs/sysfs/mount.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -7386,9 +7386,9 @@ diff -NurpP --minimal linux-3.4.11/fs/sysfs/mount.c linux-3.4.11-vs2.3.3.8/fs/sy sb->s_op = &sysfs_ops; sb->s_time_gran = 1; -diff -NurpP --minimal linux-3.4.11/fs/utimes.c linux-3.4.11-vs2.3.3.8/fs/utimes.c ---- linux-3.4.11/fs/utimes.c 2011-05-22 16:17:54.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/stat.h> #include <linux/utime.h> @@ -7418,9 +7418,9 @@ diff -NurpP --minimal linux-3.4.11/fs/utimes.c linux-3.4.11-vs2.3.3.8/fs/utimes. if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-3.4.11/fs/xattr.c linux-3.4.11-vs2.3.3.8/fs/xattr.c ---- linux-3.4.11/fs/xattr.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/fsnotify.h> #include <linux/audit.h> @@ -7438,9 +7438,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xattr.c linux-3.4.11-vs2.3.3.8/fs/xattr.c return (mask & MAY_WRITE) ? -EPERM : -ENODATA; return 0; } -diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_dinode.h linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_dinode.h ---- linux-3.4.11/fs/xfs/xfs_dinode.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -7481,9 +7481,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_dinode.h linux-3.4.11-vs2.3.3.8/fs +#define XFS_DIVFLAG_COW 0x02 #endif /* __XFS_DINODE_H__ */ -diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_fs.h linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_fs.h ---- linux-3.4.11/fs/xfs/xfs_fs.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -7504,9 +7504,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_fs.h linux-3.4.11-vs2.3.3.8/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.11/fs/xfs/xfs_ialloc.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_ialloc.c ---- linux-3.4.11/fs/xfs/xfs_ialloc.c 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -7515,9 +7515,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_ialloc.c linux-3.4.11-vs2.3.3.8/fs /* * Allocation group level functions. */ -diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_inode.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_inode.c ---- linux-3.4.11/fs/xfs/xfs_inode.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; } @@ -7692,9 +7692,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_inode.c linux-3.4.11-vs2.3.3.8/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.11/fs/xfs/xfs_inode.h linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_inode.h ---- linux-3.4.11/fs/xfs/xfs_inode.h 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -7715,9 +7715,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_inode.h linux-3.4.11-vs2.3.3.8/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.11/fs/xfs/xfs_ioctl.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_ioctl.c ---- linux-3.4.11/fs/xfs/xfs_ioctl.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -7786,9 +7786,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_ioctl.c linux-3.4.11-vs2.3.3.8/fs/ return xfs_ioc_setxflags(ip, filp, arg); case XFS_IOC_FSSETDM: { -diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_ioctl.h linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_ioctl.h ---- linux-3.4.11/fs/xfs/xfs_ioctl.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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); @@ -7802,9 +7802,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_ioctl.h linux-3.4.11-vs2.3.3.8/fs/ extern long xfs_file_ioctl( struct file *filp, -diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_iops.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_iops.c ---- linux-3.4.11/fs/xfs/xfs_iops.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -7880,9 +7880,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_iops.c linux-3.4.11-vs2.3.3.8/fs/x switch (inode->i_mode & S_IFMT) { case S_IFBLK: -diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_itable.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_itable.c ---- linux-3.4.11/fs/xfs/xfs_itable.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -7891,9 +7891,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_itable.c linux-3.4.11-vs2.3.3.8/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.11/fs/xfs/xfs_linux.h linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_linux.h ---- linux-3.4.11/fs/xfs/xfs_linux.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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()) @@ -7902,9 +7902,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_linux.h linux-3.4.11-vs2.3.3.8/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.11/fs/xfs/xfs_log_recover.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_log_recover.c ---- linux-3.4.11/fs/xfs/xfs_log_recover.c 2012-05-21 18:07:28.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_log_recover.c 2012-05-21 18:15:05.000000000 +0200 +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( } @@ -7915,9 +7915,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_log_recover.c linux-3.4.11-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.11/fs/xfs/xfs_mount.h linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_mount.h ---- linux-3.4.11/fs/xfs/xfs_mount.h 2012-05-21 18:07:28.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -7926,9 +7926,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_mount.h linux-3.4.11-vs2.3.3.8/fs/ /* * Default minimum read and write sizes. -diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_super.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_super.c ---- linux-3.4.11/fs/xfs/xfs_super.c 2012-05-21 18:07:28.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -8001,9 +8001,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_super.c linux-3.4.11-vs2.3.3.8/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.11/fs/xfs/xfs_vnodeops.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_vnodeops.c ---- linux-3.4.11/fs/xfs/xfs_vnodeops.c 2012-05-21 18:07:28.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; } @@ -8082,9 +8082,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_vnodeops.c linux-3.4.11-vs2.3.3.8/ int xfs_readlink( xfs_inode_t *ip, -diff -NurpP --minimal linux-3.4.11/include/linux/Kbuild linux-3.4.11-vs2.3.3.8/include/linux/Kbuild ---- linux-3.4.11/include/linux/Kbuild 2012-09-16 20:46:16.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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/ @@ -8093,9 +8093,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/Kbuild linux-3.4.11-vs2.3.3.8/i header-y += wimax/ objhdr-y += version.h -diff -NurpP --minimal linux-3.4.11/include/linux/capability.h linux-3.4.11-vs2.3.3.8/include/linux/capability.h ---- linux-3.4.11/include/linux/capability.h 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -8118,9 +8118,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/capability.h linux-3.4.11-vs2.3 /* * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-3.4.11/include/linux/cred.h linux-3.4.11-vs2.3.3.8/include/linux/cred.h ---- linux-3.4.11/include/linux/cred.h 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 *); @@ -8161,18 +8161,18 @@ diff -NurpP --minimal linux-3.4.11/include/linux/cred.h linux-3.4.11-vs2.3.3.8/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.11/include/linux/devpts_fs.h linux-3.4.11-vs2.3.3.8/include/linux/devpts_fs.h ---- linux-3.4.11/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/include/linux/fs.h ---- linux-3.4.11/include/linux/fs.h 2012-05-21 18:07:29.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -8334,7 +8334,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/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 *); @@ -8342,7 +8342,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/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); @@ -8350,9 +8350,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/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.11/include/linux/gfs2_ondisk.h linux-3.4.11-vs2.3.3.8/include/linux/gfs2_ondisk.h ---- linux-3.4.11/include/linux/gfs2_ondisk.h 2012-05-21 18:07:29.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -8373,9 +8373,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/gfs2_ondisk.h linux-3.4.11-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.11/include/linux/if_tun.h linux-3.4.11-vs2.3.3.8/include/linux/if_tun.h ---- linux-3.4.11/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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) @@ -8384,10 +8384,10 @@ diff -NurpP --minimal linux-3.4.11/include/linux/if_tun.h linux-3.4.11-vs2.3.3.8 /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-3.4.11/include/linux/init_task.h linux-3.4.11-vs2.3.3.8/include/linux/init_task.h ---- linux-3.4.11/include/linux/init_task.h 2012-05-21 18:07:29.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/include/linux/init_task.h 2012-05-21 18:15:05.000000000 +0200 -@@ -200,6 +200,10 @@ extern struct cred init_cred; +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) \ INIT_CPUSET_SEQ \ @@ -8398,9 +8398,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/init_task.h linux-3.4.11-vs2.3. } -diff -NurpP --minimal linux-3.4.11/include/linux/ipc.h linux-3.4.11-vs2.3.3.8/include/linux/ipc.h ---- linux-3.4.11/include/linux/ipc.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -8409,9 +8409,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/ipc.h linux-3.4.11-vs2.3.3.8/in uid_t cuid; gid_t cgid; umode_t mode; -diff -NurpP --minimal linux-3.4.11/include/linux/ipc_namespace.h linux-3.4.11-vs2.3.3.8/include/linux/ipc_namespace.h ---- linux-3.4.11/include/linux/ipc_namespace.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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) @@ -8438,9 +8438,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/ipc_namespace.h linux-3.4.11-vs } static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) -diff -NurpP --minimal linux-3.4.11/include/linux/loop.h linux-3.4.11-vs2.3.3.8/include/linux/loop.h ---- linux-3.4.11/include/linux/loop.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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]; @@ -8449,9 +8449,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/loop.h linux-3.4.11-vs2.3.3.8/i int (*ioctl)(struct loop_device *, int cmd, unsigned long arg); -diff -NurpP --minimal linux-3.4.11/include/linux/magic.h linux-3.4.11-vs2.3.3.8/include/linux/magic.h ---- linux-3.4.11/include/linux/magic.h 2012-05-21 18:07:31.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -8461,9 +8461,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/magic.h linux-3.4.11-vs2.3.3.8/ #define AUTOFS_SUPER_MAGIC 0x0187 #define CODA_SUPER_MAGIC 0x73757245 #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ -diff -NurpP --minimal linux-3.4.11/include/linux/major.h linux-3.4.11-vs2.3.3.8/include/linux/major.h ---- linux-3.4.11/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -8472,9 +8472,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/major.h linux-3.4.11-vs2.3.3.8/ #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-3.4.11/include/linux/memcontrol.h linux-3.4.11-vs2.3.3.8/include/linux/memcontrol.h ---- linux-3.4.11/include/linux/memcontrol.h 2012-05-21 18:07:31.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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); @@ -8489,9 +8489,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/memcontrol.h linux-3.4.11-vs2.3 static inline int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup) { -diff -NurpP --minimal linux-3.4.11/include/linux/mm_types.h linux-3.4.11-vs2.3.3.8/include/linux/mm_types.h ---- linux-3.4.11/include/linux/mm_types.h 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -8500,9 +8500,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/mm_types.h linux-3.4.11-vs2.3.3 /* Swap token stuff */ /* -diff -NurpP --minimal linux-3.4.11/include/linux/mmzone.h linux-3.4.11-vs2.3.3.8/include/linux/mmzone.h ---- linux-3.4.11/include/linux/mmzone.h 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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;\ }) @@ -8517,9 +8517,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/mmzone.h linux-3.4.11-vs2.3.3.8 #include <linux/memory_hotplug.h> extern struct mutex zonelists_mutex; -diff -NurpP --minimal linux-3.4.11/include/linux/mount.h linux-3.4.11-vs2.3.3.8/include/linux/mount.h ---- linux-3.4.11/include/linux/mount.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -8530,9 +8530,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/mount.h linux-3.4.11-vs2.3.3.8/ 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.11/include/linux/net.h linux-3.4.11-vs2.3.3.8/include/linux/net.h ---- linux-3.4.11/include/linux/net.h 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -8541,10 +8541,10 @@ diff -NurpP --minimal linux-3.4.11/include/linux/net.h linux-3.4.11-vs2.3.3.8/in #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-3.4.11/include/linux/netdevice.h linux-3.4.11-vs2.3.3.8/include/linux/netdevice.h ---- linux-3.4.11/include/linux/netdevice.h 2012-05-21 18:07:31.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/include/linux/netdevice.h 2012-05-21 18:15:05.000000000 +0200 -@@ -1620,6 +1620,7 @@ extern void netdev_resync_ops(struct ne +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); extern struct net_device *__dev_get_by_index(struct net *net, int ifindex); @@ -8552,9 +8552,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/netdevice.h linux-3.4.11-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.11/include/linux/nfs_mount.h linux-3.4.11-vs2.3.3.8/include/linux/nfs_mount.h ---- linux-3.4.11/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -8565,9 +8565,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/nfs_mount.h linux-3.4.11-vs2.3. /* The following are for internal use only */ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-3.4.11/include/linux/nsproxy.h linux-3.4.11-vs2.3.3.8/include/linux/nsproxy.h ---- linux-3.4.11/include/linux/nsproxy.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/spinlock.h> @@ -8584,7 +8584,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/nsproxy.h linux-3.4.11-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); @@ -8617,9 +8617,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/nsproxy.h linux-3.4.11-vs2.3.3. } #endif -diff -NurpP --minimal linux-3.4.11/include/linux/pid.h linux-3.4.11-vs2.3.3.8/include/linux/pid.h ---- linux-3.4.11/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -8638,9 +8638,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/pid.h linux-3.4.11-vs2.3.3.8/in pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-3.4.11/include/linux/proc_fs.h linux-3.4.11-vs2.3.3.8/include/linux/proc_fs.h ---- linux-3.4.11/include/linux/proc_fs.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -8676,9 +8676,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/proc_fs.h linux-3.4.11-vs2.3.3. int fd; union proc_op op; struct proc_dir_entry *pde; -diff -NurpP --minimal linux-3.4.11/include/linux/quotaops.h linux-3.4.11-vs2.3.3.8/include/linux/quotaops.h ---- linux-3.4.11/include/linux/quotaops.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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_ @@ -8701,7 +8701,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/quotaops.h linux-3.4.11-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) { @@ -8720,9 +8720,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/quotaops.h linux-3.4.11-vs2.3.3 } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-3.4.11/include/linux/reboot.h linux-3.4.11-vs2.3.3.8/include/linux/reboot.h ---- linux-3.4.11/include/linux/reboot.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -8731,10 +8731,10 @@ diff -NurpP --minimal linux-3.4.11/include/linux/reboot.h linux-3.4.11-vs2.3.3.8 #ifdef __KERNEL__ -diff -NurpP --minimal linux-3.4.11/include/linux/sched.h linux-3.4.11-vs2.3.3.8/include/linux/sched.h ---- linux-3.4.11/include/linux/sched.h 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/include/linux/sched.h 2012-07-24 11:52:30.000000000 +0200 -@@ -1452,6 +1452,14 @@ struct task_struct { +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; @@ -8749,7 +8749,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sched.h linux-3.4.11-vs2.3.3.8/ /* Thread group tracking */ u32 parent_exec_id; u32 self_exec_id; -@@ -1696,6 +1704,11 @@ struct pid_namespace; +@@ -1699,6 +1707,11 @@ struct pid_namespace; pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, struct pid_namespace *ns); @@ -8761,7 +8761,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sched.h linux-3.4.11-vs2.3.3.8/ static inline pid_t task_pid_nr(struct task_struct *tsk) { return tsk->pid; -@@ -1709,7 +1722,8 @@ static inline pid_t task_pid_nr_ns(struc +@@ -1712,7 +1725,8 @@ static inline pid_t task_pid_nr_ns(struc static inline pid_t task_pid_vnr(struct task_struct *tsk) { @@ -8771,7 +8771,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sched.h linux-3.4.11-vs2.3.3.8/ } -@@ -1722,7 +1736,7 @@ pid_t task_tgid_nr_ns(struct task_struct +@@ -1725,7 +1739,7 @@ pid_t task_tgid_nr_ns(struct task_struct static inline pid_t task_tgid_vnr(struct task_struct *tsk) { @@ -8780,9 +8780,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sched.h linux-3.4.11-vs2.3.3.8/ } -diff -NurpP --minimal linux-3.4.11/include/linux/shmem_fs.h linux-3.4.11-vs2.3.3.8/include/linux/shmem_fs.h ---- linux-3.4.11/include/linux/shmem_fs.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -8793,9 +8793,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/shmem_fs.h linux-3.4.11-vs2.3.3 struct shmem_inode_info { spinlock_t lock; unsigned long flags; -diff -NurpP --minimal linux-3.4.11/include/linux/stat.h linux-3.4.11-vs2.3.3.8/include/linux/stat.h ---- linux-3.4.11/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -8804,9 +8804,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/stat.h linux-3.4.11-vs2.3.3.8/i dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-3.4.11/include/linux/sunrpc/auth.h linux-3.4.11-vs2.3.3.8/include/linux/sunrpc/auth.h ---- linux-3.4.11/include/linux/sunrpc/auth.h 2012-05-21 18:07:32.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -8815,9 +8815,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sunrpc/auth.h linux-3.4.11-vs2. struct group_info *group_info; const char *principal; unsigned char machine_cred : 1; -diff -NurpP --minimal linux-3.4.11/include/linux/sunrpc/clnt.h linux-3.4.11-vs2.3.3.8/include/linux/sunrpc/clnt.h ---- linux-3.4.11/include/linux/sunrpc/clnt.h 2012-05-21 18:07:32.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -8828,9 +8828,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sunrpc/clnt.h linux-3.4.11-vs2. struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-3.4.11/include/linux/sysctl.h linux-3.4.11-vs2.3.3.8/include/linux/sysctl.h ---- linux-3.4.11/include/linux/sysctl.h 2012-05-21 18:07:32.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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) */ @@ -8847,9 +8847,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sysctl.h linux-3.4.11-vs2.3.3.8 KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-3.4.11/include/linux/sysfs.h linux-3.4.11-vs2.3.3.8/include/linux/sysfs.h ---- linux-3.4.11/include/linux/sysfs.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/kobject_ns.h> #include <linux/atomic.h> @@ -8859,10 +8859,10 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sysfs.h linux-3.4.11-vs2.3.3.8/ struct kobject; struct module; enum kobj_ns_type; -diff -NurpP --minimal linux-3.4.11/include/linux/time.h linux-3.4.11-vs2.3.3.8/include/linux/time.h ---- linux-3.4.11/include/linux/time.h 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/include/linux/time.h 2012-09-01 10:50:49.000000000 +0200 -@@ -256,6 +256,8 @@ static __always_inline void timespec_add +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; } @@ -8871,9 +8871,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/time.h linux-3.4.11-vs2.3.3.8/i #endif /* __KERNEL__ */ /* -diff -NurpP --minimal linux-3.4.11/include/linux/types.h linux-3.4.11-vs2.3.3.8/include/linux/types.h ---- linux-3.4.11/include/linux/types.h 2012-05-21 18:07:32.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -8884,9 +8884,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/types.h linux-3.4.11-vs2.3.3.8/ typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-3.4.11/include/linux/utsname.h linux-3.4.11-vs2.3.3.8/include/linux/utsname.h ---- linux-3.4.11/include/linux/utsname.h 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 } @@ -8913,9 +8913,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/utsname.h linux-3.4.11-vs2.3.3. } #endif -diff -NurpP --minimal linux-3.4.11/include/linux/vroot.h linux-3.4.11-vs2.3.3.8/include/linux/vroot.h ---- linux-3.4.11/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ + +/* @@ -8968,9 +8968,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vroot.h linux-3.4.11-vs2.3.3.8/ +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vs_base.h linux-3.4.11-vs2.3.3.8/include/linux/vs_base.h ---- linux-3.4.11/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -8982,9 +8982,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_base.h linux-3.4.11-vs2.3.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vs_context.h linux-3.4.11-vs2.3.3.8/include/linux/vs_context.h ---- linux-3.4.11/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -9228,9 +9228,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_context.h linux-3.4.11-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vs_cowbl.h linux-3.4.11-vs2.3.3.8/include/linux/vs_cowbl.h ---- linux-3.4.11/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -9280,9 +9280,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_cowbl.h linux-3.4.11-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vs_cvirt.h linux-3.4.11-vs2.3.3.8/include/linux/vs_cvirt.h ---- linux-3.4.11/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -9334,9 +9334,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_cvirt.h linux-3.4.11-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vs_device.h linux-3.4.11-vs2.3.3.8/include/linux/vs_device.h ---- linux-3.4.11/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -9383,9 +9383,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_device.h linux-3.4.11-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vs_dlimit.h linux-3.4.11-vs2.3.3.8/include/linux/vs_dlimit.h ---- linux-3.4.11/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -9602,9 +9602,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_dlimit.h linux-3.4.11-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vs_inet.h linux-3.4.11-vs2.3.3.8/include/linux/vs_inet.h ---- linux-3.4.11/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -9959,9 +9959,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_inet.h linux-3.4.11-vs2.3.3. +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vs_inet6.h linux-3.4.11-vs2.3.3.8/include/linux/vs_inet6.h ---- linux-3.4.11/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -10209,9 +10209,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_inet6.h linux-3.4.11-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vs_limit.h linux-3.4.11-vs2.3.3.8/include/linux/vs_limit.h ---- linux-3.4.11/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -10353,9 +10353,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_limit.h linux-3.4.11-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vs_network.h linux-3.4.11-vs2.3.3.8/include/linux/vs_network.h ---- linux-3.4.11/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -10526,9 +10526,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_network.h linux-3.4.11-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vs_pid.h linux-3.4.11-vs2.3.3.8/include/linux/vs_pid.h ---- linux-3.4.11/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -10580,9 +10580,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_pid.h linux-3.4.11-vs2.3.3.8 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vs_sched.h linux-3.4.11-vs2.3.3.8/include/linux/vs_sched.h ---- linux-3.4.11/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -10624,9 +10624,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_sched.h linux-3.4.11-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vs_socket.h linux-3.4.11-vs2.3.3.8/include/linux/vs_socket.h ---- linux-3.4.11/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -10695,9 +10695,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_socket.h linux-3.4.11-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vs_tag.h linux-3.4.11-vs2.3.3.8/include/linux/vs_tag.h ---- linux-3.4.11/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -10746,9 +10746,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_tag.h linux-3.4.11-vs2.3.3.8 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vs_time.h linux-3.4.11-vs2.3.3.8/include/linux/vs_time.h ---- linux-3.4.11/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -10769,9 +10769,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_time.h linux-3.4.11-vs2.3.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/Kbuild linux-3.4.11-vs2.3.3.8/include/linux/vserver/Kbuild ---- linux-3.4.11/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 \ @@ -10781,9 +10781,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/Kbuild linux-3.4.11-vs2 + +header-y += switch.h network.h monitor.h inode.h device.h + -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/base.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/base.h ---- linux-3.4.11/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -10963,9 +10963,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/base.h linux-3.4.11-vs2 +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/cacct.h ---- linux-3.4.11/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -10982,9 +10982,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct.h linux-3.4.11-vs +}; + +#endif /* _VX_CACCT_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/cacct_cmd.h ---- linux-3.4.11/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -11009,9 +11009,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct_cmd.h linux-3.4.1 + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct_def.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/cacct_def.h ---- linux-3.4.11/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -11056,9 +11056,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct_def.h linux-3.4.1 +#endif + +#endif /* _VX_CACCT_DEF_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct_int.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/cacct_int.h ---- linux-3.4.11/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -11081,9 +11081,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct_int.h linux-3.4.1 + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_INT_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/check.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/check.h ---- linux-3.4.11/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -11174,9 +11174,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/check.h linux-3.4.11-vs +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/context.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/context.h ---- linux-3.4.11/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -11366,9 +11366,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/context.h linux-3.4.11- + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/context_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/context_cmd.h ---- linux-3.4.11/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -11532,9 +11532,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/context_cmd.h linux-3.4 + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cvirt.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/cvirt.h ---- linux-3.4.11/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -11558,9 +11558,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cvirt.h linux-3.4.11-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cvirt_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/cvirt_cmd.h ---- linux-3.4.11/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -11615,9 +11615,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cvirt_cmd.h linux-3.4.1 + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cvirt_def.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/cvirt_def.h ---- linux-3.4.11/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -11699,9 +11699,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cvirt_def.h linux-3.4.1 +#endif + +#endif /* _VX_CVIRT_DEF_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/debug.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/debug.h ---- linux-3.4.11/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -11848,9 +11848,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/debug.h linux-3.4.11-vs + + +#endif /* _VX_DEBUG_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/debug_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/debug_cmd.h ---- linux-3.4.11/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -11910,9 +11910,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/debug_cmd.h linux-3.4.1 + +#endif /* __KERNEL__ */ +#endif /* _VX_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/device.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/device.h ---- linux-3.4.11/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -11929,9 +11929,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/device.h linux-3.4.11-v +#else /* _VX_DEVICE_H */ +#warning duplicate inclusion +#endif /* _VX_DEVICE_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/device_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/device_cmd.h ---- linux-3.4.11/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -11977,9 +11977,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/device_cmd.h linux-3.4. + +#endif /* __KERNEL__ */ +#endif /* _VX_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/device_def.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/device_def.h ---- linux-3.4.11/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -11998,9 +11998,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/device_def.h linux-3.4. +}; + +#endif /* _VX_DEVICE_DEF_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/dlimit.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/dlimit.h ---- linux-3.4.11/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -12056,9 +12056,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/dlimit.h linux-3.4.11-v +#else /* _VX_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VX_DLIMIT_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/dlimit_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/dlimit_cmd.h ---- linux-3.4.11/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -12169,9 +12169,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/dlimit_cmd.h linux-3.4. + +#endif /* __KERNEL__ */ +#endif /* _VX_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/global.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/global.h ---- linux-3.4.11/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -12192,9 +12192,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/global.h linux-3.4.11-v + + +#endif /* _VX_GLOBAL_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/history.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/history.h ---- linux-3.4.11/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -12393,9 +12393,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/history.h linux-3.4.11- +#endif /* CONFIG_VSERVER_HISTORY */ + +#endif /* _VX_HISTORY_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/inode.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/inode.h ---- linux-3.4.11/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -12436,9 +12436,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/inode.h linux-3.4.11-vs +#else /* _VX_INODE_H */ +#warning duplicate inclusion +#endif /* _VX_INODE_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/inode_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/inode_cmd.h ---- linux-3.4.11/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -12499,9 +12499,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/inode_cmd.h linux-3.4.1 + +#endif /* __KERNEL__ */ +#endif /* _VX_INODE_CMD_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/limit.h ---- linux-3.4.11/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -12574,9 +12574,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit.h linux-3.4.11-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/limit_cmd.h ---- linux-3.4.11/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -12649,9 +12649,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit_cmd.h linux-3.4.1 + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit_def.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/limit_def.h ---- linux-3.4.11/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -12700,9 +12700,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit_def.h linux-3.4.1 +#endif + +#endif /* _VX_LIMIT_DEF_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit_int.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/limit_int.h ---- linux-3.4.11/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -12902,9 +12902,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit_int.h linux-3.4.1 + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_INT_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/monitor.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/monitor.h ---- linux-3.4.11/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13002,9 +13002,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/monitor.h linux-3.4.11- + + +#endif /* _VX_MONITOR_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/network.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/network.h ---- linux-3.4.11/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13154,9 +13154,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/network.h linux-3.4.11- + +#endif /* __KERNEL__ */ +#endif /* _VX_NETWORK_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/network_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/network_cmd.h ---- linux-3.4.11/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13322,9 +13322,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/network_cmd.h linux-3.4 + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/percpu.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/percpu.h ---- linux-3.4.11/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13340,9 +13340,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/percpu.h linux-3.4.11-v +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + +#endif /* _VX_PERCPU_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/pid.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/pid.h ---- linux-3.4.11/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13395,9 +13395,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/pid.h linux-3.4.11-vs2. +} + +#endif -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/sched.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/sched.h ---- linux-3.4.11/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13422,9 +13422,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/sched.h linux-3.4.11-vs +#else /* _VX_SCHED_H */ +#warning duplicate inclusion +#endif /* _VX_SCHED_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/sched_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/sched_cmd.h ---- linux-3.4.11/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13447,9 +13447,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/sched_cmd.h linux-3.4.1 + +#endif /* __KERNEL__ */ +#endif /* _VX_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/sched_def.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/sched_def.h ---- linux-3.4.11/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13489,9 +13489,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/sched_def.h linux-3.4.1 +#endif + +#endif /* _VX_SCHED_DEF_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/signal.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/signal.h ---- linux-3.4.11/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13507,9 +13507,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/signal.h linux-3.4.11-v +#else /* _VX_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VX_SIGNAL_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/signal_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/signal_cmd.h ---- linux-3.4.11/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13554,9 +13554,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/signal_cmd.h linux-3.4. + +#endif /* __KERNEL__ */ +#endif /* _VX_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/space.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/space.h ---- linux-3.4.11/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13570,9 +13570,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/space.h linux-3.4.11-vs +#else /* _VX_SPACE_H */ +#warning duplicate inclusion +#endif /* _VX_SPACE_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/space_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/space_cmd.h ---- linux-3.4.11/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13612,9 +13612,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/space_cmd.h linux-3.4.1 + +#endif /* __KERNEL__ */ +#endif /* _VX_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/switch.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/switch.h ---- linux-3.4.11/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13714,9 +13714,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/switch.h linux-3.4.11-v + +#endif /* _VX_SWITCH_H */ + -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/tag.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/tag.h ---- linux-3.4.11/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13861,9 +13861,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/tag.h linux-3.4.11-vs2. +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-3.4.11/include/linux/vserver/tag_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/tag_cmd.h ---- linux-3.4.11/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13887,9 +13887,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/tag_cmd.h linux-3.4.11- + +#endif /* __KERNEL__ */ +#endif /* _VX_TAG_CMD_H */ -diff -NurpP --minimal linux-3.4.11/include/net/addrconf.h linux-3.4.11-vs2.3.3.8/include/net/addrconf.h ---- linux-3.4.11/include/net/addrconf.h 2012-05-21 18:07:33.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -13900,9 +13900,9 @@ diff -NurpP --minimal linux-3.4.11/include/net/addrconf.h linux-3.4.11-vs2.3.3.8 extern int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags); -diff -NurpP --minimal linux-3.4.11/include/net/af_unix.h linux-3.4.11-vs2.3.3.8/include/net/af_unix.h ---- linux-3.4.11/include/net/af_unix.h 2012-05-21 18:07:33.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/socket.h> #include <linux/un.h> @@ -13911,9 +13911,9 @@ diff -NurpP --minimal linux-3.4.11/include/net/af_unix.h linux-3.4.11-vs2.3.3.8/ #include <net/sock.h> extern void unix_inflight(struct file *fp); -diff -NurpP --minimal linux-3.4.11/include/net/inet_timewait_sock.h linux-3.4.11-vs2.3.3.8/include/net/inet_timewait_sock.h ---- linux-3.4.11/include/net/inet_timewait_sock.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -13925,10 +13925,10 @@ diff -NurpP --minimal linux-3.4.11/include/net/inet_timewait_sock.h linux-3.4.11 int tw_timeout; volatile unsigned char tw_substate; unsigned char tw_rcv_wscale; -diff -NurpP --minimal linux-3.4.11/include/net/ip6_route.h linux-3.4.11-vs2.3.3.8/include/net/ip6_route.h ---- linux-3.4.11/include/net/ip6_route.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -13938,9 +13938,9 @@ diff -NurpP --minimal linux-3.4.11/include/net/ip6_route.h linux-3.4.11-vs2.3.3. extern struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr, -diff -NurpP --minimal linux-3.4.11/include/net/route.h linux-3.4.11-vs2.3.3.8/include/net/route.h ---- linux-3.4.11/include/net/route.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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); } @@ -13988,9 +13988,9 @@ diff -NurpP --minimal linux-3.4.11/include/net/route.h linux-3.4.11-vs2.3.3.8/in rt = __ip_route_output_key(net, fl4); if (IS_ERR(rt)) return rt; -diff -NurpP --minimal linux-3.4.11/include/net/sock.h linux-3.4.11-vs2.3.3.8/include/net/sock.h ---- linux-3.4.11/include/net/sock.h 2012-05-21 18:07:33.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/include/net/sock.h 2012-05-21 18:15:05.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; @@ -14002,7 +14002,7 @@ diff -NurpP --minimal linux-3.4.11/include/net/sock.h linux-3.4.11-vs2.3.3.8/inc /* * fields between dontcopy_begin/dontcopy_end * are not copied in sock_copy() -@@ -281,6 +285,10 @@ struct sock { +@@ -282,6 +286,10 @@ struct sock { #define sk_bind_node __sk_common.skc_bind_node #define sk_prot __sk_common.skc_prot #define sk_net __sk_common.skc_net @@ -14013,9 +14013,9 @@ diff -NurpP --minimal linux-3.4.11/include/net/sock.h linux-3.4.11-vs2.3.3.8/inc socket_lock_t sk_lock; struct sk_buff_head sk_receive_queue; /* -diff -NurpP --minimal linux-3.4.11/init/Kconfig linux-3.4.11-vs2.3.3.8/init/Kconfig ---- linux-3.4.11/init/Kconfig 2012-05-21 18:07:33.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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" @@ -14032,9 +14032,9 @@ diff -NurpP --minimal linux-3.4.11/init/Kconfig linux-3.4.11-vs2.3.3.8/init/Kcon default y help This allows containers, i.e. vservers, to use user namespaces -diff -NurpP --minimal linux-3.4.11/init/main.c linux-3.4.11-vs2.3.3.8/init/main.c ---- linux-3.4.11/init/main.c 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/init/main.c 2012-06-28 16:45:07.000000000 +0200 +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 <linux/shmem_fs.h> #include <linux/slab.h> @@ -14043,9 +14043,9 @@ diff -NurpP --minimal linux-3.4.11/init/main.c linux-3.4.11-vs2.3.3.8/init/main. #include <asm/io.h> #include <asm/bugs.h> -diff -NurpP --minimal linux-3.4.11/ipc/mqueue.c linux-3.4.11-vs2.3.3.8/ipc/mqueue.c ---- linux-3.4.11/ipc/mqueue.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/ipc_namespace.h> #include <linux/user_namespace.h> @@ -14121,9 +14121,9 @@ diff -NurpP --minimal linux-3.4.11/ipc/mqueue.c linux-3.4.11-vs2.3.3.8/ipc/mqueu free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-3.4.11/ipc/msg.c linux-3.4.11-vs2.3.3.8/ipc/msg.c ---- linux-3.4.11/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/rwsem.h> #include <linux/nsproxy.h> @@ -14140,9 +14140,9 @@ diff -NurpP --minimal linux-3.4.11/ipc/msg.c linux-3.4.11-vs2.3.3.8/ipc/msg.c msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-3.4.11/ipc/namespace.c linux-3.4.11-vs2.3.3.8/ipc/namespace.c ---- linux-3.4.11/ipc/namespace.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/mount.h> #include <linux/user_namespace.h> @@ -14183,9 +14183,9 @@ diff -NurpP --minimal linux-3.4.11/ipc/namespace.c linux-3.4.11-vs2.3.3.8/ipc/na } /* -diff -NurpP --minimal linux-3.4.11/ipc/sem.c linux-3.4.11-vs2.3.3.8/ipc/sem.c ---- linux-3.4.11/ipc/sem.c 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/rwsem.h> #include <linux/nsproxy.h> @@ -14223,9 +14223,9 @@ diff -NurpP --minimal linux-3.4.11/ipc/sem.c linux-3.4.11-vs2.3.3.8/ipc/sem.c security_sem_free(sma); ipc_rcu_putref(sma); } -diff -NurpP --minimal linux-3.4.11/ipc/shm.c linux-3.4.11-vs2.3.3.8/ipc/shm.c ---- linux-3.4.11/ipc/shm.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/nsproxy.h> #include <linux/mount.h> @@ -14281,9 +14281,9 @@ diff -NurpP --minimal linux-3.4.11/ipc/shm.c linux-3.4.11-vs2.3.3.8/ipc/shm.c return error; no_id: -diff -NurpP --minimal linux-3.4.11/kernel/Makefile linux-3.4.11-vs2.3.3.8/kernel/Makefile ---- linux-3.4.11/kernel/Makefile 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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/ @@ -14292,9 +14292,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/Makefile linux-3.4.11-vs2.3.3.8/kernel obj-$(CONFIG_FREEZER) += freezer.o obj-$(CONFIG_PROFILING) += profile.o obj-$(CONFIG_STACKTRACE) += stacktrace.o -diff -NurpP --minimal linux-3.4.11/kernel/auditsc.c linux-3.4.11-vs2.3.3.8/kernel/auditsc.c ---- linux-3.4.11/kernel/auditsc.c 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -14304,9 +14304,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/auditsc.c linux-3.4.11-vs2.3.3.8/kerne return -EPERM; #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ -diff -NurpP --minimal linux-3.4.11/kernel/capability.c linux-3.4.11-vs2.3.3.8/kernel/capability.c ---- linux-3.4.11/kernel/capability.c 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/syscalls.h> #include <linux/pid_namespace.h> @@ -14332,9 +14332,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/capability.c linux-3.4.11-vs2.3.3.8/ke /** * has_capability_noaudit - Does a task have a capability (unaudited) in the * initial user ns -diff -NurpP --minimal linux-3.4.11/kernel/compat.c linux-3.4.11-vs2.3.3.8/kernel/compat.c ---- linux-3.4.11/kernel/compat.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -14344,9 +14344,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/compat.c linux-3.4.11-vs2.3.3.8/kernel return 0; } -diff -NurpP --minimal linux-3.4.11/kernel/cred.c linux-3.4.11-vs2.3.3.8/kernel/cred.c ---- linux-3.4.11/kernel/cred.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 }; @@ -14416,9 +14416,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/cred.c linux-3.4.11-vs2.3.3.8/kernel/c EXPORT_SYMBOL(prepare_creds); /* -diff -NurpP --minimal linux-3.4.11/kernel/exit.c linux-3.4.11-vs2.3.3.8/kernel/exit.c ---- linux-3.4.11/kernel/exit.c 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/kernel/exit.c 2012-09-01 10:50:49.000000000 +0200 +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 <linux/fs_struct.h> #include <linux/init_task.h> @@ -14442,7 +14442,65 @@ diff -NurpP --minimal linux-3.4.11/kernel/exit.c linux-3.4.11-vs2.3.3.8/kernel/e } } } -@@ -1013,6 +1019,9 @@ void do_exit(long code) +@@ -699,15 +705,25 @@ static struct task_struct *find_new_reap + __acquires(&tasklist_lock) + { + struct pid_namespace *pid_ns = task_active_pid_ns(father); +- struct task_struct *thread; ++ struct vx_info *vxi = task_get_vx_info(father); ++ struct task_struct *thread = father; ++ struct task_struct *reaper; + +- thread = father; + while_each_thread(father, thread) { + if (thread->flags & PF_EXITING) + continue; + if (unlikely(pid_ns->child_reaper == father)) + pid_ns->child_reaper = thread; +- return thread; ++ reaper = thread; ++ goto out_put; ++ } ++ ++ reaper = pid_ns->child_reaper; ++ if (vxi) { ++ BUG_ON(!vxi->vx_reaper); ++ if (vxi->vx_reaper != init_pid_ns.child_reaper && ++ vxi->vx_reaper != father) ++ reaper = vxi->vx_reaper; + } + + if (unlikely(pid_ns->child_reaper == father)) { +@@ -751,7 +767,9 @@ static struct task_struct *find_new_reap + } + } + +- return pid_ns->child_reaper; ++out_put: ++ put_vx_info(vxi); ++ return reaper; + } + + /* +@@ -802,10 +820,15 @@ static void forget_original_parent(struc + list_for_each_entry_safe(p, n, &father->children, sibling) { + struct task_struct *t = p; + do { +- t->real_parent = reaper; ++ struct task_struct *new_parent = reaper; ++ ++ if (unlikely(p == reaper)) ++ new_parent = task_active_pid_ns(p)->child_reaper; ++ ++ t->real_parent = new_parent; + if (t->parent == father) { + BUG_ON(t->ptrace); +- t->parent = t->real_parent; ++ t->parent = new_parent; + } + if (t->pdeath_signal) + group_send_sig_info(t->pdeath_signal, +@@ -1013,6 +1036,9 @@ void do_exit(long code) */ ptrace_put_breakpoints(tsk); @@ -14452,7 +14510,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/exit.c linux-3.4.11-vs2.3.3.8/kernel/e exit_notify(tsk, group_dead); #ifdef CONFIG_NUMA task_lock(tsk); -@@ -1063,10 +1072,15 @@ void do_exit(long code) +@@ -1063,10 +1089,15 @@ void do_exit(long code) smp_mb(); raw_spin_unlock_wait(&tsk->pi_lock); @@ -14468,9 +14526,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/exit.c linux-3.4.11-vs2.3.3.8/kernel/e BUG(); /* Avoid "noreturn function does return". */ for (;;) -diff -NurpP --minimal linux-3.4.11/kernel/fork.c linux-3.4.11-vs2.3.3.8/kernel/fork.c ---- linux-3.4.11/kernel/fork.c 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/oom.h> #include <linux/khugepaged.h> @@ -14490,7 +14548,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/fork.c linux-3.4.11-vs2.3.3.8/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); @@ -14563,9 +14621,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/fork.c linux-3.4.11-vs2.3.3.8/kernel/f write_unlock_irq(&tasklist_lock); proc_fork_connector(p); cgroup_post_fork(p); -diff -NurpP --minimal linux-3.4.11/kernel/kthread.c linux-3.4.11-vs2.3.3.8/kernel/kthread.c ---- linux-3.4.11/kernel/kthread.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/kernel/kthread.c 2012-05-21 18:15:05.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 <linux/mutex.h> #include <linux/slab.h> @@ -14574,9 +14632,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/kthread.c linux-3.4.11-vs2.3.3.8/kerne #include <trace/events/sched.h> static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-3.4.11/kernel/nsproxy.c linux-3.4.11-vs2.3.3.8/kernel/nsproxy.c ---- linux-3.4.11/kernel/nsproxy.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/mnt_namespace.h> #include <linux/utsname.h> @@ -14741,7 +14799,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/nsproxy.c linux-3.4.11-vs2.3.3.8/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; @@ -14758,9 +14816,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/nsproxy.c linux-3.4.11-vs2.3.3.8/kerne return -EPERM; *new_nsp = create_new_namespaces(unshare_flags, current, -diff -NurpP --minimal linux-3.4.11/kernel/pid.c linux-3.4.11-vs2.3.3.8/kernel/pid.c ---- linux-3.4.11/kernel/pid.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/pid_namespace.h> #include <linux/init_task.h> @@ -14806,7 +14864,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/pid.c linux-3.4.11-vs2.3.3.8/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; } @@ -14818,9 +14876,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/pid.c linux-3.4.11-vs2.3.3.8/kernel/pi pid_t pid_vnr(struct pid *pid) { return pid_nr_ns(pid, current->nsproxy->pid_ns); -diff -NurpP --minimal linux-3.4.11/kernel/pid_namespace.c linux-3.4.11-vs2.3.3.8/kernel/pid_namespace.c ---- linux-3.4.11/kernel/pid_namespace.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/slab.h> #include <linux/proc_fs.h> @@ -14845,9 +14903,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/pid_namespace.c linux-3.4.11-vs2.3.3.8 kmem_cache_free(pid_ns_cachep, ns); } -diff -NurpP --minimal linux-3.4.11/kernel/posix-timers.c linux-3.4.11-vs2.3.3.8/kernel/posix-timers.c ---- linux-3.4.11/kernel/posix-timers.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/wait.h> #include <linux/workqueue.h> @@ -14883,9 +14941,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/posix-timers.c linux-3.4.11-vs2.3.3.8/ /* If we failed to send the signal the timer stops. */ return ret > 0; } -diff -NurpP --minimal linux-3.4.11/kernel/printk.c linux-3.4.11-vs2.3.3.8/kernel/printk.c ---- linux-3.4.11/kernel/printk.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/cpu.h> #include <linux/notifier.h> @@ -14894,7 +14952,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/printk.c linux-3.4.11-vs2.3.3.8/kernel #include <asm/uaccess.h> -@@ -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)) { @@ -14953,9 +15011,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/printk.c linux-3.4.11-vs2.3.3.8/kernel count = len; if (count > log_buf_len) count = log_buf_len; -diff -NurpP --minimal linux-3.4.11/kernel/ptrace.c linux-3.4.11-vs2.3.3.8/kernel/ptrace.c ---- linux-3.4.11/kernel/ptrace.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/syscalls.h> #include <linux/uaccess.h> @@ -14976,9 +15034,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/ptrace.c linux-3.4.11-vs2.3.3.8/kernel return security_ptrace_access_check(task, mode); } -diff -NurpP --minimal linux-3.4.11/kernel/sched/core.c linux-3.4.11-vs2.3.3.8/kernel/sched/core.c ---- linux-3.4.11/kernel/sched/core.c 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/kernel/sched/core.c 2012-09-16 20:49:11.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 <linux/slab.h> #include <linux/init_task.h> @@ -15050,9 +15108,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/sched/core.c linux-3.4.11-vs2.3.3.8/ke retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-3.4.11/kernel/sched/fair.c linux-3.4.11-vs2.3.3.8/kernel/sched/fair.c ---- linux-3.4.11/kernel/sched/fair.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/slab.h> #include <linux/profile.h> @@ -15079,9 +15137,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/sched/fair.c linux-3.4.11-vs2.3.3.8/ke update_cfs_load(cfs_rq, 0); account_entity_dequeue(cfs_rq, se); -diff -NurpP --minimal linux-3.4.11/kernel/signal.c linux-3.4.11-vs2.3.3.8/kernel/signal.c ---- linux-3.4.11/kernel/signal.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/pid_namespace.h> #include <linux/nsproxy.h> @@ -15149,7 +15207,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/signal.c linux-3.4.11-vs2.3.3.8/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) { @@ -15174,9 +15232,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/signal.c linux-3.4.11-vs2.3.3.8/kernel if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-3.4.11/kernel/softirq.c linux-3.4.11-vs2.3.3.8/kernel/softirq.c ---- linux-3.4.11/kernel/softirq.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/ftrace.h> #include <linux/smp.h> @@ -15185,9 +15243,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/softirq.c linux-3.4.11-vs2.3.3.8/kerne #define CREATE_TRACE_POINTS #include <trace/events/irq.h> -diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sys.c ---- linux-3.4.11/kernel/sys.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/kernel/sys.c 2012-05-21 18:15:05.000000000 +0200 +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 <linux/syscalls.h> #include <linux/kprobes.h> @@ -15226,7 +15284,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy niceval = 20 - task_nice(p); if (niceval > retval) retval = niceval; -@@ -418,6 +426,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off); +@@ -419,6 +427,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off); static DEFINE_MUTEX(reboot_mutex); @@ -15235,7 +15293,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy /* * Reboot system call: for obvious reasons only root may call it, * and even root needs to set up some magic numbers in the registers -@@ -459,6 +469,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int +@@ -460,6 +470,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off) cmd = LINUX_REBOOT_CMD_HALT; @@ -15245,7 +15303,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy mutex_lock(&reboot_mutex); switch (cmd) { case LINUX_REBOOT_CMD_RESTART: -@@ -1282,7 +1295,8 @@ SYSCALL_DEFINE2(sethostname, char __user +@@ -1285,7 +1298,8 @@ SYSCALL_DEFINE2(sethostname, char __user int errno; char tmp[__NEW_UTS_LEN]; @@ -15255,7 +15313,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy return -EPERM; if (len < 0 || len > __NEW_UTS_LEN) -@@ -1333,7 +1347,8 @@ SYSCALL_DEFINE2(setdomainname, char __us +@@ -1336,7 +1350,8 @@ SYSCALL_DEFINE2(setdomainname, char __us int errno; char tmp[__NEW_UTS_LEN]; @@ -15265,7 +15323,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy return -EPERM; if (len < 0 || len > __NEW_UTS_LEN) return -EINVAL; -@@ -1452,7 +1467,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 && @@ -15274,7 +15332,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy retval = -EPERM; if (!retval) retval = security_task_setrlimit(tsk->group_leader, -@@ -1506,7 +1521,8 @@ static int check_prlimit_permission(stru +@@ -1509,7 +1524,8 @@ static int check_prlimit_permission(stru cred->gid == tcred->sgid && cred->gid == tcred->gid)) return 0; @@ -15284,9 +15342,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy return 0; return -EPERM; -diff -NurpP --minimal linux-3.4.11/kernel/sysctl.c linux-3.4.11-vs2.3.3.8/kernel/sysctl.c ---- linux-3.4.11/kernel/sysctl.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/lockdep.h> @@ -15309,9 +15367,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/sysctl.c linux-3.4.11-vs2.3.3.8/kernel #ifdef CONFIG_CHR_DEV_SG { .procname = "sg-big-buff", -diff -NurpP --minimal linux-3.4.11/kernel/sysctl_binary.c linux-3.4.11-vs2.3.3.8/kernel/sysctl_binary.c ---- linux-3.4.11/kernel/sysctl_binary.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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" }, @@ -15320,9 +15378,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/sysctl_binary.c linux-3.4.11-vs2.3.3.8 { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-3.4.11/kernel/time/timekeeping.c linux-3.4.11-vs2.3.3.8/kernel/time/timekeeping.c ---- linux-3.4.11/kernel/time/timekeeping.c 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/kernel/time/timekeeping.c 2012-07-24 11:52:30.000000000 +0200 +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)); @@ -15331,10 +15389,10 @@ diff -NurpP --minimal linux-3.4.11/kernel/time/timekeeping.c linux-3.4.11-vs2.3. } EXPORT_SYMBOL(getnstimeofday); -diff -NurpP --minimal linux-3.4.11/kernel/time.c linux-3.4.11-vs2.3.3.8/kernel/time.c ---- linux-3.4.11/kernel/time.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -15352,9 +15410,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/time.c linux-3.4.11-vs2.3.3.8/kernel/t return 0; } -diff -NurpP --minimal linux-3.4.11/kernel/timer.c linux-3.4.11-vs2.3.3.8/kernel/timer.c ---- linux-3.4.11/kernel/timer.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/kernel/timer.c 2012-05-21 18:15:05.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 <linux/irq_work.h> #include <linux/sched.h> @@ -15366,7 +15424,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/timer.c linux-3.4.11-vs2.3.3.8/kernel/ #include <asm/uaccess.h> #include <asm/unistd.h> -@@ -1386,12 +1390,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, sec +@@ -1388,12 +1392,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, sec #endif @@ -15379,7 +15437,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/timer.c linux-3.4.11-vs2.3.3.8/kernel/ /** * sys_getpid - return the thread group id of the current process -@@ -1420,10 +1418,23 @@ SYSCALL_DEFINE0(getppid) +@@ -1422,10 +1420,23 @@ SYSCALL_DEFINE0(getppid) rcu_read_lock(); pid = task_tgid_vnr(rcu_dereference(current->real_parent)); rcu_read_unlock(); @@ -15404,9 +15462,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/timer.c linux-3.4.11-vs2.3.3.8/kernel/ SYSCALL_DEFINE0(getuid) { /* Only we change this so SMP safe */ -diff -NurpP --minimal linux-3.4.11/kernel/user_namespace.c linux-3.4.11-vs2.3.3.8/kernel/user_namespace.c ---- linux-3.4.11/kernel/user_namespace.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/user_namespace.h> #include <linux/highuid.h> @@ -15432,9 +15490,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/user_namespace.c linux-3.4.11-vs2.3.3. INIT_WORK(&ns->destroyer, free_user_ns_work); schedule_work(&ns->destroyer); } -diff -NurpP --minimal linux-3.4.11/kernel/utsname.c linux-3.4.11-vs2.3.3.8/kernel/utsname.c ---- linux-3.4.11/kernel/utsname.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/slab.h> #include <linux/user_namespace.h> @@ -15503,9 +15561,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/utsname.c linux-3.4.11-vs2.3.3.8/kerne kfree(ns); } -diff -NurpP --minimal linux-3.4.11/kernel/vserver/Kconfig linux-3.4.11-vs2.3.3.8/kernel/vserver/Kconfig ---- linux-3.4.11/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -15731,9 +15789,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/Kconfig linux-3.4.11-vs2.3.3.8 + bool + default n + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/Makefile linux-3.4.11-vs2.3.3.8/kernel/vserver/Makefile ---- linux-3.4.11/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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. @@ -15753,9 +15811,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/Makefile linux-3.4.11-vs2.3.3. +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/cacct.c linux-3.4.11-vs2.3.3.8/kernel/vserver/cacct.c ---- linux-3.4.11/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -15799,9 +15857,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/cacct.c linux-3.4.11-vs2.3.3.8 + return 0; +} + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/cacct_init.h linux-3.4.11-vs2.3.3.8/kernel/vserver/cacct_init.h ---- linux-3.4.11/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ + + @@ -15828,9 +15886,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/cacct_init.h linux-3.4.11-vs2. + return; +} + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/cacct_proc.h linux-3.4.11-vs2.3.3.8/kernel/vserver/cacct_proc.h ---- linux-3.4.11/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -15885,9 +15943,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/cacct_proc.h linux-3.4.11-vs2. +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-3.4.11/kernel/vserver/context.c linux-3.4.11-vs2.3.3.8/kernel/vserver/context.c ---- linux-3.4.11/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -17008,9 +17066,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/context.c linux-3.4.11-vs2.3.3 + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/cvirt.c linux-3.4.11-vs2.3.3.8/kernel/vserver/cvirt.c ---- linux-3.4.11/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -17325,9 +17383,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/cvirt.c linux-3.4.11-vs2.3.3.8 + +#endif + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/cvirt_init.h linux-3.4.11-vs2.3.3.8/kernel/vserver/cvirt_init.h ---- linux-3.4.11/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ + + @@ -17399,9 +17457,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/cvirt_init.h linux-3.4.11-vs2. + return; +} + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/cvirt_proc.h linux-3.4.11-vs2.3.3.8/kernel/vserver/cvirt_proc.h ---- linux-3.4.11/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -17526,9 +17584,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/cvirt_proc.h linux-3.4.11-vs2. +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-3.4.11/kernel/vserver/debug.c linux-3.4.11-vs2.3.3.8/kernel/vserver/debug.c ---- linux-3.4.11/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -17562,9 +17620,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/debug.c linux-3.4.11-vs2.3.3.8 + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/device.c linux-3.4.11-vs2.3.3.8/kernel/vserver/device.c ---- linux-3.4.11/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -18009,9 +18067,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/device.c linux-3.4.11-vs2.3.3. +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/dlimit.c linux-3.4.11-vs2.3.3.8/kernel/vserver/dlimit.c ---- linux-3.4.11/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -18544,9 +18602,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/dlimit.c linux-3.4.11-vs2.3.3. +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/helper.c linux-3.4.11-vs2.3.3.8/kernel/vserver/helper.c ---- linux-3.4.11/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -18777,9 +18835,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/helper.c linux-3.4.11-vs2.3.3. + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/history.c linux-3.4.11-vs2.3.3.8/kernel/vserver/history.c ---- linux-3.4.11/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -19039,9 +19097,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/history.c linux-3.4.11-vs2.3.3 + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/inet.c linux-3.4.11-vs2.3.3.8/kernel/vserver/inet.c ---- linux-3.4.11/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/in.h> @@ -19269,9 +19327,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/inet.c linux-3.4.11-vs2.3.3.8/ + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/init.c linux-3.4.11-vs2.3.3.8/kernel/vserver/init.c ---- linux-3.4.11/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -19318,9 +19376,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/init.c linux-3.4.11-vs2.3.3.8/ +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/inode.c linux-3.4.11-vs2.3.3.8/kernel/vserver/inode.c ---- linux-3.4.11/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -19759,9 +19817,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/inode.c linux-3.4.11-vs2.3.3.8 + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit.c linux-3.4.11-vs2.3.3.8/kernel/vserver/limit.c ---- linux-3.4.11/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -20108,9 +20166,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit.c linux-3.4.11-vs2.3.3.8 + return cache; +} + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit_init.h linux-3.4.11-vs2.3.3.8/kernel/vserver/limit_init.h ---- linux-3.4.11/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ + + @@ -20143,9 +20201,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit_init.h linux-3.4.11-vs2. + } +} + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit_proc.h linux-3.4.11-vs2.3.3.8/kernel/vserver/limit_proc.h ---- linux-3.4.11/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -20204,9 +20262,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit_proc.h linux-3.4.11-vs2. +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/network.c linux-3.4.11-vs2.3.3.8/kernel/vserver/network.c ---- linux-3.4.11/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -21120,9 +21178,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/network.c linux-3.4.11-vs2.3.3 +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/proc.c linux-3.4.11-vs2.3.3.8/kernel/vserver/proc.c ---- linux-3.4.11/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -22227,9 +22285,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/proc.c linux-3.4.11-vs2.3.3.8/ + return buffer - orig; +} + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/sched.c linux-3.4.11-vs2.3.3.8/kernel/vserver/sched.c ---- linux-3.4.11/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -22314,9 +22372,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/sched.c linux-3.4.11-vs2.3.3.8 + return 0; +} + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/sched_init.h linux-3.4.11-vs2.3.3.8/kernel/vserver/sched_init.h ---- linux-3.4.11/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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) @@ -22345,9 +22403,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/sched_init.h linux-3.4.11-vs2. +{ + return; +} -diff -NurpP --minimal linux-3.4.11/kernel/vserver/sched_proc.h linux-3.4.11-vs2.3.3.8/kernel/vserver/sched_proc.h ---- linux-3.4.11/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -22381,9 +22439,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/sched_proc.h linux-3.4.11-vs2. +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-3.4.11/kernel/vserver/signal.c linux-3.4.11-vs2.3.3.8/kernel/vserver/signal.c ---- linux-3.4.11/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -22519,9 +22577,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/signal.c linux-3.4.11-vs2.3.3. + return ret; +} + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/space.c linux-3.4.11-vs2.3.3.8/kernel/vserver/space.c ---- linux-3.4.11/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -22959,9 +23017,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/space.c linux-3.4.11-vs2.3.3.8 + return 0; +} + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/switch.c linux-3.4.11-vs2.3.3.8/kernel/vserver/switch.c ---- linux-3.4.11/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -23519,9 +23577,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/switch.c linux-3.4.11-vs2.3.3. +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-3.4.11/kernel/vserver/sysctl.c linux-3.4.11-vs2.3.3.8/kernel/vserver/sysctl.c ---- linux-3.4.11/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -23770,9 +23828,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/sysctl.c linux-3.4.11-vs2.3.3. +EXPORT_SYMBOL_GPL(vs_debug_perm); +EXPORT_SYMBOL_GPL(vs_debug_misc); + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/tag.c linux-3.4.11-vs2.3.3.8/kernel/vserver/tag.c ---- linux-3.4.11/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -23837,9 +23895,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/tag.c linux-3.4.11-vs2.3.3.8/k +} + + -diff -NurpP --minimal linux-3.4.11/kernel/vserver/vci_config.h linux-3.4.11-vs2.3.3.8/kernel/vserver/vci_config.h ---- linux-3.4.11/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -23917,9 +23975,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/vci_config.h linux-3.4.11-vs2. + 0; +} + -diff -NurpP --minimal linux-3.4.11/mm/memcontrol.c linux-3.4.11-vs2.3.3.8/mm/memcontrol.c ---- linux-3.4.11/mm/memcontrol.c 2012-05-21 18:07:35.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/mm/memcontrol.c 2012-05-21 18:15:05.000000000 +0200 +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); } @@ -23952,9 +24010,9 @@ diff -NurpP --minimal linux-3.4.11/mm/memcontrol.c linux-3.4.11-vs2.3.3.8/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.11/mm/oom_kill.c linux-3.4.11-vs2.3.3.8/mm/oom_kill.c ---- linux-3.4.11/mm/oom_kill.c 2012-05-21 18:07:35.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/freezer.h> #include <linux/ftrace.h> @@ -24029,9 +24087,9 @@ diff -NurpP --minimal linux-3.4.11/mm/oom_kill.c linux-3.4.11-vs2.3.3.8/mm/oom_k } if (PTR_ERR(p) != -1UL) { oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, -diff -NurpP --minimal linux-3.4.11/mm/page_alloc.c linux-3.4.11-vs2.3.3.8/mm/page_alloc.c ---- linux-3.4.11/mm/page_alloc.c 2012-05-21 18:07:35.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/mm/page_alloc.c 2012-05-21 18:15:05.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 <linux/memcontrol.h> #include <linux/prefetch.h> @@ -24061,9 +24119,9 @@ diff -NurpP --minimal linux-3.4.11/mm/page_alloc.c linux-3.4.11-vs2.3.3.8/mm/pag } #endif -diff -NurpP --minimal linux-3.4.11/mm/pgtable-generic.c linux-3.4.11-vs2.3.3.8/mm/pgtable-generic.c ---- linux-3.4.11/mm/pgtable-generic.c 2012-05-21 18:07:35.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 */ @@ -24073,10 +24131,10 @@ diff -NurpP --minimal linux-3.4.11/mm/pgtable-generic.c linux-3.4.11-vs2.3.3.8/m #include <linux/pagemap.h> #include <asm/tlb.h> #include <asm-generic/pgtable.h> -diff -NurpP --minimal linux-3.4.11/mm/shmem.c linux-3.4.11-vs2.3.3.8/mm/shmem.c ---- linux-3.4.11/mm/shmem.c 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/mm/shmem.c 2012-07-18 00:29:44.000000000 +0200 -@@ -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); @@ -24085,7 +24143,7 @@ diff -NurpP --minimal linux-3.4.11/mm/shmem.c linux-3.4.11-vs2.3.3.8/mm/shmem.c buf->f_bsize = PAGE_CACHE_SIZE; buf->f_namelen = NAME_MAX; if (sbinfo->max_blocks) { -@@ -2273,7 +2273,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; @@ -24094,9 +24152,9 @@ diff -NurpP --minimal linux-3.4.11/mm/shmem.c linux-3.4.11-vs2.3.3.8/mm/shmem.c sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-3.4.11/mm/slab.c linux-3.4.11-vs2.3.3.8/mm/slab.c ---- linux-3.4.11/mm/slab.c 2012-05-21 18:07:35.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/mm/slab.c 2012-05-21 18:15:05.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 @@ -24130,9 +24188,9 @@ diff -NurpP --minimal linux-3.4.11/mm/slab.c linux-3.4.11-vs2.3.3.8/mm/slab.c kmemcheck_slab_free(cachep, objp, obj_size(cachep)); -diff -NurpP --minimal linux-3.4.11/mm/slab_vs.h linux-3.4.11-vs2.3.3.8/mm/slab_vs.h ---- linux-3.4.11/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/vserver/context.h> @@ -24163,9 +24221,9 @@ diff -NurpP --minimal linux-3.4.11/mm/slab_vs.h linux-3.4.11-vs2.3.3.8/mm/slab_v + atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-3.4.11/mm/swapfile.c linux-3.4.11-vs2.3.3.8/mm/swapfile.c ---- linux-3.4.11/mm/swapfile.c 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <asm/tlbflush.h> #include <linux/swapops.h> @@ -24200,9 +24258,9 @@ diff -NurpP --minimal linux-3.4.11/mm/swapfile.c linux-3.4.11-vs2.3.3.8/mm/swapf } /* -diff -NurpP --minimal linux-3.4.11/net/bridge/br_multicast.c linux-3.4.11-vs2.3.3.8/net/bridge/br_multicast.c ---- linux-3.4.11/net/bridge/br_multicast.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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)); @@ -24212,9 +24270,9 @@ diff -NurpP --minimal linux-3.4.11/net/bridge/br_multicast.c linux-3.4.11-vs2.3. kfree_skb(skb); return NULL; } -diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/core/dev.c ---- linux-3.4.11/net/core/dev.c 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/net/core/dev.c 2012-09-01 10:50:49.000000000 +0200 +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 <linux/in.h> #include <linux/jhash.h> @@ -24312,7 +24370,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/cor /* avoid cases where sscanf is not exact inverse of printf */ snprintf(buf, IFNAMSIZ, name, i); -@@ -3974,6 +3993,8 @@ static int dev_ifconf(struct net *net, c +@@ -3999,6 +4018,8 @@ static int dev_ifconf(struct net *net, c total = 0; for_each_netdev(net, dev) { @@ -24321,7 +24379,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/cor for (i = 0; i < NPROTO; i++) { if (gifconf_list[i]) { int done; -@@ -4076,6 +4097,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); @@ -24332,9 +24390,9 @@ diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/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.11/net/core/rtnetlink.c linux-3.4.11-vs2.3.3.8/net/core/rtnetlink.c ---- linux-3.4.11/net/core/rtnetlink.c 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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) @@ -24354,9 +24412,9 @@ diff -NurpP --minimal linux-3.4.11/net/core/rtnetlink.c linux-3.4.11-vs2.3.3.8/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.11/net/core/sock.c linux-3.4.11-vs2.3.3.8/net/core/sock.c ---- linux-3.4.11/net/core/sock.c 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/net/core/sock.c 2012-07-18 00:29:44.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 <net/netprio_cgroup.h> @@ -24368,7 +24426,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/sock.c linux-3.4.11-vs2.3.3.8/net/co #include <trace/events/sock.h> -@@ -1146,6 +1150,8 @@ static struct sock *sk_prot_alloc(struct +@@ -1147,6 +1151,8 @@ static struct sock *sk_prot_alloc(struct goto out_free_sec; sk_tx_queue_clear(sk); } @@ -24377,7 +24435,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/sock.c linux-3.4.11-vs2.3.3.8/net/co return sk; -@@ -1254,6 +1260,11 @@ static void __sk_free(struct sock *sk) +@@ -1255,6 +1261,11 @@ static void __sk_free(struct sock *sk) put_cred(sk->sk_peer_cred); put_pid(sk->sk_peer_pid); put_net(sock_net(sk)); @@ -24389,7 +24447,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/sock.c linux-3.4.11-vs2.3.3.8/net/co sk_prot_free(sk->sk_prot_creator, sk); } -@@ -1314,6 +1325,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)); @@ -24398,7 +24456,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/sock.c linux-3.4.11-vs2.3.3.8/net/co sk_node_init(&newsk->sk_node); sock_lock_init(newsk); bh_lock_sock(newsk); -@@ -1370,6 +1383,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); @@ -24411,7 +24469,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/sock.c linux-3.4.11-vs2.3.3.8/net/co /* * Increment the counter in the same struct proto as the master * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that -@@ -2125,6 +2144,12 @@ void sock_init_data(struct socket *sock, +@@ -2127,6 +2146,12 @@ void sock_init_data(struct socket *sock, sk->sk_stamp = ktime_set(-1L, 0); @@ -24424,9 +24482,9 @@ diff -NurpP --minimal linux-3.4.11/net/core/sock.c linux-3.4.11-vs2.3.3.8/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.11/net/ipv4/af_inet.c linux-3.4.11-vs2.3.3.8/net/ipv4/af_inet.c ---- linux-3.4.11/net/ipv4/af_inet.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/mroute.h> @@ -24504,9 +24562,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/af_inet.c linux-3.4.11-vs2.3.3.8/net sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; } -diff -NurpP --minimal linux-3.4.11/net/ipv4/arp.c linux-3.4.11-vs2.3.3.8/net/ipv4/arp.c ---- linux-3.4.11/net/ipv4/arp.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -24523,9 +24581,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/arp.c linux-3.4.11-vs2.3.3.8/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.11/net/ipv4/devinet.c linux-3.4.11-vs2.3.3.8/net/ipv4/devinet.c ---- linux-3.4.11/net/ipv4/devinet.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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); @@ -24592,9 +24650,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/devinet.c linux-3.4.11-vs2.3.3.8/net if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-3.4.11/net/ipv4/fib_trie.c linux-3.4.11-vs2.3.3.8/net/ipv4/fib_trie.c ---- linux-3.4.11/net/ipv4/fib_trie.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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; @@ -24603,9 +24661,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/fib_trie.c linux-3.4.11-vs2.3.3.8/ne if (fi) seq_printf(seq, "%s\t%08X\t%08X\t%04X\t%d\t%u\t" -diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_connection_sock.c linux-3.4.11-vs2.3.3.8/net/ipv4/inet_connection_sock.c ---- linux-3.4.11/net/ipv4/inet_connection_sock.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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); @@ -24644,7 +24702,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_connection_sock.c linux-3.4.11- 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) { @@ -24655,9 +24713,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_connection_sock.c linux-3.4.11- break; } } -diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_diag.c linux-3.4.11-vs2.3.3.8/net/ipv4/inet_diag.c ---- linux-3.4.11/net/ipv4/inet_diag.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/net/ipv4/inet_diag.c 2012-05-21 18:15:05.000000000 +0200 +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 <linux/inet.h> @@ -24706,7 +24764,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_diag.c linux-3.4.11-vs2.3.3.8/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 { @@ -24768,9 +24826,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_diag.c linux-3.4.11-vs2.3.3.8/n if (num < s_num) goto next_dying; if (r->sdiag_family != AF_UNSPEC && -diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_hashtables.c linux-3.4.11-vs2.3.3.8/net/ipv4/inet_hashtables.c ---- linux-3.4.11/net/ipv4/inet_hashtables.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <net/inet_connection_sock.h> #include <net/inet_hashtables.h> @@ -24807,9 +24865,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_hashtables.c linux-3.4.11-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.11/net/ipv4/netfilter/nf_nat_helper.c linux-3.4.11-vs2.3.3.8/net/ipv4/netfilter/nf_nat_helper.c ---- linux-3.4.11/net/ipv4/netfilter/nf_nat_helper.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <net/route.h> @@ -24818,9 +24876,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/netfilter/nf_nat_helper.c linux-3.4. #include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_ecache.h> -diff -NurpP --minimal linux-3.4.11/net/ipv4/netfilter.c linux-3.4.11-vs2.3.3.8/net/ipv4/netfilter.c ---- linux-3.4.11/net/ipv4/netfilter.c 2012-01-09 16:15:03.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/skbuff.h> #include <linux/gfp.h> @@ -24830,9 +24888,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/netfilter.c linux-3.4.11-vs2.3.3.8/n #include <net/xfrm.h> #include <net/ip.h> #include <net/netfilter/nf_queue.h> -diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv4/raw.c ---- linux-3.4.11/net/ipv4/raw.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/net/ipv4/raw.c 2012-05-21 18:15:05.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 && @@ -24842,7 +24900,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)) goto found; /* gotcha */ } -@@ -390,6 +390,12 @@ static int raw_send_hdrinc(struct sock * +@@ -392,6 +392,12 @@ static int raw_send_hdrinc(struct sock * icmp_out_count(net, ((struct icmphdr *) skb_transport_header(skb))->type); @@ -24855,7 +24913,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL, rt->dst.dev, dst_output); if (err > 0) -@@ -575,6 +581,16 @@ static int raw_sendmsg(struct kiocb *ioc +@@ -577,6 +583,16 @@ static int raw_sendmsg(struct kiocb *ioc goto done; } @@ -24872,7 +24930,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv security_sk_classify_flow(sk, flowi4_to_flowi(&fl4)); rt = ip_route_output_flow(sock_net(sk), &fl4, sk); if (IS_ERR(rt)) { -@@ -651,17 +667,19 @@ static int raw_bind(struct sock *sk, str +@@ -653,17 +669,19 @@ static int raw_bind(struct sock *sk, str { struct inet_sock *inet = inet_sk(sk); struct sockaddr_in *addr = (struct sockaddr_in *) uaddr; @@ -24895,7 +24953,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) inet->inet_saddr = 0; /* Use device */ sk_dst_reset(sk); -@@ -713,7 +731,8 @@ static int raw_recvmsg(struct kiocb *ioc +@@ -715,7 +733,8 @@ static int raw_recvmsg(struct kiocb *ioc /* Copy the address. */ if (sin) { sin->sin_family = AF_INET; @@ -24905,7 +24963,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv sin->sin_port = 0; memset(&sin->sin_zero, 0, sizeof(sin->sin_zero)); } -@@ -909,7 +928,8 @@ static struct sock *raw_get_first(struct +@@ -911,7 +930,8 @@ static struct sock *raw_get_first(struct struct hlist_node *node; sk_for_each(sk, node, &state->h->ht[state->bucket]) @@ -24915,7 +24973,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv goto found; } sk = NULL; -@@ -925,7 +945,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: ; @@ -24925,9 +24983,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-3.4.11/net/ipv4/route.c linux-3.4.11-vs2.3.3.8/net/ipv4/route.c ---- linux-3.4.11/net/ipv4/route.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -24937,9 +24995,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/route.c linux-3.4.11-vs2.3.3.8/net/i rth = ERR_PTR(-ENODEV); if (dev_out == NULL) goto out; -diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp.c linux-3.4.11-vs2.3.3.8/net/ipv4/tcp.c ---- linux-3.4.11/net/ipv4/tcp.c 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/net/ipv4/tcp.c 2012-09-01 10:50:49.000000000 +0200 +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 <linux/crypto.h> #include <linux/time.h> @@ -24948,10 +25006,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp.c linux-3.4.11-vs2.3.3.8/net/ipv #include <net/icmp.h> #include <net/tcp.h> -diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/net/ipv4/tcp_ipv4.c ---- linux-3.4.11/net/ipv4/tcp_ipv4.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/net/ipv4/tcp_ipv4.c 2012-05-21 18:15:05.000000000 +0200 -@@ -2038,6 +2038,12 @@ static void *listening_get_next(struct s +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) { while (req) { @@ -24964,7 +25022,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne if (req->rsk_ops->family == st->family) { cur = req; goto out; -@@ -2062,6 +2068,10 @@ get_req: +@@ -2063,6 +2069,10 @@ get_req: } get_sk: sk_nulls_for_each_from(sk, node) { @@ -24975,7 +25033,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne if (!net_eq(sock_net(sk), net)) continue; if (sk->sk_family == st->family) { -@@ -2138,6 +2148,11 @@ static void *established_get_first(struc +@@ -2139,6 +2149,11 @@ static void *established_get_first(struc spin_lock_bh(lock); sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) { @@ -24987,7 +25045,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne if (sk->sk_family != st->family || !net_eq(sock_net(sk), net)) { continue; -@@ -2148,6 +2163,11 @@ static void *established_get_first(struc +@@ -2149,6 +2164,11 @@ static void *established_get_first(struc st->state = TCP_SEQ_STATE_TIME_WAIT; inet_twsk_for_each(tw, node, &tcp_hashinfo.ehash[st->bucket].twchain) { @@ -24999,7 +25057,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne if (tw->tw_family != st->family || !net_eq(twsk_net(tw), net)) { continue; -@@ -2177,7 +2197,9 @@ static void *established_get_next(struct +@@ -2178,7 +2198,9 @@ static void *established_get_next(struct tw = cur; tw = tw_next(tw); get_tw: @@ -25010,7 +25068,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne tw = tw_next(tw); } if (tw) { -@@ -2201,6 +2223,11 @@ get_tw: +@@ -2202,6 +2224,11 @@ get_tw: sk = sk_nulls_next(sk); sk_nulls_for_each_from(sk, node) { @@ -25022,7 +25080,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne if (sk->sk_family == st->family && net_eq(sock_net(sk), net)) goto found; } -@@ -2406,9 +2433,9 @@ static void get_openreq4(const struct so +@@ -2407,9 +2434,9 @@ static void get_openreq4(const struct so seq_printf(f, "%4d: %08X:%04X %08X:%04X" " %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n", i, @@ -25034,7 +25092,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne ntohs(ireq->rmt_port), TCP_SYN_RECV, 0, 0, /* could print option size, but that is af dependent. */ -@@ -2430,8 +2457,8 @@ static void get_tcp4_sock(struct sock *s +@@ -2431,8 +2458,8 @@ static void get_tcp4_sock(struct sock *s const struct tcp_sock *tp = tcp_sk(sk); const struct inet_connection_sock *icsk = inet_csk(sk); const struct inet_sock *inet = inet_sk(sk); @@ -25045,7 +25103,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); int rx_queue; -@@ -2488,8 +2515,8 @@ static void get_timewait4_sock(const str +@@ -2489,8 +2516,8 @@ static void get_timewait4_sock(const str if (ttd < 0) ttd = 0; @@ -25056,9 +25114,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne destp = ntohs(tw->tw_dport); srcp = ntohs(tw->tw_sport); -diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_minisocks.c linux-3.4.11-vs2.3.3.8/net/ipv4/tcp_minisocks.c ---- linux-3.4.11/net/ipv4/tcp_minisocks.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/slab.h> #include <linux/sysctl.h> @@ -25069,7 +25127,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_minisocks.c linux-3.4.11-vs2.3.3 #include <net/tcp.h> #include <net/inet_common.h> #include <net/xfrm.h> -@@ -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; @@ -25081,9 +25139,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_minisocks.c linux-3.4.11-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.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv4/udp.c ---- linux-3.4.11/net/ipv4/udp.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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); @@ -25194,7 +25252,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/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); @@ -25216,9 +25274,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); -diff -NurpP --minimal linux-3.4.11/net/ipv6/Kconfig linux-3.4.11-vs2.3.3.8/net/ipv6/Kconfig ---- linux-3.4.11/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -25230,9 +25288,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/Kconfig linux-3.4.11-vs2.3.3.8/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.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/net/ipv6/addrconf.c ---- linux-3.4.11/net/ipv6/addrconf.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/net/ipv6/addrconf.c 2012-05-21 18:15:05.000000000 +0200 +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 <linux/proc_fs.h> #include <linux/seq_file.h> @@ -25242,7 +25300,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne /* Set to 3 to get tracing... */ #define ACONF_DEBUG 2 -@@ -1104,7 +1106,7 @@ out: +@@ -1108,7 +1110,7 @@ out: int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev, const struct in6_addr *daddr, unsigned int prefs, @@ -25251,7 +25309,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne { struct ipv6_saddr_score scores[2], *score = &scores[0], *hiscore = &scores[1]; -@@ -1176,6 +1178,8 @@ int ipv6_dev_get_saddr(struct net *net, +@@ -1180,6 +1182,8 @@ int ipv6_dev_get_saddr(struct net *net, dev->name); continue; } @@ -25260,7 +25318,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne score->rule = -1; bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX); -@@ -3159,7 +3163,10 @@ static void if6_seq_stop(struct seq_file +@@ -3166,7 +3170,10 @@ static void if6_seq_stop(struct seq_file static int if6_seq_show(struct seq_file *seq, void *v) { struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v; @@ -25272,7 +25330,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne &ifp->addr, ifp->idev->dev->ifindex, ifp->prefix_len, -@@ -3665,6 +3672,11 @@ static int in6_dump_addrs(struct inet6_d +@@ -3672,6 +3679,11 @@ static int in6_dump_addrs(struct inet6_d struct ifacaddr6 *ifaca; int err = 1; int ip_idx = *p_ip_idx; @@ -25284,7 +25342,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne read_lock_bh(&idev->lock); switch (type) { -@@ -3675,6 +3687,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -3682,6 +3694,8 @@ static int in6_dump_addrs(struct inet6_d list_for_each_entry(ifa, &idev->addr_list, if_list) { if (++ip_idx < s_ip_idx) continue; @@ -25293,7 +25351,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne err = inet6_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq, -@@ -3691,6 +3705,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -3698,6 +3712,8 @@ static int in6_dump_addrs(struct inet6_d ifmca = ifmca->next, ip_idx++) { if (ip_idx < s_ip_idx) continue; @@ -25302,7 +25360,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne err = inet6_fill_ifmcaddr(skb, ifmca, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq, -@@ -3706,6 +3722,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -3713,6 +3729,8 @@ static int in6_dump_addrs(struct inet6_d ifaca = ifaca->aca_next, ip_idx++) { if (ip_idx < s_ip_idx) continue; @@ -25311,7 +25369,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne err = inet6_fill_ifacaddr(skb, ifaca, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq, -@@ -4091,6 +4109,11 @@ static int inet6_dump_ifinfo(struct sk_b +@@ -4098,6 +4116,11 @@ static int inet6_dump_ifinfo(struct sk_b struct inet6_dev *idev; struct hlist_head *head; struct hlist_node *node; @@ -25323,7 +25381,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne s_h = cb->args[0]; s_idx = cb->args[1]; -@@ -4102,6 +4125,8 @@ static int inet6_dump_ifinfo(struct sk_b +@@ -4109,6 +4132,8 @@ static int inet6_dump_ifinfo(struct sk_b hlist_for_each_entry_rcu(dev, node, head, index_hlist) { if (idx < s_idx) goto cont; @@ -25332,9 +25390,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-3.4.11/net/ipv6/af_inet6.c linux-3.4.11-vs2.3.3.8/net/ipv6/af_inet6.c ---- linux-3.4.11/net/ipv6/af_inet6.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/netdevice.h> #include <linux/icmpv6.h> @@ -25430,9 +25488,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/af_inet6.c linux-3.4.11-vs2.3.3.8/ne if (ipv6_addr_any(&np->rcv_saddr)) sin->sin6_addr = np->saddr; else -diff -NurpP --minimal linux-3.4.11/net/ipv6/datagram.c linux-3.4.11-vs2.3.3.8/net/ipv6/datagram.c ---- linux-3.4.11/net/ipv6/datagram.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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(); @@ -25442,9 +25500,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/datagram.c linux-3.4.11-vs2.3.3.8/ne if (!dev) { rcu_read_unlock(); return -ENODEV; -diff -NurpP --minimal linux-3.4.11/net/ipv6/fib6_rules.c linux-3.4.11-vs2.3.3.8/net/ipv6/fib6_rules.c ---- linux-3.4.11/net/ipv6/fib6_rules.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -25454,9 +25512,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/fib6_rules.c linux-3.4.11-vs2.3.3.8/ goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-3.4.11/net/ipv6/inet6_hashtables.c linux-3.4.11-vs2.3.3.8/net/ipv6/inet6_hashtables.c ---- linux-3.4.11/net/ipv6/inet6_hashtables.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/module.h> @@ -25492,9 +25550,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/inet6_hashtables.c linux-3.4.11-vs2. } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-3.4.11/net/ipv6/ip6_output.c linux-3.4.11-vs2.3.3.8/net/ipv6/ip6_output.c ---- linux-3.4.11/net/ipv6/ip6_output.c 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -25505,9 +25563,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/ip6_output.c linux-3.4.11-vs2.3.3.8/ if (err) goto out_err_release; } -diff -NurpP --minimal linux-3.4.11/net/ipv6/ndisc.c linux-3.4.11-vs2.3.3.8/net/ipv6/ndisc.c ---- linux-3.4.11/net/ipv6/ndisc.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/net/ipv6/ndisc.c 2012-05-21 18:15:05.000000000 +0200 +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, @@ -25517,9 +25575,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/ndisc.c linux-3.4.11-vs2.3.3.8/net/i return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-3.4.11/net/ipv6/raw.c linux-3.4.11-vs2.3.3.8/net/ipv6/raw.c ---- linux-3.4.11/net/ipv6/raw.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/net/ipv6/raw.c 2012-05-21 18:15:05.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 <linux/icmpv6.h> #include <linux/netfilter.h> @@ -25528,7 +25586,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/raw.c linux-3.4.11-vs2.3.3.8/net/ipv #include <linux/skbuff.h> #include <linux/compat.h> #include <asm/uaccess.h> -@@ -285,6 +286,13 @@ static int rawv6_bind(struct sock *sk, s +@@ -284,6 +285,13 @@ static int rawv6_bind(struct sock *sk, s goto out_unlock; } @@ -25542,9 +25600,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/raw.c linux-3.4.11-vs2.3.3.8/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.11/net/ipv6/route.c linux-3.4.11-vs2.3.3.8/net/ipv6/route.c ---- linux-3.4.11/net/ipv6/route.c 2012-09-16 20:46:17.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/net/ipv6/route.c 2012-07-18 00:29:44.000000000 +0200 +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 <net/xfrm.h> #include <net/netevent.h> @@ -25553,7 +25611,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/route.c linux-3.4.11-vs2.3.3.8/net/i #include <asm/uaccess.h> -@@ -2144,15 +2145,17 @@ int ip6_route_get_saddr(struct net *net, +@@ -2145,15 +2146,17 @@ int ip6_route_get_saddr(struct net *net, struct rt6_info *rt, const struct in6_addr *daddr, unsigned int prefs, @@ -25574,7 +25632,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/route.c linux-3.4.11-vs2.3.3.8/net/i return err; } -@@ -2483,7 +2486,8 @@ static int rt6_fill_node(struct net *net +@@ -2484,7 +2487,8 @@ static int rt6_fill_node(struct net *net NLA_PUT_U32(skb, RTA_IIF, iif); } else if (dst) { struct in6_addr saddr_buf; @@ -25584,7 +25642,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/route.c linux-3.4.11-vs2.3.3.8/net/i NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf); } -@@ -2710,6 +2714,7 @@ static int rt6_info_route(struct rt6_inf +@@ -2711,6 +2715,7 @@ static int rt6_info_route(struct rt6_inf struct seq_file *m = p_arg; struct neighbour *n; @@ -25592,9 +25650,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/route.c linux-3.4.11-vs2.3.3.8/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.11/net/ipv6/tcp_ipv6.c linux-3.4.11-vs2.3.3.8/net/ipv6/tcp_ipv6.c ---- linux-3.4.11/net/ipv6/tcp_ipv6.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/net/ipv6/tcp_ipv6.c 2012-05-21 18:15:05.000000000 +0200 +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 <linux/crypto.h> @@ -25621,9 +25679,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/tcp_ipv6.c linux-3.4.11-vs2.3.3.8/ne addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-3.4.11/net/ipv6/udp.c linux-3.4.11-vs2.3.3.8/net/ipv6/udp.c ---- linux-3.4.11/net/ipv6/udp.c 2012-05-21 18:07:40.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <net/tcp_states.h> #include <net/ip6_checksum.h> @@ -25716,9 +25774,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/udp.c linux-3.4.11-vs2.3.3.8/net/ipv } if (!ipv6_addr_any(&np->daddr)) { if (!ipv6_addr_equal(&np->daddr, saddr)) -diff -NurpP --minimal linux-3.4.11/net/ipv6/xfrm6_policy.c linux-3.4.11-vs2.3.3.8/net/ipv6/xfrm6_policy.c ---- linux-3.4.11/net/ipv6/xfrm6_policy.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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, @@ -25728,9 +25786,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/xfrm6_policy.c linux-3.4.11-vs2.3.3. dst_release(dst); return 0; } -diff -NurpP --minimal linux-3.4.11/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.11-vs2.3.3.8/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-3.4.11/net/netfilter/ipvs/ip_vs_xmit.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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) && @@ -25740,9 +25798,9 @@ diff -NurpP --minimal linux-3.4.11/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.11- goto out_err; if (do_xfrm) { dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-3.4.11/net/netlink/af_netlink.c linux-3.4.11-vs2.3.3.8/net/netlink/af_netlink.c ---- linux-3.4.11/net/netlink/af_netlink.c 2012-05-21 18:07:41.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/net/netlink/af_netlink.c 2012-05-21 18:15:05.000000000 +0200 +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 <linux/types.h> #include <linux/audit.h> @@ -25753,7 +25811,7 @@ diff -NurpP --minimal linux-3.4.11/net/netlink/af_netlink.c linux-3.4.11-vs2.3.3 #include <net/net_namespace.h> #include <net/sock.h> -@@ -1926,6 +1929,8 @@ static struct sock *netlink_seq_socket_i +@@ -1951,6 +1954,8 @@ static struct sock *netlink_seq_socket_i sk_for_each(s, node, &hash->table[j]) { if (sock_net(s) != seq_file_net(seq)) continue; @@ -25762,7 +25820,7 @@ diff -NurpP --minimal linux-3.4.11/net/netlink/af_netlink.c linux-3.4.11-vs2.3.3 if (off == pos) { iter->link = i; iter->hash_idx = j; -@@ -1960,7 +1965,8 @@ static void *netlink_seq_next(struct seq +@@ -1985,7 +1990,8 @@ static void *netlink_seq_next(struct seq s = v; do { s = sk_next(s); @@ -25772,7 +25830,7 @@ diff -NurpP --minimal linux-3.4.11/net/netlink/af_netlink.c linux-3.4.11-vs2.3.3 if (s) return s; -@@ -1972,7 +1978,8 @@ static void *netlink_seq_next(struct seq +@@ -1997,7 +2003,8 @@ static void *netlink_seq_next(struct seq for (; j <= hash->mask; j++) { s = sk_head(&hash->table[j]); @@ -25782,9 +25840,9 @@ diff -NurpP --minimal linux-3.4.11/net/netlink/af_netlink.c linux-3.4.11-vs2.3.3 s = sk_next(s); if (s) { iter->link = i; -diff -NurpP --minimal linux-3.4.11/net/socket.c linux-3.4.11-vs2.3.3.8/net/socket.c ---- linux-3.4.11/net/socket.c 2012-09-16 20:46:18.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/net/socket.c 2012-09-16 20:49:11.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 <net/sock.h> @@ -25891,9 +25949,9 @@ diff -NurpP --minimal linux-3.4.11/net/socket.c linux-3.4.11-vs2.3.3.8/net/socke err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-3.4.11/net/sunrpc/auth.c linux-3.4.11-vs2.3.3.8/net/sunrpc/auth.c ---- linux-3.4.11/net/sunrpc/auth.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/hash.h> #include <linux/sunrpc/clnt.h> @@ -25918,9 +25976,9 @@ diff -NurpP --minimal linux-3.4.11/net/sunrpc/auth.c linux-3.4.11-vs2.3.3.8/net/ }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-3.4.11/net/sunrpc/auth_unix.c linux-3.4.11-vs2.3.3.8/net/sunrpc/auth_unix.c ---- linux-3.4.11/net/sunrpc/auth_unix.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/module.h> #include <linux/sunrpc/clnt.h> @@ -25979,9 +26037,9 @@ diff -NurpP --minimal linux-3.4.11/net/sunrpc/auth_unix.c linux-3.4.11-vs2.3.3.8 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.11/net/sunrpc/clnt.c linux-3.4.11-vs2.3.3.8/net/sunrpc/clnt.c ---- linux-3.4.11/net/sunrpc/clnt.c 2012-09-16 20:46:18.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/in6.h> #include <linux/un.h> @@ -26000,9 +26058,9 @@ diff -NurpP --minimal linux-3.4.11/net/sunrpc/clnt.c linux-3.4.11-vs2.3.3.8/net/ return clnt; } EXPORT_SYMBOL_GPL(rpc_create); -diff -NurpP --minimal linux-3.4.11/net/unix/af_unix.c linux-3.4.11-vs2.3.3.8/net/unix/af_unix.c ---- linux-3.4.11/net/unix/af_unix.c 2012-05-21 18:07:41.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/net/unix/af_unix.c 2012-05-21 18:15:05.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 <linux/mount.h> #include <net/checksum.h> @@ -26021,7 +26079,7 @@ diff -NurpP --minimal linux-3.4.11/net/unix/af_unix.c linux-3.4.11-vs2.3.3.8/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; @@ -26040,9 +26098,9 @@ diff -NurpP --minimal linux-3.4.11/net/unix/af_unix.c linux-3.4.11-vs2.3.3.8/net sk = next_unix_socket(&iter->i, sk); return sk; } -diff -NurpP --minimal linux-3.4.11/scripts/checksyscalls.sh linux-3.4.11-vs2.3.3.8/scripts/checksyscalls.sh ---- linux-3.4.11/scripts/checksyscalls.sh 2012-03-19 19:47:34.000000000 +0100 -+++ linux-3.4.11-vs2.3.3.8/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 @@ -26051,9 +26109,9 @@ diff -NurpP --minimal linux-3.4.11/scripts/checksyscalls.sh linux-3.4.11-vs2.3.3 EOF } -diff -NurpP --minimal linux-3.4.11/security/commoncap.c linux-3.4.11-vs2.3.3.8/security/commoncap.c ---- linux-3.4.11/security/commoncap.c 2012-05-21 18:07:41.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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) @@ -26086,7 +26144,7 @@ diff -NurpP --minimal linux-3.4.11/security/commoncap.c linux-3.4.11-vs2.3.3.8/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) && @@ -26095,9 +26153,9 @@ diff -NurpP --minimal linux-3.4.11/security/commoncap.c linux-3.4.11-vs2.3.3.8/s return -EPERM; return 0; } -diff -NurpP --minimal linux-3.4.11/security/selinux/hooks.c linux-3.4.11-vs2.3.3.8/security/selinux/hooks.c ---- linux-3.4.11/security/selinux/hooks.c 2012-09-16 20:46:18.000000000 +0200 -+++ linux-3.4.11-vs2.3.3.8/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 <linux/dccp.h> #include <linux/quota.h> |