From 5cb1760b73ac5bae5cfa3b036fc57ed63c88d99e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 11 Jan 2013 13:51:51 +0100 Subject: [PATCH] - updated vserver patch to patch-3.7.1-vs2.3.5.4.diff --- kernel-vserver-2.3.patch | 1684 +++++++++++++++++++------------------- 1 file changed, 853 insertions(+), 831 deletions(-) diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index 402d7682..6bf84d76 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-3.7.1/Documentation/vserver/debug.txt linux-3.7.1-vs2.3.5.3/Documentation/vserver/debug.txt +diff -NurpP --minimal linux-3.7.1/Documentation/vserver/debug.txt linux-3.7.1-vs2.3.5.4/Documentation/vserver/debug.txt --- linux-3.7.1/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/Documentation/vserver/debug.txt 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/Documentation/vserver/debug.txt 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -156,9 +156,9 @@ diff -NurpP --minimal linux-3.7.1/Documentation/vserver/debug.txt linux-3.7.1-vs + m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s" + "vx_acc_pages[%5d,%s,%2d]: %5d += %5d" + "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d" -diff -NurpP --minimal linux-3.7.1/arch/alpha/Kconfig linux-3.7.1-vs2.3.5.3/arch/alpha/Kconfig +diff -NurpP --minimal linux-3.7.1/arch/alpha/Kconfig linux-3.7.1-vs2.3.5.4/arch/alpha/Kconfig --- linux-3.7.1/arch/alpha/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/alpha/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/alpha/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -668,6 +668,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.7.1/arch/alpha/Kconfig linux-3.7.1-vs2.3.5.3/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7.1/arch/alpha/kernel/systbls.S linux-3.7.1-vs2.3.5.3/arch/alpha/kernel/systbls.S +diff -NurpP --minimal linux-3.7.1/arch/alpha/kernel/systbls.S linux-3.7.1-vs2.3.5.4/arch/alpha/kernel/systbls.S --- linux-3.7.1/arch/alpha/kernel/systbls.S 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/alpha/kernel/systbls.S 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/alpha/kernel/systbls.S 2012-12-18 15:13:16.000000000 +0000 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -180,9 +180,9 @@ diff -NurpP --minimal linux-3.7.1/arch/alpha/kernel/systbls.S linux-3.7.1-vs2.3. .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ -diff -NurpP --minimal linux-3.7.1/arch/alpha/kernel/traps.c linux-3.7.1-vs2.3.5.3/arch/alpha/kernel/traps.c +diff -NurpP --minimal linux-3.7.1/arch/alpha/kernel/traps.c linux-3.7.1-vs2.3.5.4/arch/alpha/kernel/traps.c --- linux-3.7.1/arch/alpha/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/alpha/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/alpha/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000 @@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); @@ -193,9 +193,9 @@ diff -NurpP --minimal linux-3.7.1/arch/alpha/kernel/traps.c linux-3.7.1-vs2.3.5. dik_show_regs(regs, r9_15); add_taint(TAINT_DIE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-3.7.1/arch/arm/Kconfig linux-3.7.1-vs2.3.5.3/arch/arm/Kconfig +diff -NurpP --minimal linux-3.7.1/arch/arm/Kconfig linux-3.7.1-vs2.3.5.4/arch/arm/Kconfig --- linux-3.7.1/arch/arm/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/arm/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/arm/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -2307,6 +2307,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -205,9 +205,9 @@ diff -NurpP --minimal linux-3.7.1/arch/arm/Kconfig linux-3.7.1-vs2.3.5.3/arch/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/calls.S linux-3.7.1-vs2.3.5.3/arch/arm/kernel/calls.S +diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/calls.S linux-3.7.1-vs2.3.5.4/arch/arm/kernel/calls.S --- linux-3.7.1/arch/arm/kernel/calls.S 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/arm/kernel/calls.S 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/arm/kernel/calls.S 2012-12-18 15:13:16.000000000 +0000 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -217,9 +217,9 @@ diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/calls.S linux-3.7.1-vs2.3.5.3/ CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/process.c linux-3.7.1-vs2.3.5.3/arch/arm/kernel/process.c +diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/process.c linux-3.7.1-vs2.3.5.4/arch/arm/kernel/process.c --- linux-3.7.1/arch/arm/kernel/process.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/arm/kernel/process.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/arm/kernel/process.c 2012-12-18 15:13:16.000000000 +0000 @@ -337,7 +337,8 @@ void __show_regs(struct pt_regs *regs) void show_regs(struct pt_regs * regs) { @@ -230,9 +230,9 @@ diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/process.c linux-3.7.1-vs2.3.5. __show_regs(regs); dump_stack(); } -diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/traps.c linux-3.7.1-vs2.3.5.3/arch/arm/kernel/traps.c +diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/traps.c linux-3.7.1-vs2.3.5.4/arch/arm/kernel/traps.c --- linux-3.7.1/arch/arm/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/arm/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/arm/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000 @@ -249,8 +249,8 @@ static int __die(const char *str, int er print_modules(); @@ -244,9 +244,9 @@ diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/traps.c linux-3.7.1-vs2.3.5.3/ if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-3.7.1/arch/cris/Kconfig linux-3.7.1-vs2.3.5.3/arch/cris/Kconfig +diff -NurpP --minimal linux-3.7.1/arch/cris/Kconfig linux-3.7.1-vs2.3.5.4/arch/cris/Kconfig --- linux-3.7.1/arch/cris/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/cris/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/cris/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -670,6 +670,8 @@ source "drivers/staging/Kconfig" source "arch/cris/Kconfig.debug" @@ -256,9 +256,9 @@ diff -NurpP --minimal linux-3.7.1/arch/cris/Kconfig linux-3.7.1-vs2.3.5.3/arch/c source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7.1/arch/h8300/Kconfig linux-3.7.1-vs2.3.5.3/arch/h8300/Kconfig +diff -NurpP --minimal linux-3.7.1/arch/h8300/Kconfig linux-3.7.1-vs2.3.5.4/arch/h8300/Kconfig --- linux-3.7.1/arch/h8300/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/h8300/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/h8300/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -217,6 +217,8 @@ source "fs/Kconfig" source "arch/h8300/Kconfig.debug" @@ -268,9 +268,9 @@ diff -NurpP --minimal linux-3.7.1/arch/h8300/Kconfig linux-3.7.1-vs2.3.5.3/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7.1/arch/ia64/Kconfig linux-3.7.1-vs2.3.5.3/arch/ia64/Kconfig +diff -NurpP --minimal linux-3.7.1/arch/ia64/Kconfig linux-3.7.1-vs2.3.5.4/arch/ia64/Kconfig --- linux-3.7.1/arch/ia64/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/ia64/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/ia64/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -644,6 +644,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -280,9 +280,9 @@ diff -NurpP --minimal linux-3.7.1/arch/ia64/Kconfig linux-3.7.1-vs2.3.5.3/arch/i source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/entry.S linux-3.7.1-vs2.3.5.3/arch/ia64/kernel/entry.S +diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/entry.S linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/entry.S --- linux-3.7.1/arch/ia64/kernel/entry.S 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/ia64/kernel/entry.S 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/entry.S 2012-12-18 15:13:16.000000000 +0000 @@ -1714,7 +1714,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr @@ -292,9 +292,9 @@ diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/entry.S linux-3.7.1-vs2.3.5.3 data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/process.c linux-3.7.1-vs2.3.5.3/arch/ia64/kernel/process.c +diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/process.c linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/process.c --- linux-3.7.1/arch/ia64/kernel/process.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/ia64/kernel/process.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/process.c 2012-12-18 15:13:16.000000000 +0000 @@ -111,8 +111,8 @@ show_regs (struct pt_regs *regs) unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; @@ -306,9 +306,9 @@ diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/process.c linux-3.7.1-vs2.3.5 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.7.1/arch/ia64/kernel/ptrace.c linux-3.7.1-vs2.3.5.3/arch/ia64/kernel/ptrace.c +diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/ptrace.c linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/ptrace.c --- linux-3.7.1/arch/ia64/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/ia64/kernel/ptrace.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/ptrace.c 2012-12-18 15:13:16.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -317,9 +317,9 @@ diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/ptrace.c linux-3.7.1-vs2.3.5. #include #include -diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/traps.c linux-3.7.1-vs2.3.5.3/arch/ia64/kernel/traps.c +diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/traps.c linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/traps.c --- linux-3.7.1/arch/ia64/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/ia64/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re put_cpu(); @@ -344,9 +344,9 @@ diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/traps.c linux-3.7.1-vs2.3.5.3 } } } -diff -NurpP --minimal linux-3.7.1/arch/m32r/kernel/traps.c linux-3.7.1-vs2.3.5.3/arch/m32r/kernel/traps.c +diff -NurpP --minimal linux-3.7.1/arch/m32r/kernel/traps.c linux-3.7.1-vs2.3.5.4/arch/m32r/kernel/traps.c --- linux-3.7.1/arch/m32r/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/m32r/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/m32r/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000 @@ -195,8 +195,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); @@ -359,9 +359,9 @@ diff -NurpP --minimal linux-3.7.1/arch/m32r/kernel/traps.c linux-3.7.1-vs2.3.5.3 /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-3.7.1/arch/m68k/Kconfig linux-3.7.1-vs2.3.5.3/arch/m68k/Kconfig +diff -NurpP --minimal linux-3.7.1/arch/m68k/Kconfig linux-3.7.1-vs2.3.5.4/arch/m68k/Kconfig --- linux-3.7.1/arch/m68k/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/m68k/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/m68k/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -135,6 +135,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -371,9 +371,9 @@ diff -NurpP --minimal linux-3.7.1/arch/m68k/Kconfig linux-3.7.1-vs2.3.5.3/arch/m source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7.1/arch/mips/Kconfig linux-3.7.1-vs2.3.5.3/arch/mips/Kconfig +diff -NurpP --minimal linux-3.7.1/arch/mips/Kconfig linux-3.7.1-vs2.3.5.4/arch/mips/Kconfig --- linux-3.7.1/arch/mips/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/mips/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/mips/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -2574,6 +2574,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -383,9 +383,9 @@ diff -NurpP --minimal linux-3.7.1/arch/mips/Kconfig linux-3.7.1-vs2.3.5.3/arch/m source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/ptrace.c linux-3.7.1-vs2.3.5.3/arch/mips/kernel/ptrace.c +diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/ptrace.c linux-3.7.1-vs2.3.5.4/arch/mips/kernel/ptrace.c --- linux-3.7.1/arch/mips/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/mips/kernel/ptrace.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/mips/kernel/ptrace.c 2012-12-18 15:13:16.000000000 +0000 @@ -25,6 +25,7 @@ #include #include @@ -404,9 +404,9 @@ diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/ptrace.c linux-3.7.1-vs2.3.5. 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.7.1/arch/mips/kernel/scall32-o32.S linux-3.7.1-vs2.3.5.3/arch/mips/kernel/scall32-o32.S +diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall32-o32.S linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall32-o32.S --- linux-3.7.1/arch/mips/kernel/scall32-o32.S 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/mips/kernel/scall32-o32.S 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall32-o32.S 2012-12-18 15:13:16.000000000 +0000 @@ -512,7 +512,7 @@ einval: li v0, -ENOSYS sys sys_mq_timedreceive 5 sys sys_mq_notify 2 /* 4275 */ @@ -416,9 +416,9 @@ diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall32-o32.S linux-3.7.1-vs2 sys sys_waitid 5 sys sys_ni_syscall 0 /* available, was setaltroot */ sys sys_add_key 5 /* 4280 */ -diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-64.S linux-3.7.1-vs2.3.5.3/arch/mips/kernel/scall64-64.S +diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-64.S linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall64-64.S --- linux-3.7.1/arch/mips/kernel/scall64-64.S 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/mips/kernel/scall64-64.S 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall64-64.S 2012-12-18 15:13:16.000000000 +0000 @@ -351,7 +351,7 @@ sys_call_table: PTR sys_mq_timedreceive PTR sys_mq_notify @@ -428,9 +428,9 @@ diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-64.S linux-3.7.1-vs2. PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-n32.S linux-3.7.1-vs2.3.5.3/arch/mips/kernel/scall64-n32.S +diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-n32.S linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall64-n32.S --- linux-3.7.1/arch/mips/kernel/scall64-n32.S 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/mips/kernel/scall64-n32.S 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall64-n32.S 2012-12-18 15:13:16.000000000 +0000 @@ -350,7 +350,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify @@ -440,9 +440,9 @@ diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-n32.S linux-3.7.1-vs2 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-o32.S linux-3.7.1-vs2.3.5.3/arch/mips/kernel/scall64-o32.S +diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-o32.S linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall64-o32.S --- linux-3.7.1/arch/mips/kernel/scall64-o32.S 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/mips/kernel/scall64-o32.S 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall64-o32.S 2012-12-18 15:13:16.000000000 +0000 @@ -469,7 +469,7 @@ sys_call_table: PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ @@ -452,9 +452,9 @@ diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-o32.S linux-3.7.1-vs2 PTR sys_32_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/traps.c linux-3.7.1-vs2.3.5.3/arch/mips/kernel/traps.c +diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/traps.c linux-3.7.1-vs2.3.5.4/arch/mips/kernel/traps.c --- linux-3.7.1/arch/mips/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/mips/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/mips/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000 @@ -347,9 +347,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); @@ -469,9 +469,9 @@ diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/traps.c linux-3.7.1-vs2.3.5.3 if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-3.7.1/arch/parisc/Kconfig linux-3.7.1-vs2.3.5.3/arch/parisc/Kconfig +diff -NurpP --minimal linux-3.7.1/arch/parisc/Kconfig linux-3.7.1-vs2.3.5.4/arch/parisc/Kconfig --- linux-3.7.1/arch/parisc/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/parisc/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/parisc/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -284,6 +284,8 @@ source "fs/Kconfig" source "arch/parisc/Kconfig.debug" @@ -481,9 +481,9 @@ diff -NurpP --minimal linux-3.7.1/arch/parisc/Kconfig linux-3.7.1-vs2.3.5.3/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7.1/arch/parisc/kernel/syscall_table.S linux-3.7.1-vs2.3.5.3/arch/parisc/kernel/syscall_table.S +diff -NurpP --minimal linux-3.7.1/arch/parisc/kernel/syscall_table.S linux-3.7.1-vs2.3.5.4/arch/parisc/kernel/syscall_table.S --- linux-3.7.1/arch/parisc/kernel/syscall_table.S 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/parisc/kernel/syscall_table.S 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/parisc/kernel/syscall_table.S 2012-12-18 15:13:16.000000000 +0000 @@ -361,7 +361,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) @@ -493,9 +493,9 @@ diff -NurpP --minimal linux-3.7.1/arch/parisc/kernel/syscall_table.S linux-3.7.1 ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-3.7.1/arch/parisc/kernel/traps.c linux-3.7.1-vs2.3.5.3/arch/parisc/kernel/traps.c +diff -NurpP --minimal linux-3.7.1/arch/parisc/kernel/traps.c linux-3.7.1-vs2.3.5.4/arch/parisc/kernel/traps.c --- linux-3.7.1/arch/parisc/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/parisc/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/parisc/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000 @@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_ if (err == 0) return; /* STFU */ @@ -519,9 +519,9 @@ diff -NurpP --minimal linux-3.7.1/arch/parisc/kernel/traps.c linux-3.7.1-vs2.3.5 /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-3.7.1/arch/parisc/mm/fault.c linux-3.7.1-vs2.3.5.3/arch/parisc/mm/fault.c +diff -NurpP --minimal linux-3.7.1/arch/parisc/mm/fault.c linux-3.7.1-vs2.3.5.4/arch/parisc/mm/fault.c --- linux-3.7.1/arch/parisc/mm/fault.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/parisc/mm/fault.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/parisc/mm/fault.c 2012-12-18 15:13:16.000000000 +0000 @@ -237,8 +237,9 @@ bad_area: #ifdef PRINT_USER_FAULTS @@ -534,9 +534,9 @@ diff -NurpP --minimal linux-3.7.1/arch/parisc/mm/fault.c linux-3.7.1-vs2.3.5.3/a if (vma) { printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", vma->vm_start, vma->vm_end); -diff -NurpP --minimal linux-3.7.1/arch/powerpc/Kconfig linux-3.7.1-vs2.3.5.3/arch/powerpc/Kconfig +diff -NurpP --minimal linux-3.7.1/arch/powerpc/Kconfig linux-3.7.1-vs2.3.5.4/arch/powerpc/Kconfig --- linux-3.7.1/arch/powerpc/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/powerpc/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/powerpc/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -1014,6 +1014,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -546,9 +546,9 @@ diff -NurpP --minimal linux-3.7.1/arch/powerpc/Kconfig linux-3.7.1-vs2.3.5.3/arc source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-3.7.1/arch/powerpc/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.3/arch/powerpc/include/uapi/asm/unistd.h +diff -NurpP --minimal linux-3.7.1/arch/powerpc/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.4/arch/powerpc/include/uapi/asm/unistd.h --- linux-3.7.1/arch/powerpc/include/uapi/asm/unistd.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/powerpc/include/uapi/asm/unistd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/powerpc/include/uapi/asm/unistd.h 2012-12-18 15:13:16.000000000 +0000 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -558,9 +558,9 @@ diff -NurpP --minimal linux-3.7.1/arch/powerpc/include/uapi/asm/unistd.h linux-3 #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-3.7.1/arch/powerpc/kernel/process.c linux-3.7.1-vs2.3.5.3/arch/powerpc/kernel/process.c +diff -NurpP --minimal linux-3.7.1/arch/powerpc/kernel/process.c linux-3.7.1-vs2.3.5.4/arch/powerpc/kernel/process.c --- linux-3.7.1/arch/powerpc/kernel/process.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/powerpc/kernel/process.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/powerpc/kernel/process.c 2012-12-18 15:13:16.000000000 +0000 @@ -660,8 +660,9 @@ void show_regs(struct pt_regs * regs) #else printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr); @@ -573,9 +573,9 @@ diff -NurpP --minimal linux-3.7.1/arch/powerpc/kernel/process.c linux-3.7.1-vs2. #ifdef CONFIG_SMP printk(" CPU: %d", raw_smp_processor_id()); -diff -NurpP --minimal linux-3.7.1/arch/powerpc/kernel/traps.c linux-3.7.1-vs2.3.5.3/arch/powerpc/kernel/traps.c +diff -NurpP --minimal linux-3.7.1/arch/powerpc/kernel/traps.c linux-3.7.1-vs2.3.5.4/arch/powerpc/kernel/traps.c --- linux-3.7.1/arch/powerpc/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/powerpc/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/powerpc/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000 @@ -1120,8 +1120,9 @@ void nonrecoverable_exception(struct pt_ void trace_syscall(struct pt_regs *regs) @@ -588,9 +588,9 @@ diff -NurpP --minimal linux-3.7.1/arch/powerpc/kernel/traps.c linux-3.7.1-vs2.3. regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-3.7.1/arch/s390/Kconfig linux-3.7.1-vs2.3.5.3/arch/s390/Kconfig +diff -NurpP --minimal linux-3.7.1/arch/s390/Kconfig linux-3.7.1-vs2.3.5.4/arch/s390/Kconfig --- linux-3.7.1/arch/s390/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/s390/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/s390/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -530,6 +530,8 @@ source "fs/Kconfig" source "arch/s390/Kconfig.debug" @@ -600,9 +600,9 @@ diff -NurpP --minimal linux-3.7.1/arch/s390/Kconfig linux-3.7.1-vs2.3.5.3/arch/s source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7.1/arch/s390/include/asm/tlb.h linux-3.7.1-vs2.3.5.3/arch/s390/include/asm/tlb.h +diff -NurpP --minimal linux-3.7.1/arch/s390/include/asm/tlb.h linux-3.7.1-vs2.3.5.4/arch/s390/include/asm/tlb.h --- linux-3.7.1/arch/s390/include/asm/tlb.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/s390/include/asm/tlb.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/s390/include/asm/tlb.h 2012-12-18 15:13:16.000000000 +0000 @@ -24,6 +24,7 @@ #include #include @@ -611,9 +611,9 @@ diff -NurpP --minimal linux-3.7.1/arch/s390/include/asm/tlb.h linux-3.7.1-vs2.3. #include #include #include -diff -NurpP --minimal linux-3.7.1/arch/s390/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.3/arch/s390/include/uapi/asm/unistd.h +diff -NurpP --minimal linux-3.7.1/arch/s390/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.4/arch/s390/include/uapi/asm/unistd.h --- linux-3.7.1/arch/s390/include/uapi/asm/unistd.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/s390/include/uapi/asm/unistd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/s390/include/uapi/asm/unistd.h 2012-12-18 15:13:16.000000000 +0000 @@ -200,7 +200,7 @@ #define __NR_clock_gettime (__NR_timer_create+6) #define __NR_clock_getres (__NR_timer_create+7) @@ -623,9 +623,9 @@ diff -NurpP --minimal linux-3.7.1/arch/s390/include/uapi/asm/unistd.h linux-3.7. #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-3.7.1/arch/s390/kernel/ptrace.c linux-3.7.1-vs2.3.5.3/arch/s390/kernel/ptrace.c +diff -NurpP --minimal linux-3.7.1/arch/s390/kernel/ptrace.c linux-3.7.1-vs2.3.5.4/arch/s390/kernel/ptrace.c --- linux-3.7.1/arch/s390/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/s390/kernel/ptrace.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/s390/kernel/ptrace.c 2012-12-18 15:13:16.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -634,9 +634,9 @@ diff -NurpP --minimal linux-3.7.1/arch/s390/kernel/ptrace.c linux-3.7.1-vs2.3.5. #include #include #include -diff -NurpP --minimal linux-3.7.1/arch/s390/kernel/syscalls.S linux-3.7.1-vs2.3.5.3/arch/s390/kernel/syscalls.S +diff -NurpP --minimal linux-3.7.1/arch/s390/kernel/syscalls.S linux-3.7.1-vs2.3.5.4/arch/s390/kernel/syscalls.S --- linux-3.7.1/arch/s390/kernel/syscalls.S 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/s390/kernel/syscalls.S 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/s390/kernel/syscalls.S 2012-12-18 15:13:16.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) @@ -646,9 +646,9 @@ diff -NurpP --minimal linux-3.7.1/arch/s390/kernel/syscalls.S linux-3.7.1-vs2.3. SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper) SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper) SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper) -diff -NurpP --minimal linux-3.7.1/arch/sh/Kconfig linux-3.7.1-vs2.3.5.3/arch/sh/Kconfig +diff -NurpP --minimal linux-3.7.1/arch/sh/Kconfig linux-3.7.1-vs2.3.5.4/arch/sh/Kconfig --- linux-3.7.1/arch/sh/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/sh/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/sh/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -945,6 +945,8 @@ source "fs/Kconfig" source "arch/sh/Kconfig.debug" @@ -658,9 +658,9 @@ diff -NurpP --minimal linux-3.7.1/arch/sh/Kconfig linux-3.7.1-vs2.3.5.3/arch/sh/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7.1/arch/sh/kernel/irq.c linux-3.7.1-vs2.3.5.3/arch/sh/kernel/irq.c +diff -NurpP --minimal linux-3.7.1/arch/sh/kernel/irq.c linux-3.7.1-vs2.3.5.4/arch/sh/kernel/irq.c --- linux-3.7.1/arch/sh/kernel/irq.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/sh/kernel/irq.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/sh/kernel/irq.c 2012-12-18 15:13:16.000000000 +0000 @@ -14,6 +14,7 @@ #include #include @@ -669,9 +669,9 @@ diff -NurpP --minimal linux-3.7.1/arch/sh/kernel/irq.c linux-3.7.1-vs2.3.5.3/arc #include #include #include -diff -NurpP --minimal linux-3.7.1/arch/sparc/Kconfig linux-3.7.1-vs2.3.5.3/arch/sparc/Kconfig +diff -NurpP --minimal linux-3.7.1/arch/sparc/Kconfig linux-3.7.1-vs2.3.5.4/arch/sparc/Kconfig --- linux-3.7.1/arch/sparc/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/sparc/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/sparc/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -564,6 +564,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -681,9 +681,9 @@ diff -NurpP --minimal linux-3.7.1/arch/sparc/Kconfig linux-3.7.1-vs2.3.5.3/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7.1/arch/sparc/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.3/arch/sparc/include/uapi/asm/unistd.h +diff -NurpP --minimal linux-3.7.1/arch/sparc/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.4/arch/sparc/include/uapi/asm/unistd.h --- linux-3.7.1/arch/sparc/include/uapi/asm/unistd.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/sparc/include/uapi/asm/unistd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/sparc/include/uapi/asm/unistd.h 2012-12-18 15:13:16.000000000 +0000 @@ -332,7 +332,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -693,9 +693,9 @@ diff -NurpP --minimal linux-3.7.1/arch/sparc/include/uapi/asm/unistd.h linux-3.7 #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-3.7.1/arch/sparc/kernel/systbls_32.S linux-3.7.1-vs2.3.5.3/arch/sparc/kernel/systbls_32.S +diff -NurpP --minimal linux-3.7.1/arch/sparc/kernel/systbls_32.S linux-3.7.1-vs2.3.5.4/arch/sparc/kernel/systbls_32.S --- linux-3.7.1/arch/sparc/kernel/systbls_32.S 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/sparc/kernel/systbls_32.S 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/sparc/kernel/systbls_32.S 2012-12-18 15:13:16.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 @@ -705,9 +705,9 @@ diff -NurpP --minimal linux-3.7.1/arch/sparc/kernel/systbls_32.S linux-3.7.1-vs2 /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat -diff -NurpP --minimal linux-3.7.1/arch/sparc/kernel/systbls_64.S linux-3.7.1-vs2.3.5.3/arch/sparc/kernel/systbls_64.S +diff -NurpP --minimal linux-3.7.1/arch/sparc/kernel/systbls_64.S linux-3.7.1-vs2.3.5.4/arch/sparc/kernel/systbls_64.S --- linux-3.7.1/arch/sparc/kernel/systbls_64.S 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/sparc/kernel/systbls_64.S 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/sparc/kernel/systbls_64.S 2012-12-18 15:13:16.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 @@ -726,9 +726,9 @@ diff -NurpP --minimal linux-3.7.1/arch/sparc/kernel/systbls_64.S linux-3.7.1-vs2 /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat -diff -NurpP --minimal linux-3.7.1/arch/um/Kconfig.rest linux-3.7.1-vs2.3.5.3/arch/um/Kconfig.rest +diff -NurpP --minimal linux-3.7.1/arch/um/Kconfig.rest linux-3.7.1-vs2.3.5.4/arch/um/Kconfig.rest --- linux-3.7.1/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/um/Kconfig.rest 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/um/Kconfig.rest 2012-12-18 15:13:16.000000000 +0000 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" source "fs/Kconfig" @@ -738,14 +738,14 @@ diff -NurpP --minimal linux-3.7.1/arch/um/Kconfig.rest linux-3.7.1-vs2.3.5.3/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7.1/arch/um/include/shared/kern_constants.h linux-3.7.1-vs2.3.5.3/arch/um/include/shared/kern_constants.h +diff -NurpP --minimal linux-3.7.1/arch/um/include/shared/kern_constants.h linux-3.7.1-vs2.3.5.4/arch/um/include/shared/kern_constants.h --- linux-3.7.1/arch/um/include/shared/kern_constants.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/um/include/shared/kern_constants.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/um/include/shared/kern_constants.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../include/generated/asm-offsets.h" -diff -NurpP --minimal linux-3.7.1/arch/um/include/shared/user_constants.h linux-3.7.1-vs2.3.5.3/arch/um/include/shared/user_constants.h +diff -NurpP --minimal linux-3.7.1/arch/um/include/shared/user_constants.h linux-3.7.1-vs2.3.5.4/arch/um/include/shared/user_constants.h --- linux-3.7.1/arch/um/include/shared/user_constants.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/um/include/shared/user_constants.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/um/include/shared/user_constants.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,40 @@ +/* + * DO NOT MODIFY. @@ -787,9 +787,9 @@ diff -NurpP --minimal linux-3.7.1/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.7.1/arch/x86/Kconfig linux-3.7.1-vs2.3.5.3/arch/x86/Kconfig +diff -NurpP --minimal linux-3.7.1/arch/x86/Kconfig linux-3.7.1-vs2.3.5.4/arch/x86/Kconfig --- linux-3.7.1/arch/x86/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/x86/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/x86/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -2248,6 +2248,8 @@ source "fs/Kconfig" source "arch/x86/Kconfig.debug" @@ -799,9 +799,9 @@ diff -NurpP --minimal linux-3.7.1/arch/x86/Kconfig linux-3.7.1-vs2.3.5.3/arch/x8 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7.1/arch/x86/syscalls/syscall_32.tbl linux-3.7.1-vs2.3.5.3/arch/x86/syscalls/syscall_32.tbl +diff -NurpP --minimal linux-3.7.1/arch/x86/syscalls/syscall_32.tbl linux-3.7.1-vs2.3.5.4/arch/x86/syscalls/syscall_32.tbl --- linux-3.7.1/arch/x86/syscalls/syscall_32.tbl 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/x86/syscalls/syscall_32.tbl 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/x86/syscalls/syscall_32.tbl 2012-12-18 15:13:16.000000000 +0000 @@ -279,7 +279,7 @@ 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes compat_sys_utimes @@ -811,9 +811,9 @@ diff -NurpP --minimal linux-3.7.1/arch/x86/syscalls/syscall_32.tbl linux-3.7.1-v 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.7.1/arch/x86/syscalls/syscall_64.tbl linux-3.7.1-vs2.3.5.3/arch/x86/syscalls/syscall_64.tbl +diff -NurpP --minimal linux-3.7.1/arch/x86/syscalls/syscall_64.tbl linux-3.7.1-vs2.3.5.4/arch/x86/syscalls/syscall_64.tbl --- linux-3.7.1/arch/x86/syscalls/syscall_64.tbl 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/arch/x86/syscalls/syscall_64.tbl 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/arch/x86/syscalls/syscall_64.tbl 2012-12-18 15:13:16.000000000 +0000 @@ -242,7 +242,7 @@ 233 common epoll_ctl sys_epoll_ctl 234 common tgkill sys_tgkill @@ -823,9 +823,9 @@ diff -NurpP --minimal linux-3.7.1/arch/x86/syscalls/syscall_64.tbl linux-3.7.1-v 237 common mbind sys_mbind 238 common set_mempolicy sys_set_mempolicy 239 common get_mempolicy sys_get_mempolicy -diff -NurpP --minimal linux-3.7.1/drivers/block/Kconfig linux-3.7.1-vs2.3.5.3/drivers/block/Kconfig +diff -NurpP --minimal linux-3.7.1/drivers/block/Kconfig linux-3.7.1-vs2.3.5.4/drivers/block/Kconfig --- linux-3.7.1/drivers/block/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/drivers/block/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/drivers/block/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -291,6 +291,13 @@ config BLK_DEV_CRYPTOLOOP source "drivers/block/drbd/Kconfig" @@ -840,9 +840,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/block/Kconfig linux-3.7.1-vs2.3.5.3/dr config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-3.7.1/drivers/block/Makefile linux-3.7.1-vs2.3.5.3/drivers/block/Makefile +diff -NurpP --minimal linux-3.7.1/drivers/block/Makefile linux-3.7.1-vs2.3.5.4/drivers/block/Makefile --- linux-3.7.1/drivers/block/Makefile 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/drivers/block/Makefile 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/drivers/block/Makefile 2012-12-18 15:13:16.000000000 +0000 @@ -34,6 +34,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o obj-$(CONFIG_VIODASD) += viodasd.o obj-$(CONFIG_BLK_DEV_SX8) += sx8.o @@ -851,9 +851,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/block/Makefile linux-3.7.1-vs2.3.5.3/d obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-3.7.1/drivers/block/loop.c linux-3.7.1-vs2.3.5.3/drivers/block/loop.c +diff -NurpP --minimal linux-3.7.1/drivers/block/loop.c linux-3.7.1-vs2.3.5.4/drivers/block/loop.c --- linux-3.7.1/drivers/block/loop.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/drivers/block/loop.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/drivers/block/loop.c 2012-12-18 15:13:16.000000000 +0000 @@ -76,6 +76,7 @@ #include #include @@ -909,9 +909,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/block/loop.c linux-3.7.1-vs2.3.5.3/dri mutex_lock(&lo->lo_ctl_mutex); lo->lo_refcnt++; mutex_unlock(&lo->lo_ctl_mutex); -diff -NurpP --minimal linux-3.7.1/drivers/block/vroot.c linux-3.7.1-vs2.3.5.3/drivers/block/vroot.c +diff -NurpP --minimal linux-3.7.1/drivers/block/vroot.c linux-3.7.1-vs2.3.5.4/drivers/block/vroot.c --- linux-3.7.1/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/drivers/block/vroot.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/drivers/block/vroot.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,291 @@ +/* + * linux/drivers/block/vroot.c @@ -1204,9 +1204,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/block/vroot.c linux-3.7.1-vs2.3.5.3/dr + +#endif + -diff -NurpP --minimal linux-3.7.1/drivers/infiniband/Kconfig linux-3.7.1-vs2.3.5.3/drivers/infiniband/Kconfig +diff -NurpP --minimal linux-3.7.1/drivers/infiniband/Kconfig linux-3.7.1-vs2.3.5.4/drivers/infiniband/Kconfig --- linux-3.7.1/drivers/infiniband/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/drivers/infiniband/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/drivers/infiniband/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM config INFINIBAND_ADDR_TRANS bool @@ -1216,9 +1216,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/infiniband/Kconfig linux-3.7.1-vs2.3.5 default y source "drivers/infiniband/hw/mthca/Kconfig" -diff -NurpP --minimal linux-3.7.1/drivers/infiniband/core/addr.c linux-3.7.1-vs2.3.5.3/drivers/infiniband/core/addr.c +diff -NurpP --minimal linux-3.7.1/drivers/infiniband/core/addr.c linux-3.7.1-vs2.3.5.4/drivers/infiniband/core/addr.c --- linux-3.7.1/drivers/infiniband/core/addr.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/drivers/infiniband/core/addr.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/drivers/infiniband/core/addr.c 2012-12-18 15:13:16.000000000 +0000 @@ -261,7 +261,7 @@ static int addr6_resolve(struct sockaddr if (ipv6_addr_any(&fl6.saddr)) { @@ -1228,9 +1228,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/infiniband/core/addr.c linux-3.7.1-vs2 if (ret) goto put; -diff -NurpP --minimal linux-3.7.1/drivers/md/dm-ioctl.c linux-3.7.1-vs2.3.5.3/drivers/md/dm-ioctl.c +diff -NurpP --minimal linux-3.7.1/drivers/md/dm-ioctl.c linux-3.7.1-vs2.3.5.4/drivers/md/dm-ioctl.c --- linux-3.7.1/drivers/md/dm-ioctl.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/drivers/md/dm-ioctl.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/drivers/md/dm-ioctl.c 2012-12-18 15:13:16.000000000 +0000 @@ -16,6 +16,7 @@ #include #include @@ -1316,9 +1316,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/md/dm-ioctl.c linux-3.7.1-vs2.3.5.3/dr return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-3.7.1/drivers/md/dm.c linux-3.7.1-vs2.3.5.3/drivers/md/dm.c +diff -NurpP --minimal linux-3.7.1/drivers/md/dm.c linux-3.7.1-vs2.3.5.4/drivers/md/dm.c --- linux-3.7.1/drivers/md/dm.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/drivers/md/dm.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/drivers/md/dm.c 2012-12-18 15:13:16.000000000 +0000 @@ -19,6 +19,7 @@ #include #include @@ -1392,9 +1392,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/md/dm.c linux-3.7.1-vs2.3.5.3/drivers/ md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad_queue; -diff -NurpP --minimal linux-3.7.1/drivers/md/dm.h linux-3.7.1-vs2.3.5.3/drivers/md/dm.h +diff -NurpP --minimal linux-3.7.1/drivers/md/dm.h linux-3.7.1-vs2.3.5.4/drivers/md/dm.h --- linux-3.7.1/drivers/md/dm.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/drivers/md/dm.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/drivers/md/dm.h 2012-12-18 15:13:16.000000000 +0000 @@ -46,6 +46,8 @@ struct dm_dev_internal { struct dm_table; struct dm_md_mempools; @@ -1404,9 +1404,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/md/dm.h linux-3.7.1-vs2.3.5.3/drivers/ /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-3.7.1/drivers/net/tun.c linux-3.7.1-vs2.3.5.3/drivers/net/tun.c +diff -NurpP --minimal linux-3.7.1/drivers/net/tun.c linux-3.7.1-vs2.3.5.4/drivers/net/tun.c --- linux-3.7.1/drivers/net/tun.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/drivers/net/tun.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/drivers/net/tun.c 2012-12-18 15:13:16.000000000 +0000 @@ -64,6 +64,7 @@ #include #include @@ -1476,9 +1476,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/net/tun.c linux-3.7.1-vs2.3.5.3/driver case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-3.7.1/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.7.1-vs2.3.5.3/drivers/staging/csr/csr_wifi_hip_xbv.c +diff -NurpP --minimal linux-3.7.1/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.7.1-vs2.3.5.4/drivers/staging/csr/csr_wifi_hip_xbv.c --- linux-3.7.1/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-12-18 15:13:16.000000000 +0000 @@ -55,7 +55,7 @@ typedef struct { char t_name[4]; @@ -1515,9 +1515,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3 { u8 buf[8]; s32 n; -diff -NurpP --minimal linux-3.7.1/drivers/tty/sysrq.c linux-3.7.1-vs2.3.5.3/drivers/tty/sysrq.c +diff -NurpP --minimal linux-3.7.1/drivers/tty/sysrq.c linux-3.7.1-vs2.3.5.4/drivers/tty/sysrq.c --- linux-3.7.1/drivers/tty/sysrq.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/drivers/tty/sysrq.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/drivers/tty/sysrq.c 2012-12-18 15:13:16.000000000 +0000 @@ -41,6 +41,7 @@ #include #include @@ -1569,9 +1569,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/tty/sysrq.c linux-3.7.1-vs2.3.5.3/driv else retval = -1; return retval; -diff -NurpP --minimal linux-3.7.1/drivers/tty/tty_io.c linux-3.7.1-vs2.3.5.3/drivers/tty/tty_io.c +diff -NurpP --minimal linux-3.7.1/drivers/tty/tty_io.c linux-3.7.1-vs2.3.5.4/drivers/tty/tty_io.c --- linux-3.7.1/drivers/tty/tty_io.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/drivers/tty/tty_io.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/drivers/tty/tty_io.c 2012-12-18 15:13:16.000000000 +0000 @@ -104,6 +104,7 @@ #include @@ -1598,9 +1598,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/tty/tty_io.c linux-3.7.1-vs2.3.5.3/dri if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-3.7.1/fs/attr.c linux-3.7.1-vs2.3.5.3/fs/attr.c +diff -NurpP --minimal linux-3.7.1/fs/attr.c linux-3.7.1-vs2.3.5.4/fs/attr.c --- linux-3.7.1/fs/attr.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/attr.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/attr.c 2012-12-18 15:13:16.000000000 +0000 @@ -15,6 +15,9 @@ #include #include @@ -1641,9 +1641,9 @@ diff -NurpP --minimal linux-3.7.1/fs/attr.c linux-3.7.1-vs2.3.5.3/fs/attr.c if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-3.7.1/fs/block_dev.c linux-3.7.1-vs2.3.5.3/fs/block_dev.c +diff -NurpP --minimal linux-3.7.1/fs/block_dev.c linux-3.7.1-vs2.3.5.4/fs/block_dev.c --- linux-3.7.1/fs/block_dev.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/block_dev.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/block_dev.c 2012-12-18 15:13:16.000000000 +0000 @@ -27,6 +27,7 @@ #include #include @@ -1681,9 +1681,9 @@ diff -NurpP --minimal linux-3.7.1/fs/block_dev.c linux-3.7.1-vs2.3.5.3/fs/block_ if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-3.7.1/fs/btrfs/ctree.h linux-3.7.1-vs2.3.5.3/fs/btrfs/ctree.h +diff -NurpP --minimal linux-3.7.1/fs/btrfs/ctree.h linux-3.7.1-vs2.3.5.4/fs/btrfs/ctree.h --- linux-3.7.1/fs/btrfs/ctree.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/btrfs/ctree.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/btrfs/ctree.h 2012-12-18 15:13:16.000000000 +0000 @@ -692,11 +692,14 @@ struct btrfs_inode_item { /* modification sequence number for NFS */ __le64 sequence; @@ -1736,9 +1736,9 @@ diff -NurpP --minimal linux-3.7.1/fs/btrfs/ctree.h linux-3.7.1-vs2.3.5.3/fs/btrf int btrfs_defrag_file(struct inode *inode, struct file *file, struct btrfs_ioctl_defrag_range_args *range, u64 newer_than, unsigned long max_pages); -diff -NurpP --minimal linux-3.7.1/fs/btrfs/disk-io.c linux-3.7.1-vs2.3.5.3/fs/btrfs/disk-io.c +diff -NurpP --minimal linux-3.7.1/fs/btrfs/disk-io.c linux-3.7.1-vs2.3.5.4/fs/btrfs/disk-io.c --- linux-3.7.1/fs/btrfs/disk-io.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/btrfs/disk-io.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/btrfs/disk-io.c 2012-12-18 15:13:16.000000000 +0000 @@ -2197,6 +2197,9 @@ int open_ctree(struct super_block *sb, goto fail_alloc; } @@ -1749,9 +1749,9 @@ diff -NurpP --minimal linux-3.7.1/fs/btrfs/disk-io.c linux-3.7.1-vs2.3.5.3/fs/bt features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-3.7.1/fs/btrfs/inode.c linux-3.7.1-vs2.3.5.3/fs/btrfs/inode.c +diff -NurpP --minimal linux-3.7.1/fs/btrfs/inode.c linux-3.7.1-vs2.3.5.4/fs/btrfs/inode.c --- linux-3.7.1/fs/btrfs/inode.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/btrfs/inode.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/btrfs/inode.c 2012-12-18 15:13:16.000000000 +0000 @@ -39,6 +39,7 @@ #include #include @@ -1818,9 +1818,9 @@ diff -NurpP --minimal linux-3.7.1/fs/btrfs/inode.c linux-3.7.1-vs2.3.5.3/fs/btrf .get_acl = btrfs_get_acl, }; -diff -NurpP --minimal linux-3.7.1/fs/btrfs/ioctl.c linux-3.7.1-vs2.3.5.3/fs/btrfs/ioctl.c +diff -NurpP --minimal linux-3.7.1/fs/btrfs/ioctl.c linux-3.7.1-vs2.3.5.4/fs/btrfs/ioctl.c --- linux-3.7.1/fs/btrfs/ioctl.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/btrfs/ioctl.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/btrfs/ioctl.c 2012-12-18 15:13:16.000000000 +0000 @@ -74,10 +74,13 @@ static unsigned int btrfs_flags_to_ioctl { unsigned int iflags = 0; @@ -1992,9 +1992,9 @@ diff -NurpP --minimal linux-3.7.1/fs/btrfs/ioctl.c linux-3.7.1-vs2.3.5.3/fs/btrf if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-3.7.1/fs/btrfs/super.c linux-3.7.1-vs2.3.5.3/fs/btrfs/super.c +diff -NurpP --minimal linux-3.7.1/fs/btrfs/super.c linux-3.7.1-vs2.3.5.4/fs/btrfs/super.c --- linux-3.7.1/fs/btrfs/super.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/btrfs/super.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/btrfs/super.c 2012-12-18 15:13:16.000000000 +0000 @@ -312,7 +312,7 @@ enum { Opt_no_space_cache, Opt_recovery, Opt_skip_balance, Opt_check_integrity, Opt_check_integrity_including_extent_data, @@ -2050,9 +2050,9 @@ diff -NurpP --minimal linux-3.7.1/fs/btrfs/super.c linux-3.7.1-vs2.3.5.3/fs/btrf if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) return 0; -diff -NurpP --minimal linux-3.7.1/fs/char_dev.c linux-3.7.1-vs2.3.5.3/fs/char_dev.c +diff -NurpP --minimal linux-3.7.1/fs/char_dev.c linux-3.7.1-vs2.3.5.4/fs/char_dev.c --- linux-3.7.1/fs/char_dev.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/char_dev.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/char_dev.c 2012-12-18 15:13:16.000000000 +0000 @@ -21,6 +21,8 @@ #include #include @@ -2085,9 +2085,9 @@ diff -NurpP --minimal linux-3.7.1/fs/char_dev.c linux-3.7.1-vs2.3.5.3/fs/char_de if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-3.7.1/fs/dcache.c linux-3.7.1-vs2.3.5.3/fs/dcache.c +diff -NurpP --minimal linux-3.7.1/fs/dcache.c linux-3.7.1-vs2.3.5.4/fs/dcache.c --- linux-3.7.1/fs/dcache.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/dcache.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/dcache.c 2012-12-18 15:13:16.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -2139,9 +2139,9 @@ diff -NurpP --minimal linux-3.7.1/fs/dcache.c linux-3.7.1-vs2.3.5.3/fs/dcache.c found = dentry; spin_unlock(&dentry->d_lock); break; -diff -NurpP --minimal linux-3.7.1/fs/devpts/inode.c linux-3.7.1-vs2.3.5.3/fs/devpts/inode.c +diff -NurpP --minimal linux-3.7.1/fs/devpts/inode.c linux-3.7.1-vs2.3.5.4/fs/devpts/inode.c --- linux-3.7.1/fs/devpts/inode.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/devpts/inode.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/devpts/inode.c 2012-12-18 15:13:16.000000000 +0000 @@ -25,6 +25,7 @@ #include #include @@ -2229,9 +2229,9 @@ diff -NurpP --minimal linux-3.7.1/fs/devpts/inode.c linux-3.7.1-vs2.3.5.3/fs/dev inode->i_private = tty; tty->driver_data = inode; -diff -NurpP --minimal linux-3.7.1/fs/ext2/balloc.c linux-3.7.1-vs2.3.5.3/fs/ext2/balloc.c +diff -NurpP --minimal linux-3.7.1/fs/ext2/balloc.c linux-3.7.1-vs2.3.5.4/fs/ext2/balloc.c --- linux-3.7.1/fs/ext2/balloc.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext2/balloc.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext2/balloc.c 2012-12-18 15:13:16.000000000 +0000 @@ -699,7 +699,6 @@ ext2_try_to_allocate(struct super_block start = 0; end = EXT2_BLOCKS_PER_GROUP(sb); @@ -2240,9 +2240,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext2/balloc.c linux-3.7.1-vs2.3.5.3/fs/ext2 BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-3.7.1/fs/ext2/ext2.h linux-3.7.1-vs2.3.5.3/fs/ext2/ext2.h +diff -NurpP --minimal linux-3.7.1/fs/ext2/ext2.h linux-3.7.1-vs2.3.5.4/fs/ext2/ext2.h --- linux-3.7.1/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext2/ext2.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext2/ext2.h 2012-12-18 15:13:16.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) */ @@ -2290,18 +2290,18 @@ diff -NurpP --minimal linux-3.7.1/fs/ext2/ext2.h linux-3.7.1-vs2.3.5.3/fs/ext2/e /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.7.1/fs/ext2/file.c linux-3.7.1-vs2.3.5.3/fs/ext2/file.c +diff -NurpP --minimal linux-3.7.1/fs/ext2/file.c linux-3.7.1-vs2.3.5.4/fs/ext2/file.c --- linux-3.7.1/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext2/file.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext2/file.c 2012-12-18 15:13:16.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.7.1/fs/ext2/ialloc.c linux-3.7.1-vs2.3.5.3/fs/ext2/ialloc.c +diff -NurpP --minimal linux-3.7.1/fs/ext2/ialloc.c linux-3.7.1-vs2.3.5.4/fs/ext2/ialloc.c --- linux-3.7.1/fs/ext2/ialloc.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext2/ialloc.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext2/ialloc.c 2012-12-18 15:13:16.000000000 +0000 @@ -17,6 +17,7 @@ #include #include @@ -2318,9 +2318,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext2/ialloc.c linux-3.7.1-vs2.3.5.3/fs/ext2 } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.7.1/fs/ext2/inode.c linux-3.7.1-vs2.3.5.3/fs/ext2/inode.c +diff -NurpP --minimal linux-3.7.1/fs/ext2/inode.c linux-3.7.1-vs2.3.5.4/fs/ext2/inode.c --- linux-3.7.1/fs/ext2/inode.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext2/inode.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext2/inode.c 2012-12-18 15:13:16.000000000 +0000 @@ -31,6 +31,7 @@ #include #include @@ -2453,9 +2453,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext2/inode.c linux-3.7.1-vs2.3.5.3/fs/ext2/ error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-3.7.1/fs/ext2/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ext2/ioctl.c +diff -NurpP --minimal linux-3.7.1/fs/ext2/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ext2/ioctl.c --- linux-3.7.1/fs/ext2/ioctl.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext2/ioctl.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext2/ioctl.c 2012-12-18 15:13:16.000000000 +0000 @@ -17,6 +17,16 @@ #include @@ -2505,9 +2505,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext2/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ext2/ flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.7.1/fs/ext2/namei.c linux-3.7.1-vs2.3.5.3/fs/ext2/namei.c +diff -NurpP --minimal linux-3.7.1/fs/ext2/namei.c linux-3.7.1-vs2.3.5.4/fs/ext2/namei.c --- linux-3.7.1/fs/ext2/namei.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext2/namei.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext2/namei.c 2012-12-18 15:13:16.000000000 +0000 @@ -32,6 +32,7 @@ #include @@ -2532,9 +2532,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext2/namei.c linux-3.7.1-vs2.3.5.3/fs/ext2/ .get_acl = ext2_get_acl, }; -diff -NurpP --minimal linux-3.7.1/fs/ext2/super.c linux-3.7.1-vs2.3.5.3/fs/ext2/super.c +diff -NurpP --minimal linux-3.7.1/fs/ext2/super.c linux-3.7.1-vs2.3.5.4/fs/ext2/super.c --- linux-3.7.1/fs/ext2/super.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext2/super.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext2/super.c 2012-12-18 15:13:16.000000000 +0000 @@ -395,7 +395,8 @@ enum { Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, @@ -2600,9 +2600,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext2/super.c linux-3.7.1-vs2.3.5.3/fs/ext2/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.7.1/fs/ext3/ext3.h linux-3.7.1-vs2.3.5.3/fs/ext3/ext3.h +diff -NurpP --minimal linux-3.7.1/fs/ext3/ext3.h linux-3.7.1-vs2.3.5.4/fs/ext3/ext3.h --- linux-3.7.1/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext3/ext3.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext3/ext3.h 2012-12-18 15:13:16.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) */ @@ -2654,9 +2654,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext3/ext3.h linux-3.7.1-vs2.3.5.3/fs/ext3/e /* ioctl.c */ extern long ext3_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.7.1/fs/ext3/file.c linux-3.7.1-vs2.3.5.3/fs/ext3/file.c +diff -NurpP --minimal linux-3.7.1/fs/ext3/file.c linux-3.7.1-vs2.3.5.4/fs/ext3/file.c --- linux-3.7.1/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext3/file.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext3/file.c 2012-12-18 15:13:16.000000000 +0000 @@ -76,5 +76,6 @@ const struct inode_operations ext3_file_ #endif .get_acl = ext3_get_acl, @@ -2664,9 +2664,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext3/file.c linux-3.7.1-vs2.3.5.3/fs/ext3/f + .sync_flags = ext3_sync_flags, }; -diff -NurpP --minimal linux-3.7.1/fs/ext3/ialloc.c linux-3.7.1-vs2.3.5.3/fs/ext3/ialloc.c +diff -NurpP --minimal linux-3.7.1/fs/ext3/ialloc.c linux-3.7.1-vs2.3.5.4/fs/ext3/ialloc.c --- linux-3.7.1/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext3/ialloc.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext3/ialloc.c 2012-12-18 15:13:16.000000000 +0000 @@ -14,6 +14,7 @@ #include @@ -2683,9 +2683,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext3/ialloc.c linux-3.7.1-vs2.3.5.3/fs/ext3 } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.7.1/fs/ext3/inode.c linux-3.7.1-vs2.3.5.3/fs/ext3/inode.c +diff -NurpP --minimal linux-3.7.1/fs/ext3/inode.c linux-3.7.1-vs2.3.5.4/fs/ext3/inode.c --- linux-3.7.1/fs/ext3/inode.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext3/inode.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext3/inode.c 2012-12-18 15:13:16.000000000 +0000 @@ -27,6 +27,8 @@ #include #include @@ -2818,9 +2818,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext3/inode.c linux-3.7.1-vs2.3.5.3/fs/ext3/ error = ext3_mark_inode_dirty(handle, inode); ext3_journal_stop(handle); } -diff -NurpP --minimal linux-3.7.1/fs/ext3/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ext3/ioctl.c +diff -NurpP --minimal linux-3.7.1/fs/ext3/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ext3/ioctl.c --- linux-3.7.1/fs/ext3/ioctl.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext3/ioctl.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext3/ioctl.c 2012-12-18 15:13:16.000000000 +0000 @@ -12,6 +12,34 @@ #include #include "ext3.h" @@ -2888,9 +2888,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext3/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ext3/ flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.7.1/fs/ext3/namei.c linux-3.7.1-vs2.3.5.3/fs/ext3/namei.c +diff -NurpP --minimal linux-3.7.1/fs/ext3/namei.c linux-3.7.1-vs2.3.5.4/fs/ext3/namei.c --- linux-3.7.1/fs/ext3/namei.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext3/namei.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext3/namei.c 2012-12-18 15:13:16.000000000 +0000 @@ -25,6 +25,8 @@ */ @@ -2916,9 +2916,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext3/namei.c linux-3.7.1-vs2.3.5.3/fs/ext3/ .get_acl = ext3_get_acl, }; -diff -NurpP --minimal linux-3.7.1/fs/ext3/super.c linux-3.7.1-vs2.3.5.3/fs/ext3/super.c +diff -NurpP --minimal linux-3.7.1/fs/ext3/super.c linux-3.7.1-vs2.3.5.4/fs/ext3/super.c --- linux-3.7.1/fs/ext3/super.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext3/super.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext3/super.c 2012-12-18 15:13:16.000000000 +0000 @@ -816,7 +816,8 @@ enum { Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, @@ -2985,9 +2985,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext3/super.c linux-3.7.1-vs2.3.5.3/fs/ext3/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.7.1/fs/ext4/ext4.h linux-3.7.1-vs2.3.5.3/fs/ext4/ext4.h +diff -NurpP --minimal linux-3.7.1/fs/ext4/ext4.h linux-3.7.1-vs2.3.5.4/fs/ext4/ext4.h --- linux-3.7.1/fs/ext4/ext4.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext4/ext4.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext4/ext4.h 2012-12-18 15:13:16.000000000 +0000 @@ -392,8 +392,12 @@ struct flex_groups { #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ @@ -3034,9 +3034,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext4/ext4.h linux-3.7.1-vs2.3.5.3/fs/ext4/e /* move_extent.c */ extern int ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 start_orig, __u64 start_donor, -diff -NurpP --minimal linux-3.7.1/fs/ext4/file.c linux-3.7.1-vs2.3.5.3/fs/ext4/file.c +diff -NurpP --minimal linux-3.7.1/fs/ext4/file.c linux-3.7.1-vs2.3.5.4/fs/ext4/file.c --- linux-3.7.1/fs/ext4/file.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext4/file.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext4/file.c 2012-12-18 15:13:16.000000000 +0000 @@ -334,5 +334,6 @@ const struct inode_operations ext4_file_ #endif .get_acl = ext4_get_acl, @@ -3044,9 +3044,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext4/file.c linux-3.7.1-vs2.3.5.3/fs/ext4/f + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-3.7.1/fs/ext4/ialloc.c linux-3.7.1-vs2.3.5.3/fs/ext4/ialloc.c +diff -NurpP --minimal linux-3.7.1/fs/ext4/ialloc.c linux-3.7.1-vs2.3.5.4/fs/ext4/ialloc.c --- linux-3.7.1/fs/ext4/ialloc.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext4/ialloc.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext4/ialloc.c 2012-12-18 15:13:16.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -3063,9 +3063,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext4/ialloc.c linux-3.7.1-vs2.3.5.3/fs/ext4 } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.7.1/fs/ext4/inode.c linux-3.7.1-vs2.3.5.3/fs/ext4/inode.c +diff -NurpP --minimal linux-3.7.1/fs/ext4/inode.c linux-3.7.1-vs2.3.5.4/fs/ext4/inode.c --- linux-3.7.1/fs/ext4/inode.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext4/inode.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext4/inode.c 2012-12-18 15:13:16.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -3201,9 +3201,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext4/inode.c linux-3.7.1-vs2.3.5.3/fs/ext4/ error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-3.7.1/fs/ext4/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ext4/ioctl.c +diff -NurpP --minimal linux-3.7.1/fs/ext4/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ext4/ioctl.c --- linux-3.7.1/fs/ext4/ioctl.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext4/ioctl.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext4/ioctl.c 2012-12-18 15:13:16.000000000 +0000 @@ -14,12 +14,40 @@ #include #include @@ -3268,9 +3268,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext4/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ext4/ if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-3.7.1/fs/ext4/namei.c linux-3.7.1-vs2.3.5.3/fs/ext4/namei.c +diff -NurpP --minimal linux-3.7.1/fs/ext4/namei.c linux-3.7.1-vs2.3.5.4/fs/ext4/namei.c --- linux-3.7.1/fs/ext4/namei.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext4/namei.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext4/namei.c 2012-12-18 15:13:16.000000000 +0000 @@ -34,6 +34,7 @@ #include #include @@ -3295,9 +3295,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext4/namei.c linux-3.7.1-vs2.3.5.3/fs/ext4/ }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-3.7.1/fs/ext4/super.c linux-3.7.1-vs2.3.5.3/fs/ext4/super.c +diff -NurpP --minimal linux-3.7.1/fs/ext4/super.c linux-3.7.1-vs2.3.5.4/fs/ext4/super.c --- linux-3.7.1/fs/ext4/super.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ext4/super.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ext4/super.c 2012-12-18 15:13:16.000000000 +0000 @@ -1222,7 +1222,7 @@ enum { Opt_inode_readahead_blks, Opt_journal_ioprio, Opt_dioread_nolock, Opt_dioread_lock, @@ -3363,9 +3363,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext4/super.c linux-3.7.1-vs2.3.5.3/fs/ext4/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.7.1/fs/fcntl.c linux-3.7.1-vs2.3.5.3/fs/fcntl.c +diff -NurpP --minimal linux-3.7.1/fs/fcntl.c linux-3.7.1-vs2.3.5.4/fs/fcntl.c --- linux-3.7.1/fs/fcntl.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/fcntl.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/fcntl.c 2012-12-18 15:13:16.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -3383,9 +3383,9 @@ diff -NurpP --minimal linux-3.7.1/fs/fcntl.c linux-3.7.1-vs2.3.5.3/fs/fcntl.c if (unlikely(f.file->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) -diff -NurpP --minimal linux-3.7.1/fs/file.c linux-3.7.1-vs2.3.5.3/fs/file.c +diff -NurpP --minimal linux-3.7.1/fs/file.c linux-3.7.1-vs2.3.5.4/fs/file.c --- linux-3.7.1/fs/file.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/file.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/file.c 2012-12-18 15:13:16.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -3440,9 +3440,9 @@ diff -NurpP --minimal linux-3.7.1/fs/file.c linux-3.7.1-vs2.3.5.3/fs/file.c return fd; -diff -NurpP --minimal linux-3.7.1/fs/file_table.c linux-3.7.1-vs2.3.5.3/fs/file_table.c +diff -NurpP --minimal linux-3.7.1/fs/file_table.c linux-3.7.1-vs2.3.5.4/fs/file_table.c --- linux-3.7.1/fs/file_table.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/file_table.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/file_table.c 2012-12-18 15:13:16.000000000 +0000 @@ -26,6 +26,8 @@ #include #include @@ -3479,9 +3479,9 @@ diff -NurpP --minimal linux-3.7.1/fs/file_table.c linux-3.7.1-vs2.3.5.3/fs/file_ file_sb_list_del(file); file_free(file); } -diff -NurpP --minimal linux-3.7.1/fs/fs_struct.c linux-3.7.1-vs2.3.5.3/fs/fs_struct.c +diff -NurpP --minimal linux-3.7.1/fs/fs_struct.c linux-3.7.1-vs2.3.5.4/fs/fs_struct.c --- linux-3.7.1/fs/fs_struct.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/fs_struct.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/fs_struct.c 2012-12-18 15:13:16.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -3506,9 +3506,9 @@ diff -NurpP --minimal linux-3.7.1/fs/fs_struct.c linux-3.7.1-vs2.3.5.3/fs/fs_str } return fs; } -diff -NurpP --minimal linux-3.7.1/fs/gfs2/file.c linux-3.7.1-vs2.3.5.3/fs/gfs2/file.c +diff -NurpP --minimal linux-3.7.1/fs/gfs2/file.c linux-3.7.1-vs2.3.5.4/fs/gfs2/file.c --- linux-3.7.1/fs/gfs2/file.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/gfs2/file.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/gfs2/file.c 2012-12-18 15:13:16.000000000 +0000 @@ -143,6 +143,9 @@ static const u32 fsflags_to_gfs2[32] = { [12] = GFS2_DIF_EXHASH, [14] = GFS2_DIF_INHERIT_JDATA, @@ -3631,9 +3631,9 @@ diff -NurpP --minimal linux-3.7.1/fs/gfs2/file.c linux-3.7.1-vs2.3.5.3/fs/gfs2/f static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-3.7.1/fs/gfs2/inode.h linux-3.7.1-vs2.3.5.3/fs/gfs2/inode.h +diff -NurpP --minimal linux-3.7.1/fs/gfs2/inode.h linux-3.7.1-vs2.3.5.4/fs/gfs2/inode.h --- linux-3.7.1/fs/gfs2/inode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/gfs2/inode.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/gfs2/inode.h 2012-12-18 15:13:16.000000000 +0000 @@ -117,6 +117,7 @@ extern const struct file_operations gfs2 extern const struct file_operations gfs2_dir_fops_nolock; @@ -3642,9 +3642,9 @@ diff -NurpP --minimal linux-3.7.1/fs/gfs2/inode.h linux-3.7.1-vs2.3.5.3/fs/gfs2/ #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-3.7.1/fs/hostfs/hostfs.h linux-3.7.1-vs2.3.5.3/fs/hostfs/hostfs.h +diff -NurpP --minimal linux-3.7.1/fs/hostfs/hostfs.h linux-3.7.1-vs2.3.5.4/fs/hostfs/hostfs.h --- linux-3.7.1/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/hostfs/hostfs.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/hostfs/hostfs.h 2012-12-18 15:13:16.000000000 +0000 @@ -42,6 +42,7 @@ struct hostfs_iattr { unsigned short ia_mode; uid_t ia_uid; @@ -3653,9 +3653,9 @@ diff -NurpP --minimal linux-3.7.1/fs/hostfs/hostfs.h linux-3.7.1-vs2.3.5.3/fs/ho loff_t ia_size; struct timespec ia_atime; struct timespec ia_mtime; -diff -NurpP --minimal linux-3.7.1/fs/inode.c linux-3.7.1-vs2.3.5.3/fs/inode.c +diff -NurpP --minimal linux-3.7.1/fs/inode.c linux-3.7.1-vs2.3.5.4/fs/inode.c --- linux-3.7.1/fs/inode.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/inode.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/inode.c 2012-12-18 15:13:16.000000000 +0000 @@ -17,6 +17,7 @@ #include #include /* for inode_has_buffers */ @@ -3718,9 +3718,9 @@ diff -NurpP --minimal linux-3.7.1/fs/inode.c linux-3.7.1-vs2.3.5.3/fs/inode.c } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-3.7.1/fs/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ioctl.c +diff -NurpP --minimal linux-3.7.1/fs/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ioctl.c --- linux-3.7.1/fs/ioctl.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ioctl.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ioctl.c 2012-12-18 15:13:16.000000000 +0000 @@ -15,6 +15,9 @@ #include #include @@ -3731,9 +3731,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ioctl.c #include -diff -NurpP --minimal linux-3.7.1/fs/ioprio.c linux-3.7.1-vs2.3.5.3/fs/ioprio.c +diff -NurpP --minimal linux-3.7.1/fs/ioprio.c linux-3.7.1-vs2.3.5.4/fs/ioprio.c --- linux-3.7.1/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ioprio.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ioprio.c 2012-12-18 15:13:16.000000000 +0000 @@ -28,6 +28,7 @@ #include #include @@ -3760,9 +3760,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ioprio.c linux-3.7.1-vs2.3.5.3/fs/ioprio.c tmpio = get_task_ioprio(p); if (tmpio < 0) continue; -diff -NurpP --minimal linux-3.7.1/fs/jfs/file.c linux-3.7.1-vs2.3.5.3/fs/jfs/file.c +diff -NurpP --minimal linux-3.7.1/fs/jfs/file.c linux-3.7.1-vs2.3.5.4/fs/jfs/file.c --- linux-3.7.1/fs/jfs/file.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/jfs/file.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/jfs/file.c 2012-12-18 15:13:16.000000000 +0000 @@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s if (is_quota_modification(inode, iattr)) dquot_initialize(inode); @@ -3781,9 +3781,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/file.c linux-3.7.1-vs2.3.5.3/fs/jfs/fil }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-3.7.1/fs/jfs/ioctl.c linux-3.7.1-vs2.3.5.3/fs/jfs/ioctl.c +diff -NurpP --minimal linux-3.7.1/fs/jfs/ioctl.c linux-3.7.1-vs2.3.5.4/fs/jfs/ioctl.c --- linux-3.7.1/fs/jfs/ioctl.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/jfs/ioctl.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/jfs/ioctl.c 2012-12-18 15:13:16.000000000 +0000 @@ -12,6 +12,7 @@ #include #include @@ -3841,9 +3841,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/ioctl.c linux-3.7.1-vs2.3.5.3/fs/jfs/io flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_dinode.h linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_dinode.h +diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_dinode.h linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_dinode.h --- linux-3.7.1/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_dinode.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_dinode.h 2012-12-18 15:13:16.000000000 +0000 @@ -161,9 +161,13 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ @@ -3860,9 +3860,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_dinode.h linux-3.7.1-vs2.3.5.3/fs/j #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_filsys.h linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_filsys.h +diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_filsys.h linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_filsys.h --- linux-3.7.1/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_filsys.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_filsys.h 2012-12-18 15:13:16.000000000 +0000 @@ -266,6 +266,7 @@ #define JFS_NAME_MAX 255 #define JFS_PATH_MAX BPSIZE @@ -3871,9 +3871,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_filsys.h linux-3.7.1-vs2.3.5.3/fs/j /* * file system state (superblock state) -diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_imap.c linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_imap.c +diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_imap.c linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_imap.c --- linux-3.7.1/fs/jfs/jfs_imap.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_imap.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_imap.c 2012-12-18 15:13:16.000000000 +0000 @@ -46,6 +46,7 @@ #include #include @@ -3938,9 +3938,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_imap.c linux-3.7.1-vs2.3.5.3/fs/jfs jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_inode.c linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_inode.c +diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_inode.c linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_inode.c --- linux-3.7.1/fs/jfs/jfs_inode.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_inode.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_inode.c 2012-12-18 15:13:16.000000000 +0000 @@ -18,6 +18,7 @@ #include @@ -4014,9 +4014,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_inode.c linux-3.7.1-vs2.3.5.3/fs/jf } /* -diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_inode.h linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_inode.h +diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_inode.h linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_inode.h --- linux-3.7.1/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_inode.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_inode.h 2012-12-18 15:13:16.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); @@ -4025,9 +4025,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_inode.h linux-3.7.1-vs2.3.5.3/fs/jf extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int); extern int jfs_setattr(struct dentry *, struct iattr *); -diff -NurpP --minimal linux-3.7.1/fs/jfs/namei.c linux-3.7.1-vs2.3.5.3/fs/jfs/namei.c +diff -NurpP --minimal linux-3.7.1/fs/jfs/namei.c linux-3.7.1-vs2.3.5.4/fs/jfs/namei.c --- linux-3.7.1/fs/jfs/namei.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/jfs/namei.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/jfs/namei.c 2012-12-18 15:13:16.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -4052,9 +4052,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/namei.c linux-3.7.1-vs2.3.5.3/fs/jfs/na }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-3.7.1/fs/jfs/super.c linux-3.7.1-vs2.3.5.3/fs/jfs/super.c +diff -NurpP --minimal linux-3.7.1/fs/jfs/super.c linux-3.7.1-vs2.3.5.4/fs/jfs/super.c --- linux-3.7.1/fs/jfs/super.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/jfs/super.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/jfs/super.c 2012-12-18 15:13:16.000000000 +0000 @@ -199,7 +199,8 @@ enum { Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota, @@ -4121,9 +4121,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/super.c linux-3.7.1-vs2.3.5.3/fs/jfs/su if (newLVSize) { pr_err("resize option for remount only\n"); -diff -NurpP --minimal linux-3.7.1/fs/libfs.c linux-3.7.1-vs2.3.5.3/fs/libfs.c +diff -NurpP --minimal linux-3.7.1/fs/libfs.c linux-3.7.1-vs2.3.5.4/fs/libfs.c --- linux-3.7.1/fs/libfs.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/libfs.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/libfs.c 2012-12-18 15:13:16.000000000 +0000 @@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru * both impossible due to the lock on directory. */ @@ -4169,9 +4169,9 @@ diff -NurpP --minimal linux-3.7.1/fs/libfs.c linux-3.7.1-vs2.3.5.3/fs/libfs.c EXPORT_SYMBOL(generic_read_dir); EXPORT_SYMBOL(mount_pseudo); EXPORT_SYMBOL(simple_write_begin); -diff -NurpP --minimal linux-3.7.1/fs/locks.c linux-3.7.1-vs2.3.5.3/fs/locks.c +diff -NurpP --minimal linux-3.7.1/fs/locks.c linux-3.7.1-vs2.3.5.4/fs/locks.c --- linux-3.7.1/fs/locks.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/locks.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/locks.c 2012-12-18 15:13:16.000000000 +0000 @@ -126,6 +126,8 @@ #include #include @@ -4369,9 +4369,9 @@ diff -NurpP --minimal linux-3.7.1/fs/locks.c linux-3.7.1-vs2.3.5.3/fs/locks.c return 0; } -diff -NurpP --minimal linux-3.7.1/fs/mount.h linux-3.7.1-vs2.3.5.3/fs/mount.h +diff -NurpP --minimal linux-3.7.1/fs/mount.h linux-3.7.1-vs2.3.5.4/fs/mount.h --- linux-3.7.1/fs/mount.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/mount.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/mount.h 2012-12-18 15:13:16.000000000 +0000 @@ -46,6 +46,7 @@ struct mount { int mnt_expiry_mark; /* true if marked for expiry */ int mnt_pinned; @@ -4380,9 +4380,9 @@ diff -NurpP --minimal linux-3.7.1/fs/mount.h linux-3.7.1-vs2.3.5.3/fs/mount.h }; #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */ -diff -NurpP --minimal linux-3.7.1/fs/namei.c linux-3.7.1-vs2.3.5.3/fs/namei.c +diff -NurpP --minimal linux-3.7.1/fs/namei.c linux-3.7.1-vs2.3.5.4/fs/namei.c --- linux-3.7.1/fs/namei.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/namei.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/namei.c 2012-12-18 15:13:16.000000000 +0000 @@ -34,6 +34,14 @@ #include #include @@ -4930,9 +4930,9 @@ diff -NurpP --minimal linux-3.7.1/fs/namei.c linux-3.7.1-vs2.3.5.3/fs/namei.c EXPORT_SYMBOL(dentry_unhash); EXPORT_SYMBOL(generic_readlink); +EXPORT_SYMBOL(vx_info_mnt_namespace); -diff -NurpP --minimal linux-3.7.1/fs/namespace.c linux-3.7.1-vs2.3.5.3/fs/namespace.c +diff -NurpP --minimal linux-3.7.1/fs/namespace.c linux-3.7.1-vs2.3.5.4/fs/namespace.c --- linux-3.7.1/fs/namespace.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/namespace.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/namespace.c 2012-12-18 15:13:16.000000000 +0000 @@ -20,6 +20,11 @@ #include /* get_fs_root et.al. */ #include /* fsnotify_vfsmount_delete */ @@ -5119,9 +5119,9 @@ diff -NurpP --minimal linux-3.7.1/fs/namespace.c linux-3.7.1-vs2.3.5.3/fs/namesp kfree(ns); } -diff -NurpP --minimal linux-3.7.1/fs/nfs/client.c linux-3.7.1-vs2.3.5.3/fs/nfs/client.c +diff -NurpP --minimal linux-3.7.1/fs/nfs/client.c linux-3.7.1-vs2.3.5.4/fs/nfs/client.c --- linux-3.7.1/fs/nfs/client.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/nfs/client.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/nfs/client.c 2012-12-18 15:13:16.000000000 +0000 @@ -684,6 +684,9 @@ int nfs_init_server_rpcclient(struct nfs if (server->flags & NFS_MOUNT_SOFT) server->client->cl_softrtry = 1; @@ -5143,9 +5143,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfs/client.c linux-3.7.1-vs2.3.5.3/fs/nfs/c server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-3.7.1/fs/nfs/dir.c linux-3.7.1-vs2.3.5.3/fs/nfs/dir.c +diff -NurpP --minimal linux-3.7.1/fs/nfs/dir.c linux-3.7.1-vs2.3.5.4/fs/nfs/dir.c --- linux-3.7.1/fs/nfs/dir.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/nfs/dir.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/nfs/dir.c 2012-12-18 15:13:16.000000000 +0000 @@ -36,6 +36,7 @@ #include #include @@ -5162,9 +5162,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfs/dir.c linux-3.7.1-vs2.3.5.3/fs/nfs/dir. no_entry: res = d_materialise_unique(dentry, inode); if (res != NULL) { -diff -NurpP --minimal linux-3.7.1/fs/nfs/inode.c linux-3.7.1-vs2.3.5.3/fs/nfs/inode.c +diff -NurpP --minimal linux-3.7.1/fs/nfs/inode.c linux-3.7.1-vs2.3.5.4/fs/nfs/inode.c --- linux-3.7.1/fs/nfs/inode.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/nfs/inode.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/nfs/inode.c 2012-12-18 15:13:16.000000000 +0000 @@ -39,6 +39,7 @@ #include #include @@ -5314,9 +5314,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfs/inode.c linux-3.7.1-vs2.3.5.3/fs/nfs/in if (fattr->valid & NFS_ATTR_FATTR_NLINK) { if (inode->i_nlink != fattr->nlink) { invalid |= NFS_INO_INVALID_ATTR; -diff -NurpP --minimal linux-3.7.1/fs/nfs/nfs3xdr.c linux-3.7.1-vs2.3.5.3/fs/nfs/nfs3xdr.c +diff -NurpP --minimal linux-3.7.1/fs/nfs/nfs3xdr.c linux-3.7.1-vs2.3.5.4/fs/nfs/nfs3xdr.c --- linux-3.7.1/fs/nfs/nfs3xdr.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/nfs/nfs3xdr.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/nfs/nfs3xdr.c 2012-12-18 15:13:16.000000000 +0000 @@ -20,6 +20,7 @@ #include #include @@ -5462,9 +5462,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfs/nfs3xdr.c linux-3.7.1-vs2.3.5.3/fs/nfs/ } /* -diff -NurpP --minimal linux-3.7.1/fs/nfs/super.c linux-3.7.1-vs2.3.5.3/fs/nfs/super.c +diff -NurpP --minimal linux-3.7.1/fs/nfs/super.c linux-3.7.1-vs2.3.5.4/fs/nfs/super.c --- linux-3.7.1/fs/nfs/super.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/nfs/super.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/nfs/super.c 2012-12-18 15:13:16.000000000 +0000 @@ -55,6 +55,7 @@ #include #include @@ -5538,9 +5538,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfs/super.c linux-3.7.1-vs2.3.5.3/fs/nfs/su /* * options that take text values -diff -NurpP --minimal linux-3.7.1/fs/nfsd/auth.c linux-3.7.1-vs2.3.5.3/fs/nfsd/auth.c +diff -NurpP --minimal linux-3.7.1/fs/nfsd/auth.c linux-3.7.1-vs2.3.5.4/fs/nfsd/auth.c --- linux-3.7.1/fs/nfsd/auth.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/nfsd/auth.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/nfsd/auth.c 2012-12-18 15:13:16.000000000 +0000 @@ -2,6 +2,7 @@ #include @@ -5559,9 +5559,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfsd/auth.c linux-3.7.1-vs2.3.5.3/fs/nfsd/a rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfs3xdr.c linux-3.7.1-vs2.3.5.3/fs/nfsd/nfs3xdr.c +diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfs3xdr.c linux-3.7.1-vs2.3.5.4/fs/nfsd/nfs3xdr.c --- linux-3.7.1/fs/nfsd/nfs3xdr.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/nfsd/nfs3xdr.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/nfsd/nfs3xdr.c 2012-12-18 15:13:16.000000000 +0000 @@ -7,6 +7,7 @@ */ @@ -5612,9 +5612,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfs3xdr.c linux-3.7.1-vs2.3.5.3/fs/nfs if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfs4xdr.c linux-3.7.1-vs2.3.5.3/fs/nfsd/nfs4xdr.c +diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfs4xdr.c linux-3.7.1-vs2.3.5.4/fs/nfsd/nfs4xdr.c --- linux-3.7.1/fs/nfsd/nfs4xdr.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/nfsd/nfs4xdr.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/nfsd/nfs4xdr.c 2012-12-18 15:13:16.000000000 +0000 @@ -46,6 +46,7 @@ #include #include @@ -5644,9 +5644,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfs4xdr.c linux-3.7.1-vs2.3.5.3/fs/nfs if (status == nfserr_resource) goto out_resource; if (status) -diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfsxdr.c linux-3.7.1-vs2.3.5.3/fs/nfsd/nfsxdr.c +diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfsxdr.c linux-3.7.1-vs2.3.5.4/fs/nfsd/nfsxdr.c --- linux-3.7.1/fs/nfsd/nfsxdr.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/nfsd/nfsxdr.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/nfsd/nfsxdr.c 2012-12-18 15:13:16.000000000 +0000 @@ -6,6 +6,7 @@ #include "xdr.h" @@ -5695,9 +5695,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfsxdr.c linux-3.7.1-vs2.3.5.3/fs/nfsd if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-3.7.1/fs/ocfs2/dlmglue.c linux-3.7.1-vs2.3.5.3/fs/ocfs2/dlmglue.c +diff -NurpP --minimal linux-3.7.1/fs/ocfs2/dlmglue.c linux-3.7.1-vs2.3.5.4/fs/ocfs2/dlmglue.c --- linux-3.7.1/fs/ocfs2/dlmglue.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ocfs2/dlmglue.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/dlmglue.c 2012-12-18 15:13:16.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); @@ -5714,9 +5714,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/dlmglue.c linux-3.7.1-vs2.3.5.3/fs/oc inode->i_mode = be16_to_cpu(lvb->lvb_imode); set_nlink(inode, be16_to_cpu(lvb->lvb_inlink)); ocfs2_unpack_timespec(&inode->i_atime, -diff -NurpP --minimal linux-3.7.1/fs/ocfs2/dlmglue.h linux-3.7.1-vs2.3.5.3/fs/ocfs2/dlmglue.h +diff -NurpP --minimal linux-3.7.1/fs/ocfs2/dlmglue.h linux-3.7.1-vs2.3.5.4/fs/ocfs2/dlmglue.h --- linux-3.7.1/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ocfs2/dlmglue.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/dlmglue.h 2012-12-18 15:13:16.000000000 +0000 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { __be16 lvb_inlink; __be32 lvb_iattr; @@ -5727,9 +5727,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/dlmglue.h linux-3.7.1-vs2.3.5.3/fs/oc }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-3.7.1/fs/ocfs2/file.c linux-3.7.1-vs2.3.5.3/fs/ocfs2/file.c +diff -NurpP --minimal linux-3.7.1/fs/ocfs2/file.c linux-3.7.1-vs2.3.5.4/fs/ocfs2/file.c --- linux-3.7.1/fs/ocfs2/file.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ocfs2/file.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/file.c 2012-12-18 15:13:16.000000000 +0000 @@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry, attr->ia_valid &= ~ATTR_SIZE; @@ -5739,9 +5739,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/file.c linux-3.7.1-vs2.3.5.3/fs/ocfs2 if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-3.7.1/fs/ocfs2/inode.c linux-3.7.1-vs2.3.5.3/fs/ocfs2/inode.c +diff -NurpP --minimal linux-3.7.1/fs/ocfs2/inode.c linux-3.7.1-vs2.3.5.4/fs/ocfs2/inode.c --- linux-3.7.1/fs/ocfs2/inode.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ocfs2/inode.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/inode.c 2012-12-18 15:13:16.000000000 +0000 @@ -28,6 +28,7 @@ #include #include @@ -5838,9 +5838,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/inode.c linux-3.7.1-vs2.3.5.3/fs/ocfs /* Fast symlinks will have i_size but no allocated clusters. */ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) { -diff -NurpP --minimal linux-3.7.1/fs/ocfs2/inode.h linux-3.7.1-vs2.3.5.3/fs/ocfs2/inode.h +diff -NurpP --minimal linux-3.7.1/fs/ocfs2/inode.h linux-3.7.1-vs2.3.5.4/fs/ocfs2/inode.h --- linux-3.7.1/fs/ocfs2/inode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ocfs2/inode.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/inode.h 2012-12-18 15:13:16.000000000 +0000 @@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i void ocfs2_set_inode_flags(struct inode *inode); @@ -5849,9 +5849,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/inode.h linux-3.7.1-vs2.3.5.3/fs/ocfs static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ocfs2/ioctl.c +diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ocfs2/ioctl.c --- linux-3.7.1/fs/ocfs2/ioctl.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ocfs2/ioctl.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/ioctl.c 2012-12-18 15:13:16.000000000 +0000 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i return status; } @@ -5915,9 +5915,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ocfs long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { struct inode *inode = filp->f_path.dentry->d_inode; -diff -NurpP --minimal linux-3.7.1/fs/ocfs2/namei.c linux-3.7.1-vs2.3.5.3/fs/ocfs2/namei.c +diff -NurpP --minimal linux-3.7.1/fs/ocfs2/namei.c linux-3.7.1-vs2.3.5.4/fs/ocfs2/namei.c --- linux-3.7.1/fs/ocfs2/namei.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ocfs2/namei.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/namei.c 2012-12-18 15:13:16.000000000 +0000 @@ -41,6 +41,7 @@ #include #include @@ -5948,9 +5948,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/namei.c linux-3.7.1-vs2.3.5.3/fs/ocfs fe->i_mode = cpu_to_le16(inode->i_mode); if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev)); -diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ocfs2.h linux-3.7.1-vs2.3.5.3/fs/ocfs2/ocfs2.h +diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ocfs2.h linux-3.7.1-vs2.3.5.4/fs/ocfs2/ocfs2.h --- linux-3.7.1/fs/ocfs2/ocfs2.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ocfs2/ocfs2.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/ocfs2.h 2012-12-18 15:13:16.000000000 +0000 @@ -272,6 +272,7 @@ enum ocfs2_mount_options writes */ OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */ @@ -5959,9 +5959,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ocfs2.h linux-3.7.1-vs2.3.5.3/fs/ocfs }; #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ocfs2_fs.h linux-3.7.1-vs2.3.5.3/fs/ocfs2/ocfs2_fs.h +diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ocfs2_fs.h linux-3.7.1-vs2.3.5.4/fs/ocfs2/ocfs2_fs.h --- linux-3.7.1/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ocfs2/ocfs2_fs.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/ocfs2_fs.h 2012-12-18 15:13:16.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 */ @@ -5974,9 +5974,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ocfs2_fs.h linux-3.7.1-vs2.3.5.3/fs/o #define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */ #define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */ -diff -NurpP --minimal linux-3.7.1/fs/ocfs2/super.c linux-3.7.1-vs2.3.5.3/fs/ocfs2/super.c +diff -NurpP --minimal linux-3.7.1/fs/ocfs2/super.c linux-3.7.1-vs2.3.5.4/fs/ocfs2/super.c --- linux-3.7.1/fs/ocfs2/super.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/ocfs2/super.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/super.c 2012-12-18 15:13:16.000000000 +0000 @@ -185,6 +185,7 @@ enum { Opt_coherency_full, Opt_resv_level, @@ -6040,9 +6040,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/super.c linux-3.7.1-vs2.3.5.3/fs/ocfs default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-3.7.1/fs/open.c linux-3.7.1-vs2.3.5.3/fs/open.c +diff -NurpP --minimal linux-3.7.1/fs/open.c linux-3.7.1-vs2.3.5.4/fs/open.c --- linux-3.7.1/fs/open.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/open.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/open.c 2012-12-18 15:13:16.000000000 +0000 @@ -30,6 +30,11 @@ #include #include @@ -6114,9 +6114,9 @@ diff -NurpP --minimal linux-3.7.1/fs/open.c linux-3.7.1-vs2.3.5.3/fs/open.c error = chown_common(&path, user, group); mnt_drop_write(path.mnt); out_release: -diff -NurpP --minimal linux-3.7.1/fs/proc/array.c linux-3.7.1-vs2.3.5.3/fs/proc/array.c +diff -NurpP --minimal linux-3.7.1/fs/proc/array.c linux-3.7.1-vs2.3.5.4/fs/proc/array.c --- linux-3.7.1/fs/proc/array.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/proc/array.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/proc/array.c 2012-12-18 15:13:16.000000000 +0000 @@ -82,6 +82,8 @@ #include #include @@ -6230,9 +6230,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/array.c linux-3.7.1-vs2.3.5.3/fs/proc/ 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.7.1/fs/proc/base.c linux-3.7.1-vs2.3.5.3/fs/proc/base.c +diff -NurpP --minimal linux-3.7.1/fs/proc/base.c linux-3.7.1-vs2.3.5.4/fs/proc/base.c --- linux-3.7.1/fs/proc/base.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/proc/base.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/proc/base.c 2012-12-18 15:13:16.000000000 +0000 @@ -85,6 +85,8 @@ #include #include @@ -6393,9 +6393,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/base.c linux-3.7.1-vs2.3.5.3/fs/proc/b ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-3.7.1/fs/proc/generic.c linux-3.7.1-vs2.3.5.3/fs/proc/generic.c +diff -NurpP --minimal linux-3.7.1/fs/proc/generic.c linux-3.7.1-vs2.3.5.4/fs/proc/generic.c --- linux-3.7.1/fs/proc/generic.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/proc/generic.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/proc/generic.c 2012-12-18 15:13:16.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -6455,9 +6455,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/generic.c linux-3.7.1-vs2.3.5.3/fs/pro } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-3.7.1/fs/proc/inode.c linux-3.7.1-vs2.3.5.3/fs/proc/inode.c +diff -NurpP --minimal linux-3.7.1/fs/proc/inode.c linux-3.7.1-vs2.3.5.4/fs/proc/inode.c --- linux-3.7.1/fs/proc/inode.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/proc/inode.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/proc/inode.c 2012-12-18 15:13:16.000000000 +0000 @@ -457,6 +457,8 @@ struct inode *proc_get_inode(struct supe inode->i_uid = de->uid; inode->i_gid = de->gid; @@ -6467,9 +6467,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/inode.c linux-3.7.1-vs2.3.5.3/fs/proc/ if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-3.7.1/fs/proc/internal.h linux-3.7.1-vs2.3.5.3/fs/proc/internal.h +diff -NurpP --minimal linux-3.7.1/fs/proc/internal.h linux-3.7.1-vs2.3.5.4/fs/proc/internal.h --- linux-3.7.1/fs/proc/internal.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/proc/internal.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/proc/internal.h 2012-12-18 15:13:16.000000000 +0000 @@ -11,6 +11,8 @@ #include @@ -6507,9 +6507,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/internal.h linux-3.7.1-vs2.3.5.3/fs/pr static inline int proc_fd(struct inode *inode) { return PROC_I(inode)->fd; -diff -NurpP --minimal linux-3.7.1/fs/proc/loadavg.c linux-3.7.1-vs2.3.5.3/fs/proc/loadavg.c +diff -NurpP --minimal linux-3.7.1/fs/proc/loadavg.c linux-3.7.1-vs2.3.5.4/fs/proc/loadavg.c --- linux-3.7.1/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/proc/loadavg.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/proc/loadavg.c 2012-12-18 15:13:16.000000000 +0000 @@ -12,15 +12,27 @@ static int loadavg_proc_show(struct seq_file *m, void *v) @@ -6539,9 +6539,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/loadavg.c linux-3.7.1-vs2.3.5.3/fs/pro task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-3.7.1/fs/proc/meminfo.c linux-3.7.1-vs2.3.5.3/fs/proc/meminfo.c +diff -NurpP --minimal linux-3.7.1/fs/proc/meminfo.c linux-3.7.1-vs2.3.5.4/fs/proc/meminfo.c --- linux-3.7.1/fs/proc/meminfo.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/proc/meminfo.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/proc/meminfo.c 2012-12-18 15:13:16.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; @@ -6552,9 +6552,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/meminfo.c linux-3.7.1-vs2.3.5.3/fs/pro total_swapcache_pages - i.bufferram; if (cached < 0) cached = 0; -diff -NurpP --minimal linux-3.7.1/fs/proc/root.c linux-3.7.1-vs2.3.5.3/fs/proc/root.c +diff -NurpP --minimal linux-3.7.1/fs/proc/root.c linux-3.7.1-vs2.3.5.4/fs/proc/root.c --- linux-3.7.1/fs/proc/root.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/proc/root.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/proc/root.c 2012-12-18 15:13:16.000000000 +0000 @@ -19,9 +19,14 @@ #include #include @@ -6586,9 +6586,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/root.c linux-3.7.1-vs2.3.5.3/fs/proc/r .name = "/proc", }; -diff -NurpP --minimal linux-3.7.1/fs/proc/stat.c linux-3.7.1-vs2.3.5.3/fs/proc/stat.c +diff -NurpP --minimal linux-3.7.1/fs/proc/stat.c linux-3.7.1-vs2.3.5.4/fs/proc/stat.c --- linux-3.7.1/fs/proc/stat.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/proc/stat.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/proc/stat.c 2012-12-18 15:13:16.000000000 +0000 @@ -9,8 +9,10 @@ #include #include @@ -6637,9 +6637,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/stat.c linux-3.7.1-vs2.3.5.3/fs/proc/s /* Copy values here to work around gcc-2.95.3, gcc-2.96 */ user = kcpustat_cpu(i).cpustat[CPUTIME_USER]; nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE]; -diff -NurpP --minimal linux-3.7.1/fs/proc/uptime.c linux-3.7.1-vs2.3.5.3/fs/proc/uptime.c +diff -NurpP --minimal linux-3.7.1/fs/proc/uptime.c linux-3.7.1-vs2.3.5.4/fs/proc/uptime.c --- linux-3.7.1/fs/proc/uptime.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/proc/uptime.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/proc/uptime.c 2012-12-18 15:13:16.000000000 +0000 @@ -5,6 +5,7 @@ #include #include @@ -6659,9 +6659,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/uptime.c linux-3.7.1-vs2.3.5.3/fs/proc seq_printf(m, "%lu.%02lu %lu.%02lu\n", (unsigned long) uptime.tv_sec, (uptime.tv_nsec / (NSEC_PER_SEC / 100)), -diff -NurpP --minimal linux-3.7.1/fs/proc_namespace.c linux-3.7.1-vs2.3.5.3/fs/proc_namespace.c +diff -NurpP --minimal linux-3.7.1/fs/proc_namespace.c linux-3.7.1-vs2.3.5.4/fs/proc_namespace.c --- linux-3.7.1/fs/proc_namespace.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/proc_namespace.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/proc_namespace.c 2012-12-18 15:13:16.000000000 +0000 @@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file { MS_SYNCHRONOUS, ",sync" }, { MS_DIRSYNC, ",dirsync" }, @@ -6777,9 +6777,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc_namespace.c linux-3.7.1-vs2.3.5.3/fs/p /* file system type */ seq_puts(m, "with fstype "); show_type(m, sb); -diff -NurpP --minimal linux-3.7.1/fs/quota/dquot.c linux-3.7.1-vs2.3.5.3/fs/quota/dquot.c +diff -NurpP --minimal linux-3.7.1/fs/quota/dquot.c linux-3.7.1-vs2.3.5.4/fs/quota/dquot.c --- linux-3.7.1/fs/quota/dquot.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/quota/dquot.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/quota/dquot.c 2012-12-18 15:13:16.000000000 +0000 @@ -1582,6 +1582,9 @@ int __dquot_alloc_space(struct inode *in struct dquot **dquots = inode->i_dquot; int reserve = flags & DQUOT_SPACE_RESERVE; @@ -6818,9 +6818,9 @@ diff -NurpP --minimal linux-3.7.1/fs/quota/dquot.c linux-3.7.1-vs2.3.5.3/fs/quot /* First test before acquiring mutex - solves deadlocks when we * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) -diff -NurpP --minimal linux-3.7.1/fs/quota/quota.c linux-3.7.1-vs2.3.5.3/fs/quota/quota.c +diff -NurpP --minimal linux-3.7.1/fs/quota/quota.c linux-3.7.1-vs2.3.5.4/fs/quota/quota.c --- linux-3.7.1/fs/quota/quota.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/quota/quota.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/quota/quota.c 2012-12-18 15:13:16.000000000 +0000 @@ -8,6 +8,7 @@ #include #include @@ -6908,9 +6908,9 @@ diff -NurpP --minimal linux-3.7.1/fs/quota/quota.c linux-3.7.1-vs2.3.5.3/fs/quot if (quotactl_cmd_write(cmd)) sb = get_super_thawed(bdev); else -diff -NurpP --minimal linux-3.7.1/fs/stat.c linux-3.7.1-vs2.3.5.3/fs/stat.c +diff -NurpP --minimal linux-3.7.1/fs/stat.c linux-3.7.1-vs2.3.5.4/fs/stat.c --- linux-3.7.1/fs/stat.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/stat.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/stat.c 2012-12-18 15:13:16.000000000 +0000 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -6919,9 +6919,9 @@ diff -NurpP --minimal linux-3.7.1/fs/stat.c linux-3.7.1-vs2.3.5.3/fs/stat.c stat->rdev = inode->i_rdev; stat->size = i_size_read(inode); stat->atime = inode->i_atime; -diff -NurpP --minimal linux-3.7.1/fs/statfs.c linux-3.7.1-vs2.3.5.3/fs/statfs.c +diff -NurpP --minimal linux-3.7.1/fs/statfs.c linux-3.7.1-vs2.3.5.4/fs/statfs.c --- linux-3.7.1/fs/statfs.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/statfs.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/statfs.c 2012-12-18 15:13:16.000000000 +0000 @@ -7,6 +7,8 @@ #include #include @@ -6940,9 +6940,9 @@ diff -NurpP --minimal linux-3.7.1/fs/statfs.c linux-3.7.1-vs2.3.5.3/fs/statfs.c return retval; } -diff -NurpP --minimal linux-3.7.1/fs/super.c linux-3.7.1-vs2.3.5.3/fs/super.c +diff -NurpP --minimal linux-3.7.1/fs/super.c linux-3.7.1-vs2.3.5.4/fs/super.c --- linux-3.7.1/fs/super.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/super.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/super.c 2012-12-18 15:13:16.000000000 +0000 @@ -34,6 +34,8 @@ #include #include @@ -6966,9 +6966,9 @@ diff -NurpP --minimal linux-3.7.1/fs/super.c linux-3.7.1-vs2.3.5.3/fs/super.c error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-3.7.1/fs/sysfs/mount.c linux-3.7.1-vs2.3.5.3/fs/sysfs/mount.c +diff -NurpP --minimal linux-3.7.1/fs/sysfs/mount.c linux-3.7.1-vs2.3.5.4/fs/sysfs/mount.c --- linux-3.7.1/fs/sysfs/mount.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/sysfs/mount.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/sysfs/mount.c 2012-12-18 15:13:16.000000000 +0000 @@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super sb->s_blocksize = PAGE_CACHE_SIZE; @@ -6978,9 +6978,9 @@ diff -NurpP --minimal linux-3.7.1/fs/sysfs/mount.c linux-3.7.1-vs2.3.5.3/fs/sysf sb->s_op = &sysfs_ops; sb->s_time_gran = 1; -diff -NurpP --minimal linux-3.7.1/fs/utimes.c linux-3.7.1-vs2.3.5.3/fs/utimes.c +diff -NurpP --minimal linux-3.7.1/fs/utimes.c linux-3.7.1-vs2.3.5.4/fs/utimes.c --- linux-3.7.1/fs/utimes.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/utimes.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/utimes.c 2012-12-18 15:13:16.000000000 +0000 @@ -8,6 +8,8 @@ #include #include @@ -7010,9 +7010,9 @@ diff -NurpP --minimal linux-3.7.1/fs/utimes.c linux-3.7.1-vs2.3.5.3/fs/utimes.c if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-3.7.1/fs/xattr.c linux-3.7.1-vs2.3.5.3/fs/xattr.c +diff -NurpP --minimal linux-3.7.1/fs/xattr.c linux-3.7.1-vs2.3.5.4/fs/xattr.c --- linux-3.7.1/fs/xattr.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xattr.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xattr.c 2012-12-18 15:13:16.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -7030,9 +7030,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xattr.c linux-3.7.1-vs2.3.5.3/fs/xattr.c return (mask & MAY_WRITE) ? -EPERM : -ENODATA; return 0; } -diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_dinode.h linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_dinode.h +diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_dinode.h linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_dinode.h --- linux-3.7.1/fs/xfs/xfs_dinode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_dinode.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_dinode.h 2012-12-18 15:13:16.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 */ @@ -7073,9 +7073,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_dinode.h linux-3.7.1-vs2.3.5.3/fs/x +#define XFS_DIVFLAG_COW 0x02 #endif /* __XFS_DINODE_H__ */ -diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_fs.h linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_fs.h +diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_fs.h linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_fs.h --- linux-3.7.1/fs/xfs/xfs_fs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_fs.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_fs.h 2012-12-18 15:13:16.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 */ @@ -7096,9 +7096,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_fs.h linux-3.7.1-vs2.3.5.3/fs/xfs/x __u32 bs_dmevmask; /* DMIG event mask */ __u16 bs_dmstate; /* DMIG state info */ __u16 bs_aextents; /* attribute number of extents */ -diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ialloc.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_ialloc.c +diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ialloc.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_ialloc.c --- linux-3.7.1/fs/xfs/xfs_ialloc.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_ialloc.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_ialloc.c 2012-12-18 15:13:16.000000000 +0000 @@ -37,7 +37,6 @@ #include "xfs_error.h" #include "xfs_bmap.h" @@ -7107,9 +7107,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ialloc.c linux-3.7.1-vs2.3.5.3/fs/x /* * Allocation group level functions. */ -diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_inode.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_inode.c +diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_inode.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_inode.c --- linux-3.7.1/fs/xfs/xfs_inode.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_inode.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_inode.c 2012-12-18 15:13:16.000000000 +0000 @@ -16,6 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -7284,9 +7284,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_inode.c linux-3.7.1-vs2.3.5.3/fs/xf /* Wrap, we never let the log put out DI_MAX_FLUSH */ if (ip->i_d.di_flushiter == DI_MAX_FLUSH) -diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_inode.h linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_inode.h +diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_inode.h linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_inode.h --- linux-3.7.1/fs/xfs/xfs_inode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_inode.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_inode.h 2012-12-18 15:13:16.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 */ @@ -7307,9 +7307,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_inode.h linux-3.7.1-vs2.3.5.3/fs/xf void xfs_idestroy_fork(struct xfs_inode *, int); void xfs_idata_realloc(struct xfs_inode *, int, int); void xfs_iroot_realloc(struct xfs_inode *, int, int); -diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ioctl.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_ioctl.c +diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ioctl.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_ioctl.c --- linux-3.7.1/fs/xfs/xfs_ioctl.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_ioctl.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_ioctl.c 2012-12-18 15:13:16.000000000 +0000 @@ -26,7 +26,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -7378,9 +7378,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ioctl.c linux-3.7.1-vs2.3.5.3/fs/xf return xfs_ioc_setxflags(ip, filp, arg); case XFS_IOC_FSSETDM: { -diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ioctl.h linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_ioctl.h +diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ioctl.h linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_ioctl.h --- linux-3.7.1/fs/xfs/xfs_ioctl.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_ioctl.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_ioctl.h 2012-12-18 15:13:16.000000000 +0000 @@ -70,6 +70,12 @@ xfs_handle_to_dentry( void __user *uhandle, u32 hlen); @@ -7394,9 +7394,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ioctl.h linux-3.7.1-vs2.3.5.3/fs/xf extern long xfs_file_ioctl( struct file *filp, -diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_iops.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_iops.c +diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_iops.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_iops.c --- linux-3.7.1/fs/xfs/xfs_iops.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_iops.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_iops.c 2012-12-18 15:13:16.000000000 +0000 @@ -28,6 +28,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -7472,9 +7472,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_iops.c linux-3.7.1-vs2.3.5.3/fs/xfs switch (inode->i_mode & S_IFMT) { case S_IFBLK: -diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_itable.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_itable.c +diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_itable.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_itable.c --- linux-3.7.1/fs/xfs/xfs_itable.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_itable.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_itable.c 2012-12-18 15:13:16.000000000 +0000 @@ -96,6 +96,7 @@ xfs_bulkstat_one_int( buf->bs_mode = dic->di_mode; buf->bs_uid = dic->di_uid; @@ -7483,9 +7483,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_itable.c linux-3.7.1-vs2.3.5.3/fs/x 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.7.1/fs/xfs/xfs_linux.h linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_linux.h +diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_linux.h linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_linux.h --- linux-3.7.1/fs/xfs/xfs_linux.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_linux.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_linux.h 2012-12-18 15:13:16.000000000 +0000 @@ -121,6 +121,7 @@ #define current_cpu() (raw_smp_processor_id()) @@ -7494,9 +7494,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_linux.h linux-3.7.1-vs2.3.5.3/fs/xf #define current_test_flags(f) (current->flags & (f)) #define current_set_flags_nested(sp, f) \ (*(sp) = current->flags, current->flags |= (f)) -diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_log_recover.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_log_recover.c +diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_log_recover.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_log_recover.c --- linux-3.7.1/fs/xfs/xfs_log_recover.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_log_recover.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_log_recover.c 2012-12-18 15:13:16.000000000 +0000 @@ -2359,7 +2359,8 @@ xlog_recover_inode_pass2( } @@ -7507,9 +7507,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_log_recover.c linux-3.7.1-vs2.3.5.3 /* the rest is in on-disk format */ if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) { -diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_mount.h linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_mount.h +diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_mount.h linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_mount.h --- linux-3.7.1/fs/xfs/xfs_mount.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_mount.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_mount.h 2012-12-18 15:13:16.000000000 +0000 @@ -246,6 +246,7 @@ typedef struct xfs_mount { allocator */ #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */ @@ -7518,9 +7518,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_mount.h linux-3.7.1-vs2.3.5.3/fs/xf /* * Default minimum read and write sizes. -diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_super.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_super.c +diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_super.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_super.c --- linux-3.7.1/fs/xfs/xfs_super.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_super.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_super.c 2012-12-18 15:13:16.000000000 +0000 @@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool; #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */ #define MNTOPT_DISCARD "discard" /* Discard unused blocks */ @@ -7597,9 +7597,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_super.c linux-3.7.1-vs2.3.5.3/fs/xf /* * we must configure the block size in the superblock before we run the * full mount process as the mount process can lookup and cache inodes. -diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_vnodeops.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_vnodeops.c +diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_vnodeops.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_vnodeops.c --- linux-3.7.1/fs/xfs/xfs_vnodeops.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_vnodeops.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_vnodeops.c 2012-12-18 15:13:16.000000000 +0000 @@ -103,6 +103,77 @@ xfs_readlink_bmap( return error; } @@ -7678,9 +7678,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_vnodeops.c linux-3.7.1-vs2.3.5.3/fs int xfs_readlink( xfs_inode_t *ip, -diff -NurpP --minimal linux-3.7.1/include/linux/cred.h linux-3.7.1-vs2.3.5.3/include/linux/cred.h +diff -NurpP --minimal linux-3.7.1/include/linux/cred.h linux-3.7.1-vs2.3.5.4/include/linux/cred.h --- linux-3.7.1/include/linux/cred.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/cred.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/cred.h 2012-12-18 15:13:16.000000000 +0000 @@ -157,6 +157,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 *); @@ -7721,18 +7721,18 @@ diff -NurpP --minimal linux-3.7.1/include/linux/cred.h linux-3.7.1-vs2.3.5.3/inc /** * get_new_cred - Get a reference on a new set of credentials * @cred: The new credentials to reference -diff -NurpP --minimal linux-3.7.1/include/linux/devpts_fs.h linux-3.7.1-vs2.3.5.3/include/linux/devpts_fs.h +diff -NurpP --minimal linux-3.7.1/include/linux/devpts_fs.h linux-3.7.1-vs2.3.5.4/include/linux/devpts_fs.h --- linux-3.7.1/include/linux/devpts_fs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/devpts_fs.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/devpts_fs.h 2012-12-18 15:13:16.000000000 +0000 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc #endif - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/fs.h linux-3.7.1-vs2.3.5.3/include/linux/fs.h +diff -NurpP --minimal linux-3.7.1/include/linux/fs.h linux-3.7.1-vs2.3.5.4/include/linux/fs.h --- linux-3.7.1/include/linux/fs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/fs.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/fs.h 2012-12-18 15:13:16.000000000 +0000 @@ -210,6 +210,7 @@ typedef void (dio_iodone_t)(struct kiocb #define ATTR_KILL_PRIV (1 << 14) #define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */ @@ -7898,9 +7898,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/fs.h linux-3.7.1-vs2.3.5.3/inclu extern int simple_setattr(struct dentry *, struct iattr *); extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *); extern int simple_statfs(struct dentry *, struct kstatfs *); -diff -NurpP --minimal linux-3.7.1/include/linux/init_task.h linux-3.7.1-vs2.3.5.3/include/linux/init_task.h +diff -NurpP --minimal linux-3.7.1/include/linux/init_task.h linux-3.7.1-vs2.3.5.4/include/linux/init_task.h --- linux-3.7.1/include/linux/init_task.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/init_task.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/init_task.h 2012-12-18 15:13:16.000000000 +0000 @@ -210,6 +210,10 @@ extern struct task_group root_task_group INIT_TRACE_RECURSION \ INIT_TASK_RCU_PREEMPT(tsk) \ @@ -7912,9 +7912,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/init_task.h linux-3.7.1-vs2.3.5. } -diff -NurpP --minimal linux-3.7.1/include/linux/ipc.h linux-3.7.1-vs2.3.5.3/include/linux/ipc.h +diff -NurpP --minimal linux-3.7.1/include/linux/ipc.h linux-3.7.1-vs2.3.5.4/include/linux/ipc.h --- linux-3.7.1/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/ipc.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/ipc.h 2012-12-18 15:13:16.000000000 +0000 @@ -16,6 +16,7 @@ struct kern_ipc_perm key_t key; kuid_t uid; @@ -7923,9 +7923,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/ipc.h linux-3.7.1-vs2.3.5.3/incl kuid_t cuid; kgid_t cgid; umode_t mode; -diff -NurpP --minimal linux-3.7.1/include/linux/ipc_namespace.h linux-3.7.1-vs2.3.5.3/include/linux/ipc_namespace.h +diff -NurpP --minimal linux-3.7.1/include/linux/ipc_namespace.h linux-3.7.1-vs2.3.5.4/include/linux/ipc_namespace.h --- linux-3.7.1/include/linux/ipc_namespace.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/ipc_namespace.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/ipc_namespace.h 2012-12-18 15:13:16.000000000 +0000 @@ -133,7 +133,8 @@ static inline int mq_init_ns(struct ipc_ #if defined(CONFIG_IPC_NS) @@ -7952,9 +7952,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/ipc_namespace.h linux-3.7.1-vs2. } static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) -diff -NurpP --minimal linux-3.7.1/include/linux/loop.h linux-3.7.1-vs2.3.5.3/include/linux/loop.h +diff -NurpP --minimal linux-3.7.1/include/linux/loop.h linux-3.7.1-vs2.3.5.4/include/linux/loop.h --- linux-3.7.1/include/linux/loop.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/loop.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/loop.h 2012-12-18 15:13:16.000000000 +0000 @@ -41,6 +41,7 @@ struct loop_device { struct loop_func_table *lo_encryption; __u32 lo_init[2]; @@ -7963,9 +7963,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/loop.h linux-3.7.1-vs2.3.5.3/inc int (*ioctl)(struct loop_device *, int cmd, unsigned long arg); -diff -NurpP --minimal linux-3.7.1/include/linux/memcontrol.h linux-3.7.1-vs2.3.5.3/include/linux/memcontrol.h +diff -NurpP --minimal linux-3.7.1/include/linux/memcontrol.h linux-3.7.1-vs2.3.5.4/include/linux/memcontrol.h --- linux-3.7.1/include/linux/memcontrol.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/memcontrol.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/memcontrol.h 2012-12-18 15:13:16.000000000 +0000 @@ -83,6 +83,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); @@ -7980,9 +7980,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/memcontrol.h linux-3.7.1-vs2.3.5 static inline bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg) { -diff -NurpP --minimal linux-3.7.1/include/linux/mm_types.h linux-3.7.1-vs2.3.5.3/include/linux/mm_types.h +diff -NurpP --minimal linux-3.7.1/include/linux/mm_types.h linux-3.7.1-vs2.3.5.4/include/linux/mm_types.h --- linux-3.7.1/include/linux/mm_types.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/mm_types.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/mm_types.h 2012-12-18 15:13:16.000000000 +0000 @@ -365,6 +365,7 @@ struct mm_struct { /* Architecture-specific MM context */ @@ -7991,9 +7991,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/mm_types.h linux-3.7.1-vs2.3.5.3 unsigned long flags; /* Must use atomic bitops to access the bits */ -diff -NurpP --minimal linux-3.7.1/include/linux/mmzone.h linux-3.7.1-vs2.3.5.3/include/linux/mmzone.h +diff -NurpP --minimal linux-3.7.1/include/linux/mmzone.h linux-3.7.1-vs2.3.5.4/include/linux/mmzone.h --- linux-3.7.1/include/linux/mmzone.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/mmzone.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/mmzone.h 2012-12-18 15:13:16.000000000 +0000 @@ -735,6 +735,13 @@ typedef struct pglist_data { __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\ }) @@ -8008,9 +8008,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/mmzone.h linux-3.7.1-vs2.3.5.3/i #include extern struct mutex zonelists_mutex; -diff -NurpP --minimal linux-3.7.1/include/linux/mount.h linux-3.7.1-vs2.3.5.3/include/linux/mount.h +diff -NurpP --minimal linux-3.7.1/include/linux/mount.h linux-3.7.1-vs2.3.5.4/include/linux/mount.h --- linux-3.7.1/include/linux/mount.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/mount.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/mount.h 2012-12-18 15:13:16.000000000 +0000 @@ -47,6 +47,9 @@ struct mnt_namespace; #define MNT_INTERNAL 0x4000 @@ -8021,9 +8021,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/mount.h linux-3.7.1-vs2.3.5.3/in struct vfsmount { struct dentry *mnt_root; /* root of the mounted tree */ struct super_block *mnt_sb; /* pointer to superblock */ -diff -NurpP --minimal linux-3.7.1/include/linux/net.h linux-3.7.1-vs2.3.5.3/include/linux/net.h +diff -NurpP --minimal linux-3.7.1/include/linux/net.h linux-3.7.1-vs2.3.5.4/include/linux/net.h --- linux-3.7.1/include/linux/net.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/net.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/net.h 2012-12-18 15:13:16.000000000 +0000 @@ -38,6 +38,7 @@ struct net; #define SOCK_PASSCRED 3 #define SOCK_PASSSEC 4 @@ -8032,9 +8032,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/net.h linux-3.7.1-vs2.3.5.3/incl #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-3.7.1/include/linux/netdevice.h linux-3.7.1-vs2.3.5.3/include/linux/netdevice.h +diff -NurpP --minimal linux-3.7.1/include/linux/netdevice.h linux-3.7.1-vs2.3.5.4/include/linux/netdevice.h --- linux-3.7.1/include/linux/netdevice.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/netdevice.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/netdevice.h 2012-12-18 15:13:16.000000000 +0000 @@ -1637,6 +1637,7 @@ extern void netdev_resync_ops(struct ne extern struct net_device *dev_get_by_index(struct net *net, int ifindex); @@ -8043,9 +8043,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/netdevice.h linux-3.7.1-vs2.3.5. 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.7.1/include/linux/nsproxy.h linux-3.7.1-vs2.3.5.3/include/linux/nsproxy.h +diff -NurpP --minimal linux-3.7.1/include/linux/nsproxy.h linux-3.7.1-vs2.3.5.4/include/linux/nsproxy.h --- linux-3.7.1/include/linux/nsproxy.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/nsproxy.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/nsproxy.h 2012-12-18 15:13:16.000000000 +0000 @@ -3,6 +3,7 @@ #include @@ -8095,9 +8095,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/nsproxy.h linux-3.7.1-vs2.3.5.3/ } #endif -diff -NurpP --minimal linux-3.7.1/include/linux/pid.h linux-3.7.1-vs2.3.5.3/include/linux/pid.h +diff -NurpP --minimal linux-3.7.1/include/linux/pid.h linux-3.7.1-vs2.3.5.4/include/linux/pid.h --- linux-3.7.1/include/linux/pid.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/pid.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/pid.h 2012-12-18 15:13:16.000000000 +0000 @@ -8,7 +8,8 @@ enum pid_type PIDTYPE_PID, PIDTYPE_PGID, @@ -8116,9 +8116,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/pid.h linux-3.7.1-vs2.3.5.3/incl pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-3.7.1/include/linux/proc_fs.h linux-3.7.1-vs2.3.5.3/include/linux/proc_fs.h +diff -NurpP --minimal linux-3.7.1/include/linux/proc_fs.h linux-3.7.1-vs2.3.5.4/include/linux/proc_fs.h --- linux-3.7.1/include/linux/proc_fs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/proc_fs.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/proc_fs.h 2012-12-18 15:13:16.000000000 +0000 @@ -54,6 +54,7 @@ struct proc_dir_entry { nlink_t nlink; kuid_t uid; @@ -8154,9 +8154,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/proc_fs.h linux-3.7.1-vs2.3.5.3/ int fd; union proc_op op; struct proc_dir_entry *pde; -diff -NurpP --minimal linux-3.7.1/include/linux/quotaops.h linux-3.7.1-vs2.3.5.3/include/linux/quotaops.h +diff -NurpP --minimal linux-3.7.1/include/linux/quotaops.h linux-3.7.1-vs2.3.5.4/include/linux/quotaops.h --- linux-3.7.1/include/linux/quotaops.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/quotaops.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/quotaops.h 2012-12-18 15:13:16.000000000 +0000 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -8198,9 +8198,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/quotaops.h linux-3.7.1-vs2.3.5.3 } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-3.7.1/include/linux/sched.h linux-3.7.1-vs2.3.5.3/include/linux/sched.h +diff -NurpP --minimal linux-3.7.1/include/linux/sched.h linux-3.7.1-vs2.3.5.4/include/linux/sched.h --- linux-3.7.1/include/linux/sched.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/sched.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/sched.h 2012-12-18 15:13:16.000000000 +0000 @@ -1378,6 +1378,14 @@ struct task_struct { #endif struct seccomp seccomp; @@ -8247,9 +8247,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/sched.h linux-3.7.1-vs2.3.5.3/in } -diff -NurpP --minimal linux-3.7.1/include/linux/shmem_fs.h linux-3.7.1-vs2.3.5.3/include/linux/shmem_fs.h +diff -NurpP --minimal linux-3.7.1/include/linux/shmem_fs.h linux-3.7.1-vs2.3.5.4/include/linux/shmem_fs.h --- linux-3.7.1/include/linux/shmem_fs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/shmem_fs.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/shmem_fs.h 2012-12-18 15:13:16.000000000 +0000 @@ -9,6 +9,9 @@ /* inode in-kernel data */ @@ -8260,9 +8260,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/shmem_fs.h linux-3.7.1-vs2.3.5.3 struct shmem_inode_info { spinlock_t lock; unsigned long flags; -diff -NurpP --minimal linux-3.7.1/include/linux/stat.h linux-3.7.1-vs2.3.5.3/include/linux/stat.h +diff -NurpP --minimal linux-3.7.1/include/linux/stat.h linux-3.7.1-vs2.3.5.4/include/linux/stat.h --- linux-3.7.1/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/stat.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/stat.h 2012-12-18 15:13:16.000000000 +0000 @@ -25,6 +25,7 @@ struct kstat { unsigned int nlink; kuid_t uid; @@ -8271,9 +8271,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/stat.h linux-3.7.1-vs2.3.5.3/inc dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-3.7.1/include/linux/sunrpc/auth.h linux-3.7.1-vs2.3.5.3/include/linux/sunrpc/auth.h +diff -NurpP --minimal linux-3.7.1/include/linux/sunrpc/auth.h linux-3.7.1-vs2.3.5.4/include/linux/sunrpc/auth.h --- linux-3.7.1/include/linux/sunrpc/auth.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/sunrpc/auth.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/sunrpc/auth.h 2012-12-18 15:13:16.000000000 +0000 @@ -25,6 +25,7 @@ struct auth_cred { uid_t uid; @@ -8282,9 +8282,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/sunrpc/auth.h linux-3.7.1-vs2.3. struct group_info *group_info; const char *principal; unsigned char machine_cred : 1; -diff -NurpP --minimal linux-3.7.1/include/linux/sunrpc/clnt.h linux-3.7.1-vs2.3.5.3/include/linux/sunrpc/clnt.h +diff -NurpP --minimal linux-3.7.1/include/linux/sunrpc/clnt.h linux-3.7.1-vs2.3.5.4/include/linux/sunrpc/clnt.h --- linux-3.7.1/include/linux/sunrpc/clnt.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/sunrpc/clnt.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/sunrpc/clnt.h 2012-12-18 15:13:16.000000000 +0000 @@ -49,7 +49,8 @@ struct rpc_clnt { unsigned int cl_softrtry : 1,/* soft timeouts */ cl_discrtry : 1,/* disconnect before retry */ @@ -8295,9 +8295,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/sunrpc/clnt.h linux-3.7.1-vs2.3. struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-3.7.1/include/linux/sysfs.h linux-3.7.1-vs2.3.5.3/include/linux/sysfs.h +diff -NurpP --minimal linux-3.7.1/include/linux/sysfs.h linux-3.7.1-vs2.3.5.4/include/linux/sysfs.h --- linux-3.7.1/include/linux/sysfs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/sysfs.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/sysfs.h 2012-12-18 15:13:16.000000000 +0000 @@ -19,6 +19,8 @@ #include #include @@ -8307,9 +8307,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/sysfs.h linux-3.7.1-vs2.3.5.3/in struct kobject; struct module; enum kobj_ns_type; -diff -NurpP --minimal linux-3.7.1/include/linux/types.h linux-3.7.1-vs2.3.5.3/include/linux/types.h +diff -NurpP --minimal linux-3.7.1/include/linux/types.h linux-3.7.1-vs2.3.5.4/include/linux/types.h --- linux-3.7.1/include/linux/types.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/types.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/types.h 2012-12-18 15:13:16.000000000 +0000 @@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; @@ -8320,9 +8320,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/types.h linux-3.7.1-vs2.3.5.3/in typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-3.7.1/include/linux/uidgid.h linux-3.7.1-vs2.3.5.3/include/linux/uidgid.h +diff -NurpP --minimal linux-3.7.1/include/linux/uidgid.h linux-3.7.1-vs2.3.5.4/include/linux/uidgid.h --- linux-3.7.1/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/uidgid.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/uidgid.h 2012-12-18 15:13:16.000000000 +0000 @@ -23,13 +23,17 @@ typedef struct { uid_t val; } kuid_t; @@ -8442,9 +8442,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/uidgid.h linux-3.7.1-vs2.3.5.3/i static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid) { uid_t uid = from_kuid(to, kuid); -diff -NurpP --minimal linux-3.7.1/include/linux/utsname.h linux-3.7.1-vs2.3.5.3/include/linux/utsname.h +diff -NurpP --minimal linux-3.7.1/include/linux/utsname.h linux-3.7.1-vs2.3.5.4/include/linux/utsname.h --- linux-3.7.1/include/linux/utsname.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/utsname.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/utsname.h 2012-12-18 15:13:16.000000000 +0000 @@ -33,7 +33,8 @@ static inline void get_uts_ns(struct uts } @@ -8471,9 +8471,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/utsname.h linux-3.7.1-vs2.3.5.3/ } #endif -diff -NurpP --minimal linux-3.7.1/include/linux/vroot.h linux-3.7.1-vs2.3.5.3/include/linux/vroot.h +diff -NurpP --minimal linux-3.7.1/include/linux/vroot.h linux-3.7.1-vs2.3.5.4/include/linux/vroot.h --- linux-3.7.1/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vroot.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vroot.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,51 @@ + +/* @@ -8526,9 +8526,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vroot.h linux-3.7.1-vs2.3.5.3/in +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vs_base.h linux-3.7.1-vs2.3.5.3/include/linux/vs_base.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_base.h linux-3.7.1-vs2.3.5.4/include/linux/vs_base.h --- linux-3.7.1/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_base.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_base.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VS_BASE_H +#define _VS_BASE_H @@ -8540,9 +8540,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_base.h linux-3.7.1-vs2.3.5.3/ +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vs_context.h linux-3.7.1-vs2.3.5.3/include/linux/vs_context.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_context.h linux-3.7.1-vs2.3.5.4/include/linux/vs_context.h --- linux-3.7.1/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_context.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_context.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,242 @@ +#ifndef _VS_CONTEXT_H +#define _VS_CONTEXT_H @@ -8786,9 +8786,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_context.h linux-3.7.1-vs2.3.5 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vs_cowbl.h linux-3.7.1-vs2.3.5.3/include/linux/vs_cowbl.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_cowbl.h linux-3.7.1-vs2.3.5.4/include/linux/vs_cowbl.h --- linux-3.7.1/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_cowbl.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_cowbl.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,48 @@ +#ifndef _VS_COWBL_H +#define _VS_COWBL_H @@ -8838,9 +8838,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_cowbl.h linux-3.7.1-vs2.3.5.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vs_cvirt.h linux-3.7.1-vs2.3.5.3/include/linux/vs_cvirt.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_cvirt.h linux-3.7.1-vs2.3.5.4/include/linux/vs_cvirt.h --- linux-3.7.1/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_cvirt.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_cvirt.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,50 @@ +#ifndef _VS_CVIRT_H +#define _VS_CVIRT_H @@ -8892,9 +8892,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_cvirt.h linux-3.7.1-vs2.3.5.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vs_device.h linux-3.7.1-vs2.3.5.3/include/linux/vs_device.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_device.h linux-3.7.1-vs2.3.5.4/include/linux/vs_device.h --- linux-3.7.1/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_device.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_device.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,45 @@ +#ifndef _VS_DEVICE_H +#define _VS_DEVICE_H @@ -8941,9 +8941,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_device.h linux-3.7.1-vs2.3.5. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vs_dlimit.h linux-3.7.1-vs2.3.5.3/include/linux/vs_dlimit.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_dlimit.h linux-3.7.1-vs2.3.5.4/include/linux/vs_dlimit.h --- linux-3.7.1/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_dlimit.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_dlimit.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,215 @@ +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H @@ -9160,10 +9160,10 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_dlimit.h linux-3.7.1-vs2.3.5. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet.h linux-3.7.1-vs2.3.5.3/include/linux/vs_inet.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet.h linux-3.7.1-vs2.3.5.4/include/linux/vs_inet.h --- linux-3.7.1/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_inet.h 2012-12-18 15:13:16.000000000 +0000 -@@ -0,0 +1,362 @@ ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_inet.h 2013-01-04 22:27:45.000000000 +0000 +@@ -0,0 +1,364 @@ +#ifndef _VS_INET_H +#define _VS_INET_H + @@ -9225,6 +9225,7 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet.h linux-3.7.1-vs2.3.5.3/ +int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask) +{ + struct nx_addr_v4 *nxa; ++ unsigned long flags; + int ret = 1; + + if (!nxi) @@ -9249,13 +9250,13 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet.h linux-3.7.1-vs2.3.5.3/ + ret = 5; + + /* check for v4 addresses */ -+ spin_lock(&nxi->addr_lock); ++ spin_lock_irqsave(&nxi->addr_lock, flags); + for (nxa = &nxi->v4; nxa; nxa = nxa->next) + if (v4_addr_match(nxa, addr, tmask)) + goto out_unlock; + ret = 0; +out_unlock: -+ spin_unlock(&nxi->addr_lock); ++ spin_unlock_irqrestore(&nxi->addr_lock, flags); +out: + vxdprintk(VXD_CBIT(net, 0), + "v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d", @@ -9274,15 +9275,16 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet.h linux-3.7.1-vs2.3.5.3/ +int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask) +{ + struct nx_addr_v4 *ptr; ++ unsigned long flags; + int ret = 1; + -+ spin_lock(&nxi->addr_lock); ++ spin_lock_irqsave(&nxi->addr_lock, flags); + for (ptr = &nxi->v4; ptr; ptr = ptr->next) + if (v4_nx_addr_match(ptr, nxa, mask)) + goto out_unlock; + ret = 0; +out_unlock: -+ spin_unlock(&nxi->addr_lock); ++ spin_unlock_irqrestore(&nxi->addr_lock, flags); + return ret; +} + @@ -9526,10 +9528,10 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet.h linux-3.7.1-vs2.3.5.3/ +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet6.h linux-3.7.1-vs2.3.5.3/include/linux/vs_inet6.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet6.h linux-3.7.1-vs2.3.5.4/include/linux/vs_inet6.h --- linux-3.7.1/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_inet6.h 2012-12-18 15:13:16.000000000 +0000 -@@ -0,0 +1,255 @@ ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_inet6.h 2013-01-04 22:28:58.000000000 +0000 +@@ -0,0 +1,257 @@ +#ifndef _VS_INET6_H +#define _VS_INET6_H + @@ -9573,18 +9575,19 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet6.h linux-3.7.1-vs2.3.5.3 + const struct in6_addr *addr, uint16_t mask) +{ + struct nx_addr_v6 *nxa; ++ unsigned long flags; + int ret = 1; + + if (!nxi) + goto out; + -+ spin_lock(&nxi->addr_lock); ++ spin_lock_irqsave(&nxi->addr_lock, flags); + for (nxa = &nxi->v6; nxa; nxa = nxa->next) + if (v6_addr_match(nxa, addr, mask)) + goto out_unlock; + ret = 0; +out_unlock: -+ spin_unlock(&nxi->addr_lock); ++ spin_unlock_irqrestore(&nxi->addr_lock, flags); +out: + vxdprintk(VXD_CBIT(net, 0), + "v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d", @@ -9603,15 +9606,16 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet6.h linux-3.7.1-vs2.3.5.3 +int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask) +{ + struct nx_addr_v6 *ptr; ++ unsigned long flags; + int ret = 1; + -+ spin_lock(&nxi->addr_lock); ++ spin_lock_irqsave(&nxi->addr_lock, flags); + for (ptr = &nxi->v6; ptr; ptr = ptr->next) + if (v6_nx_addr_match(ptr, nxa, mask)) + goto out_unlock; + ret = 0; +out_unlock: -+ spin_unlock(&nxi->addr_lock); ++ spin_unlock_irqrestore(&nxi->addr_lock, flags); + return ret; +} + @@ -9785,9 +9789,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet6.h linux-3.7.1-vs2.3.5.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vs_limit.h linux-3.7.1-vs2.3.5.3/include/linux/vs_limit.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_limit.h linux-3.7.1-vs2.3.5.4/include/linux/vs_limit.h --- linux-3.7.1/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_limit.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_limit.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,140 @@ +#ifndef _VS_LIMIT_H +#define _VS_LIMIT_H @@ -9929,9 +9933,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_limit.h linux-3.7.1-vs2.3.5.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vs_network.h linux-3.7.1-vs2.3.5.3/include/linux/vs_network.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_network.h linux-3.7.1-vs2.3.5.4/include/linux/vs_network.h --- linux-3.7.1/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_network.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_network.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,169 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -10102,9 +10106,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_network.h linux-3.7.1-vs2.3.5 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vs_pid.h linux-3.7.1-vs2.3.5.3/include/linux/vs_pid.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_pid.h linux-3.7.1-vs2.3.5.4/include/linux/vs_pid.h --- linux-3.7.1/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_pid.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_pid.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,50 @@ +#ifndef _VS_PID_H +#define _VS_PID_H @@ -10156,9 +10160,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_pid.h linux-3.7.1-vs2.3.5.3/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vs_sched.h linux-3.7.1-vs2.3.5.3/include/linux/vs_sched.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_sched.h linux-3.7.1-vs2.3.5.4/include/linux/vs_sched.h --- linux-3.7.1/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_sched.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_sched.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,40 @@ +#ifndef _VS_SCHED_H +#define _VS_SCHED_H @@ -10200,9 +10204,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_sched.h linux-3.7.1-vs2.3.5.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vs_socket.h linux-3.7.1-vs2.3.5.3/include/linux/vs_socket.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_socket.h linux-3.7.1-vs2.3.5.4/include/linux/vs_socket.h --- linux-3.7.1/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_socket.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_socket.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,67 @@ +#ifndef _VS_SOCKET_H +#define _VS_SOCKET_H @@ -10271,9 +10275,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_socket.h linux-3.7.1-vs2.3.5. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vs_tag.h linux-3.7.1-vs2.3.5.3/include/linux/vs_tag.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_tag.h linux-3.7.1-vs2.3.5.4/include/linux/vs_tag.h --- linux-3.7.1/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_tag.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_tag.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,47 @@ +#ifndef _VS_TAG_H +#define _VS_TAG_H @@ -10322,9 +10326,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_tag.h linux-3.7.1-vs2.3.5.3/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vs_time.h linux-3.7.1-vs2.3.5.3/include/linux/vs_time.h +diff -NurpP --minimal linux-3.7.1/include/linux/vs_time.h linux-3.7.1-vs2.3.5.4/include/linux/vs_time.h --- linux-3.7.1/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vs_time.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vs_time.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VS_TIME_H +#define _VS_TIME_H @@ -10345,9 +10349,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_time.h linux-3.7.1-vs2.3.5.3/ +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/base.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/base.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/base.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/base.h --- linux-3.7.1/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/base.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/base.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,178 @@ +#ifndef _VSERVER_BASE_H +#define _VSERVER_BASE_H @@ -10527,9 +10531,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/base.h linux-3.7.1-vs2.3 +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/cacct.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct.h --- linux-3.7.1/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/cacct.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,15 @@ +#ifndef _VSERVER_CACCT_H +#define _VSERVER_CACCT_H @@ -10546,9 +10550,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct.h linux-3.7.1-vs2. +}; + +#endif /* _VSERVER_CACCT_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/cacct_cmd.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct_cmd.h --- linux-3.7.1/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/cacct_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VSERVER_CACCT_CMD_H +#define _VSERVER_CACCT_CMD_H @@ -10560,9 +10564,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_cmd.h linux-3.7.1- +extern int vc_sock_stat(struct vx_info *, void __user *); + +#endif /* _VSERVER_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_def.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/cacct_def.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_def.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct_def.h --- linux-3.7.1/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/cacct_def.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct_def.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,43 @@ +#ifndef _VSERVER_CACCT_DEF_H +#define _VSERVER_CACCT_DEF_H @@ -10607,9 +10611,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_def.h linux-3.7.1- +#endif + +#endif /* _VSERVER_CACCT_DEF_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_int.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/cacct_int.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_int.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct_int.h --- linux-3.7.1/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/cacct_int.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct_int.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,17 @@ +#ifndef _VSERVER_CACCT_INT_H +#define _VSERVER_CACCT_INT_H @@ -10628,9 +10632,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_int.h linux-3.7.1- +} + +#endif /* _VSERVER_CACCT_INT_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/check.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/check.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/check.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/check.h --- linux-3.7.1/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/check.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/check.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,89 @@ +#ifndef _VSERVER_CHECK_H +#define _VSERVER_CHECK_H @@ -10721,9 +10725,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/check.h linux-3.7.1-vs2. +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/context.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/context.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/context.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/context.h --- linux-3.7.1/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/context.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/context.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,110 @@ +#ifndef _VSERVER_CONTEXT_H +#define _VSERVER_CONTEXT_H @@ -10835,9 +10839,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/context.h linux-3.7.1-vs + + +#endif /* _VSERVER_CONTEXT_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/context_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/context_cmd.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/context_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/context_cmd.h --- linux-3.7.1/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/context_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/context_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,33 @@ +#ifndef _VSERVER_CONTEXT_CMD_H +#define _VSERVER_CONTEXT_CMD_H @@ -10872,9 +10876,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/context_cmd.h linux-3.7. +extern int vc_set_badness(struct vx_info *, void __user *); + +#endif /* _VSERVER_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/cvirt.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/cvirt.h --- linux-3.7.1/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/cvirt.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/cvirt.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,18 @@ +#ifndef _VSERVER_CVIRT_H +#define _VSERVER_CVIRT_H @@ -10894,9 +10898,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt.h linux-3.7.1-vs2. +int vx_do_syslog(int, char __user *, int); + +#endif /* _VSERVER_CVIRT_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/cvirt_cmd.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/cvirt_cmd.h --- linux-3.7.1/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/cvirt_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/cvirt_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,13 @@ +#ifndef _VSERVER_CVIRT_CMD_H +#define _VSERVER_CVIRT_CMD_H @@ -10911,9 +10915,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt_cmd.h linux-3.7.1- +extern int vc_virt_stat(struct vx_info *, void __user *); + +#endif /* _VSERVER_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt_def.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/cvirt_def.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt_def.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/cvirt_def.h --- linux-3.7.1/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/cvirt_def.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/cvirt_def.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,80 @@ +#ifndef _VSERVER_CVIRT_DEF_H +#define _VSERVER_CVIRT_DEF_H @@ -10995,9 +10999,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt_def.h linux-3.7.1- +#endif + +#endif /* _VSERVER_CVIRT_DEF_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/debug.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/debug.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/debug.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/debug.h --- linux-3.7.1/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/debug.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/debug.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,145 @@ +#ifndef _VSERVER_DEBUG_H +#define _VSERVER_DEBUG_H @@ -11144,9 +11148,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/debug.h linux-3.7.1-vs2. + + +#endif /* _VSERVER_DEBUG_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/debug_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/debug_cmd.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/debug_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/debug_cmd.h --- linux-3.7.1/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/debug_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/debug_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,37 @@ +#ifndef _VSERVER_DEBUG_CMD_H +#define _VSERVER_DEBUG_CMD_H @@ -11185,9 +11189,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/debug_cmd.h linux-3.7.1- +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/device.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/device.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/device.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/device.h --- linux-3.7.1/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/device.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/device.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,9 @@ +#ifndef _VSERVER_DEVICE_H +#define _VSERVER_DEVICE_H @@ -11198,9 +11202,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/device.h linux-3.7.1-vs2 +#else /* _VSERVER_DEVICE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_DEVICE_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/device_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/device_cmd.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/device_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/device_cmd.h --- linux-3.7.1/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/device_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/device_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,31 @@ +#ifndef _VSERVER_DEVICE_CMD_H +#define _VSERVER_DEVICE_CMD_H @@ -11233,9 +11237,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/device_cmd.h linux-3.7.1 +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/device_def.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/device_def.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/device_def.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/device_def.h --- linux-3.7.1/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/device_def.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/device_def.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,17 @@ +#ifndef _VSERVER_DEVICE_DEF_H +#define _VSERVER_DEVICE_DEF_H @@ -11254,9 +11258,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/device_def.h linux-3.7.1 +}; + +#endif /* _VSERVER_DEVICE_DEF_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/dlimit.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/dlimit.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/dlimit.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/dlimit.h --- linux-3.7.1/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/dlimit.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/dlimit.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,54 @@ +#ifndef _VSERVER_DLIMIT_H +#define _VSERVER_DLIMIT_H @@ -11312,9 +11316,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/dlimit.h linux-3.7.1-vs2 +#else /* _VSERVER_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VSERVER_DLIMIT_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/dlimit_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/dlimit_cmd.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/dlimit_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/dlimit_cmd.h --- linux-3.7.1/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/dlimit_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/dlimit_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,46 @@ +#ifndef _VSERVER_DLIMIT_CMD_H +#define _VSERVER_DLIMIT_CMD_H @@ -11362,9 +11366,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/dlimit_cmd.h linux-3.7.1 +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/global.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/global.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/global.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/global.h --- linux-3.7.1/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/global.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/global.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VSERVER_GLOBAL_H +#define _VSERVER_GLOBAL_H @@ -11385,9 +11389,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/global.h linux-3.7.1-vs2 + + +#endif /* _VSERVER_GLOBAL_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/history.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/history.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/history.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/history.h --- linux-3.7.1/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/history.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/history.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,197 @@ +#ifndef _VSERVER_HISTORY_H +#define _VSERVER_HISTORY_H @@ -11586,9 +11590,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/history.h linux-3.7.1-vs +#endif /* CONFIG_VSERVER_HISTORY */ + +#endif /* _VSERVER_HISTORY_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/inode.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/inode.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/inode.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/inode.h --- linux-3.7.1/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/inode.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/inode.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VSERVER_INODE_H +#define _VSERVER_INODE_H @@ -11609,9 +11613,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/inode.h linux-3.7.1-vs2. +#else /* _VSERVER_INODE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_INODE_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/inode_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/inode_cmd.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/inode_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/inode_cmd.h --- linux-3.7.1/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/inode_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/inode_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,36 @@ +#ifndef _VSERVER_INODE_CMD_H +#define _VSERVER_INODE_CMD_H @@ -11649,9 +11653,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/inode_cmd.h linux-3.7.1- +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_INODE_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/limit.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/limit.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/limit.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/limit.h --- linux-3.7.1/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/limit.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/limit.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,61 @@ +#ifndef _VSERVER_LIMIT_H +#define _VSERVER_LIMIT_H @@ -11714,9 +11718,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/limit.h linux-3.7.1-vs2. +#define NUM_LIMITS 24 + +#endif /* _VSERVER_LIMIT_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/limit_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/limit_cmd.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/limit_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/limit_cmd.h --- linux-3.7.1/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/limit_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/limit_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,35 @@ +#ifndef _VSERVER_LIMIT_CMD_H +#define _VSERVER_LIMIT_CMD_H @@ -11753,9 +11757,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/limit_cmd.h linux-3.7.1- +#endif /* CONFIG_IA32_EMULATION */ + +#endif /* _VSERVER_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/limit_def.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/limit_def.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/limit_def.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/limit_def.h --- linux-3.7.1/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/limit_def.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/limit_def.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,47 @@ +#ifndef _VSERVER_LIMIT_DEF_H +#define _VSERVER_LIMIT_DEF_H @@ -11804,9 +11808,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/limit_def.h linux-3.7.1- +#endif + +#endif /* _VSERVER_LIMIT_DEF_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/limit_int.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/limit_int.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/limit_int.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/limit_int.h --- linux-3.7.1/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/limit_int.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/limit_int.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,193 @@ +#ifndef _VSERVER_LIMIT_INT_H +#define _VSERVER_LIMIT_INT_H @@ -12001,9 +12005,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/limit_int.h linux-3.7.1- + + +#endif /* _VSERVER_LIMIT_INT_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/monitor.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/monitor.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/monitor.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/monitor.h --- linux-3.7.1/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/monitor.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/monitor.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,6 @@ +#ifndef _VSERVER_MONITOR_H +#define _VSERVER_MONITOR_H @@ -12011,9 +12015,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/monitor.h linux-3.7.1-vs +#include + +#endif /* _VSERVER_MONITOR_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/network.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/network.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/network.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/network.h --- linux-3.7.1/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/network.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/network.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,76 @@ +#ifndef _VSERVER_NETWORK_H +#define _VSERVER_NETWORK_H @@ -12091,9 +12095,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/network.h linux-3.7.1-vs +#endif + +#endif /* _VSERVER_NETWORK_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/network_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/network_cmd.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/network_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/network_cmd.h --- linux-3.7.1/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/network_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/network_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,37 @@ +#ifndef _VSERVER_NETWORK_CMD_H +#define _VSERVER_NETWORK_CMD_H @@ -12132,9 +12136,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/network_cmd.h linux-3.7. +extern int vc_set_ncaps(struct nx_info *, void __user *); + +#endif /* _VSERVER_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/percpu.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/percpu.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/percpu.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/percpu.h --- linux-3.7.1/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/percpu.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/percpu.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_PERCPU_H +#define _VSERVER_PERCPU_H @@ -12150,9 +12154,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/percpu.h linux-3.7.1-vs2 +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + +#endif /* _VSERVER_PERCPU_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/pid.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/pid.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/pid.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/pid.h --- linux-3.7.1/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/pid.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/pid.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,51 @@ +#ifndef _VSERVER_PID_H +#define _VSERVER_PID_H @@ -12205,9 +12209,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/pid.h linux-3.7.1-vs2.3. +} + +#endif -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/sched.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/sched.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/sched.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/sched.h --- linux-3.7.1/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/sched.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/sched.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef _VSERVER_SCHED_H +#define _VSERVER_SCHED_H @@ -12232,9 +12236,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/sched.h linux-3.7.1-vs2. +#else /* _VSERVER_SCHED_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SCHED_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/sched_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/sched_cmd.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/sched_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/sched_cmd.h --- linux-3.7.1/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/sched_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/sched_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,11 @@ +#ifndef _VSERVER_SCHED_CMD_H +#define _VSERVER_SCHED_CMD_H @@ -12247,9 +12251,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/sched_cmd.h linux-3.7.1- +extern int vc_get_prio_bias(struct vx_info *, void __user *); + +#endif /* _VSERVER_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/sched_def.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/sched_def.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/sched_def.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/sched_def.h --- linux-3.7.1/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/sched_def.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/sched_def.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,38 @@ +#ifndef _VSERVER_SCHED_DEF_H +#define _VSERVER_SCHED_DEF_H @@ -12289,9 +12293,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/sched_def.h linux-3.7.1- +#endif + +#endif /* _VSERVER_SCHED_DEF_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/signal.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/signal.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/signal.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/signal.h --- linux-3.7.1/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/signal.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/signal.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_SIGNAL_H +#define _VSERVER_SIGNAL_H @@ -12307,9 +12311,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/signal.h linux-3.7.1-vs2 +#else /* _VSERVER_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SIGNAL_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/signal_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/signal_cmd.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/signal_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/signal_cmd.h --- linux-3.7.1/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/signal_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/signal_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_SIGNAL_CMD_H +#define _VSERVER_SIGNAL_CMD_H @@ -12325,9 +12329,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/signal_cmd.h linux-3.7.1 +extern int vc_set_pflags(uint32_t pid, void __user *); + +#endif /* _VSERVER_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/space.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/space.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/space.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/space.h --- linux-3.7.1/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/space.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/space.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,12 @@ +#ifndef _VSERVER_SPACE_H +#define _VSERVER_SPACE_H @@ -12341,9 +12345,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/space.h linux-3.7.1-vs2. +#else /* _VSERVER_SPACE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SPACE_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/space_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/space_cmd.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/space_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/space_cmd.h --- linux-3.7.1/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/space_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/space_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,13 @@ +#ifndef _VSERVER_SPACE_CMD_H +#define _VSERVER_SPACE_CMD_H @@ -12358,9 +12362,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/space_cmd.h linux-3.7.1- +extern int vc_get_space_mask(void __user *, int); + +#endif /* _VSERVER_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/switch.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/switch.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/switch.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/switch.h --- linux-3.7.1/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/switch.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/switch.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,8 @@ +#ifndef _VSERVER_SWITCH_H +#define _VSERVER_SWITCH_H @@ -12370,9 +12374,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/switch.h linux-3.7.1-vs2 +#include + +#endif /* _VSERVER_SWITCH_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/tag.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/tag.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/tag.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/tag.h --- linux-3.7.1/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/tag.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/tag.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,143 @@ +#ifndef _DX_TAG_H +#define _DX_TAG_H @@ -12517,9 +12521,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/tag.h linux-3.7.1-vs2.3. +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-3.7.1/include/linux/vserver/tag_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/tag_cmd.h +diff -NurpP --minimal linux-3.7.1/include/linux/vserver/tag_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/tag_cmd.h --- linux-3.7.1/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/tag_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/tag_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VSERVER_TAG_CMD_H +#define _VSERVER_TAG_CMD_H @@ -12531,9 +12535,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/tag_cmd.h linux-3.7.1-vs +extern int vc_tag_migrate(uint32_t); + +#endif /* _VSERVER_TAG_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/net/addrconf.h linux-3.7.1-vs2.3.5.3/include/net/addrconf.h +diff -NurpP --minimal linux-3.7.1/include/net/addrconf.h linux-3.7.1-vs2.3.5.4/include/net/addrconf.h --- linux-3.7.1/include/net/addrconf.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/net/addrconf.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/net/addrconf.h 2012-12-18 15:13:16.000000000 +0000 @@ -81,7 +81,8 @@ extern int ipv6_dev_get_saddr(struct n const struct net_device *dev, const struct in6_addr *daddr, @@ -12544,9 +12548,9 @@ diff -NurpP --minimal linux-3.7.1/include/net/addrconf.h linux-3.7.1-vs2.3.5.3/i extern int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags); -diff -NurpP --minimal linux-3.7.1/include/net/af_unix.h linux-3.7.1-vs2.3.5.3/include/net/af_unix.h +diff -NurpP --minimal linux-3.7.1/include/net/af_unix.h linux-3.7.1-vs2.3.5.4/include/net/af_unix.h --- linux-3.7.1/include/net/af_unix.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/net/af_unix.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/net/af_unix.h 2012-12-18 15:13:16.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -12555,9 +12559,9 @@ diff -NurpP --minimal linux-3.7.1/include/net/af_unix.h linux-3.7.1-vs2.3.5.3/in #include extern void unix_inflight(struct file *fp); -diff -NurpP --minimal linux-3.7.1/include/net/inet_timewait_sock.h linux-3.7.1-vs2.3.5.3/include/net/inet_timewait_sock.h +diff -NurpP --minimal linux-3.7.1/include/net/inet_timewait_sock.h linux-3.7.1-vs2.3.5.4/include/net/inet_timewait_sock.h --- linux-3.7.1/include/net/inet_timewait_sock.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/net/inet_timewait_sock.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/net/inet_timewait_sock.h 2012-12-18 15:13:16.000000000 +0000 @@ -112,6 +112,10 @@ struct inet_timewait_sock { #define tw_net __tw_common.skc_net #define tw_daddr __tw_common.skc_daddr @@ -12569,9 +12573,9 @@ diff -NurpP --minimal linux-3.7.1/include/net/inet_timewait_sock.h linux-3.7.1-v int tw_timeout; volatile unsigned char tw_substate; unsigned char tw_rcv_wscale; -diff -NurpP --minimal linux-3.7.1/include/net/ip6_route.h linux-3.7.1-vs2.3.5.3/include/net/ip6_route.h +diff -NurpP --minimal linux-3.7.1/include/net/ip6_route.h linux-3.7.1-vs2.3.5.4/include/net/ip6_route.h --- linux-3.7.1/include/net/ip6_route.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/net/ip6_route.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/net/ip6_route.h 2012-12-18 15:13:16.000000000 +0000 @@ -97,7 +97,8 @@ extern int ip6_route_get_saddr(struct struct rt6_info *rt, const struct in6_addr *daddr, @@ -12582,9 +12586,9 @@ diff -NurpP --minimal linux-3.7.1/include/net/ip6_route.h linux-3.7.1-vs2.3.5.3/ extern struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr, -diff -NurpP --minimal linux-3.7.1/include/net/route.h linux-3.7.1-vs2.3.5.3/include/net/route.h +diff -NurpP --minimal linux-3.7.1/include/net/route.h linux-3.7.1-vs2.3.5.4/include/net/route.h --- linux-3.7.1/include/net/route.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/net/route.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/net/route.h 2012-12-18 15:13:16.000000000 +0000 @@ -204,6 +204,9 @@ static inline void ip_rt_put(struct rtab dst_release(&rt->dst); } @@ -12632,9 +12636,9 @@ diff -NurpP --minimal linux-3.7.1/include/net/route.h linux-3.7.1-vs2.3.5.3/incl rt = __ip_route_output_key(net, fl4); if (IS_ERR(rt)) return rt; -diff -NurpP --minimal linux-3.7.1/include/net/sock.h linux-3.7.1-vs2.3.5.3/include/net/sock.h +diff -NurpP --minimal linux-3.7.1/include/net/sock.h linux-3.7.1-vs2.3.5.4/include/net/sock.h --- linux-3.7.1/include/net/sock.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/net/sock.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/net/sock.h 2012-12-18 15:13:16.000000000 +0000 @@ -171,6 +171,10 @@ struct sock_common { #ifdef CONFIG_NET_NS struct net *skc_net; @@ -12657,17 +12661,17 @@ diff -NurpP --minimal linux-3.7.1/include/net/sock.h linux-3.7.1-vs2.3.5.3/inclu socket_lock_t sk_lock; struct sk_buff_head sk_receive_queue; /* -diff -NurpP --minimal linux-3.7.1/include/uapi/Kbuild linux-3.7.1-vs2.3.5.3/include/uapi/Kbuild +diff -NurpP --minimal linux-3.7.1/include/uapi/Kbuild linux-3.7.1-vs2.3.5.4/include/uapi/Kbuild --- linux-3.7.1/include/uapi/Kbuild 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/Kbuild 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/Kbuild 2012-12-18 15:13:16.000000000 +0000 @@ -12,3 +12,4 @@ header-y += video/ header-y += drm/ header-y += xen/ header-y += scsi/ +header-y += vserver/ -diff -NurpP --minimal linux-3.7.1/include/uapi/linux/capability.h linux-3.7.1-vs2.3.5.3/include/uapi/linux/capability.h +diff -NurpP --minimal linux-3.7.1/include/uapi/linux/capability.h linux-3.7.1-vs2.3.5.4/include/uapi/linux/capability.h --- linux-3.7.1/include/uapi/linux/capability.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/linux/capability.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/linux/capability.h 2012-12-18 15:13:16.000000000 +0000 @@ -259,6 +259,7 @@ struct vfs_cap_data { arbitrary SCSI commands */ /* Allow setting encryption key on loopback filesystem */ @@ -12690,9 +12694,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/linux/capability.h linux-3.7.1-vs /* * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-3.7.1/include/uapi/linux/fs.h linux-3.7.1-vs2.3.5.3/include/uapi/linux/fs.h +diff -NurpP --minimal linux-3.7.1/include/uapi/linux/fs.h linux-3.7.1-vs2.3.5.4/include/uapi/linux/fs.h --- linux-3.7.1/include/uapi/linux/fs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/linux/fs.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/linux/fs.h 2012-12-18 15:13:16.000000000 +0000 @@ -86,6 +86,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 */ @@ -12720,9 +12724,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/linux/fs.h linux-3.7.1-vs2.3.5.3/ #define SYNC_FILE_RANGE_WAIT_BEFORE 1 #define SYNC_FILE_RANGE_WRITE 2 -diff -NurpP --minimal linux-3.7.1/include/uapi/linux/gfs2_ondisk.h linux-3.7.1-vs2.3.5.3/include/uapi/linux/gfs2_ondisk.h +diff -NurpP --minimal linux-3.7.1/include/uapi/linux/gfs2_ondisk.h linux-3.7.1-vs2.3.5.4/include/uapi/linux/gfs2_ondisk.h --- linux-3.7.1/include/uapi/linux/gfs2_ondisk.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/linux/gfs2_ondisk.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/linux/gfs2_ondisk.h 2012-12-18 15:13:16.000000000 +0000 @@ -225,6 +225,9 @@ enum { gfs2fl_Sync = 8, gfs2fl_System = 9, @@ -12743,9 +12747,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/linux/gfs2_ondisk.h linux-3.7.1-v #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */ #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */ #define GFS2_DIF_INHERIT_JDATA 0x80000000 -diff -NurpP --minimal linux-3.7.1/include/uapi/linux/if_tun.h linux-3.7.1-vs2.3.5.3/include/uapi/linux/if_tun.h +diff -NurpP --minimal linux-3.7.1/include/uapi/linux/if_tun.h linux-3.7.1-vs2.3.5.4/include/uapi/linux/if_tun.h --- linux-3.7.1/include/uapi/linux/if_tun.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/linux/if_tun.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/linux/if_tun.h 2012-12-18 15:13:16.000000000 +0000 @@ -53,6 +53,7 @@ #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog) #define TUNGETVNETHDRSZ _IOR('T', 215, int) @@ -12754,9 +12758,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/linux/if_tun.h linux-3.7.1-vs2.3. /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-3.7.1/include/uapi/linux/major.h linux-3.7.1-vs2.3.5.3/include/uapi/linux/major.h +diff -NurpP --minimal linux-3.7.1/include/uapi/linux/major.h linux-3.7.1-vs2.3.5.4/include/uapi/linux/major.h --- linux-3.7.1/include/uapi/linux/major.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/linux/major.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/linux/major.h 2012-12-18 15:13:16.000000000 +0000 @@ -15,6 +15,7 @@ #define HD_MAJOR IDE0_MAJOR #define PTY_SLAVE_MAJOR 3 @@ -12765,9 +12769,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/linux/major.h linux-3.7.1-vs2.3.5 #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-3.7.1/include/uapi/linux/nfs_mount.h linux-3.7.1-vs2.3.5.3/include/uapi/linux/nfs_mount.h +diff -NurpP --minimal linux-3.7.1/include/uapi/linux/nfs_mount.h linux-3.7.1-vs2.3.5.4/include/uapi/linux/nfs_mount.h --- linux-3.7.1/include/uapi/linux/nfs_mount.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/linux/nfs_mount.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/linux/nfs_mount.h 2012-12-18 15:13:16.000000000 +0000 @@ -63,7 +63,8 @@ struct nfs_mount_data { #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ @@ -12778,9 +12782,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/linux/nfs_mount.h linux-3.7.1-vs2 /* The following are for internal use only */ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-3.7.1/include/uapi/linux/reboot.h linux-3.7.1-vs2.3.5.3/include/uapi/linux/reboot.h +diff -NurpP --minimal linux-3.7.1/include/uapi/linux/reboot.h linux-3.7.1-vs2.3.5.4/include/uapi/linux/reboot.h --- linux-3.7.1/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/linux/reboot.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/linux/reboot.h 2012-12-18 15:13:16.000000000 +0000 @@ -33,7 +33,7 @@ #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 @@ -12790,9 +12794,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/linux/reboot.h linux-3.7.1-vs2.3. #endif /* _UAPI_LINUX_REBOOT_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/linux/sysctl.h linux-3.7.1-vs2.3.5.3/include/uapi/linux/sysctl.h +diff -NurpP --minimal linux-3.7.1/include/uapi/linux/sysctl.h linux-3.7.1-vs2.3.5.4/include/uapi/linux/sysctl.h --- linux-3.7.1/include/uapi/linux/sysctl.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/linux/sysctl.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/linux/sysctl.h 2012-12-18 15:13:16.000000000 +0000 @@ -60,6 +60,7 @@ enum CTL_ABI=9, /* Binary emulation */ CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ @@ -12809,9 +12813,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/linux/sysctl.h linux-3.7.1-vs2.3. KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/Kbuild linux-3.7.1-vs2.3.5.3/include/uapi/vserver/Kbuild +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/Kbuild linux-3.7.1-vs2.3.5.4/include/uapi/vserver/Kbuild --- linux-3.7.1/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/Kbuild 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/Kbuild 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,9 @@ + +header-y += context_cmd.h network_cmd.h space_cmd.h \ @@ -12822,9 +12826,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/Kbuild linux-3.7.1-vs2.3. +header-y += switch.h context.h network.h monitor.h \ + limit.h inode.h device.h + -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/cacct_cmd.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/cacct_cmd.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/cacct_cmd.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/cacct_cmd.h --- linux-3.7.1/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/cacct_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/cacct_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,15 @@ +#ifndef _UAPI_VS_CACCT_CMD_H +#define _UAPI_VS_CACCT_CMD_H @@ -12841,9 +12845,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/cacct_cmd.h linux-3.7.1-v +}; + +#endif /* _UAPI_VS_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/context.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/context.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/context.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/context.h --- linux-3.7.1/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/context.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/context.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,80 @@ +#ifndef _UAPI_VS_CONTEXT_H +#define _UAPI_VS_CONTEXT_H @@ -12925,9 +12929,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/context.h linux-3.7.1-vs2 +#define VXC_NAMESPACE 0x02000000 + +#endif /* _UAPI_VS_CONTEXT_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/context_cmd.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/context_cmd.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/context_cmd.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/context_cmd.h --- linux-3.7.1/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/context_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/context_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,115 @@ +#ifndef _UAPI_VS_CONTEXT_CMD_H +#define _UAPI_VS_CONTEXT_CMD_H @@ -13044,9 +13048,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/context_cmd.h linux-3.7.1 +}; + +#endif /* _UAPI_VS_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/cvirt_cmd.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/cvirt_cmd.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/cvirt_cmd.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/cvirt_cmd.h --- linux-3.7.1/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/cvirt_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/cvirt_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,41 @@ +#ifndef _UAPI_VS_CVIRT_CMD_H +#define _UAPI_VS_CVIRT_CMD_H @@ -13089,9 +13093,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/cvirt_cmd.h linux-3.7.1-v +}; + +#endif /* _UAPI_VS_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/debug_cmd.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/debug_cmd.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/debug_cmd.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/debug_cmd.h --- linux-3.7.1/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/debug_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/debug_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,24 @@ +#ifndef _UAPI_VS_DEBUG_CMD_H +#define _UAPI_VS_DEBUG_CMD_H @@ -13117,9 +13121,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/debug_cmd.h linux-3.7.1-v +}; + +#endif /* _UAPI_VS_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/device.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/device.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/device.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/device.h --- linux-3.7.1/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/device.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/device.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,12 @@ +#ifndef _UAPI_VS_DEVICE_H +#define _UAPI_VS_DEVICE_H @@ -13133,9 +13137,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/device.h linux-3.7.1-vs2. +#define DATTR_MASK 0x00000013 + +#endif /* _UAPI_VS_DEVICE_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/device_cmd.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/device_cmd.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/device_cmd.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/device_cmd.h --- linux-3.7.1/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/device_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/device_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,16 @@ +#ifndef _UAPI_VS_DEVICE_CMD_H +#define _UAPI_VS_DEVICE_CMD_H @@ -13153,9 +13157,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/device_cmd.h linux-3.7.1- +}; + +#endif /* _UAPI_VS_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/dlimit_cmd.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/dlimit_cmd.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/dlimit_cmd.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/dlimit_cmd.h --- linux-3.7.1/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/dlimit_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/dlimit_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,67 @@ +#ifndef _UAPI_VS_DLIMIT_CMD_H +#define _UAPI_VS_DLIMIT_CMD_H @@ -13224,9 +13228,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/dlimit_cmd.h linux-3.7.1- +} + +#endif /* _UAPI_VS_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/inode.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/inode.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/inode.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/inode.h --- linux-3.7.1/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/inode.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/inode.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef _UAPI_VS_INODE_H +#define _UAPI_VS_INODE_H @@ -13251,9 +13255,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/inode.h linux-3.7.1-vs2.3 +#define FIOC_SETXFLG _IOW('x', 6, long) + +#endif /* _UAPI_VS_INODE_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/inode_cmd.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/inode_cmd.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/inode_cmd.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/inode_cmd.h --- linux-3.7.1/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/inode_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/inode_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,26 @@ +#ifndef _UAPI_VS_INODE_CMD_H +#define _UAPI_VS_INODE_CMD_H @@ -13281,9 +13285,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/inode_cmd.h linux-3.7.1-v +}; + +#endif /* _UAPI_VS_INODE_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/limit.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/limit.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/limit.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/limit.h --- linux-3.7.1/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/limit.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/limit.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _UAPI_VS_LIMIT_H +#define _UAPI_VS_LIMIT_H @@ -13299,9 +13303,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/limit.h linux-3.7.1-vs2.3 +#define VLIMIT_MAPPED 23 + +#endif /* _UAPI_VS_LIMIT_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/limit_cmd.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/limit_cmd.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/limit_cmd.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/limit_cmd.h --- linux-3.7.1/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/limit_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/limit_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,40 @@ +#ifndef _UAPI_VS_LIMIT_CMD_H +#define _UAPI_VS_LIMIT_CMD_H @@ -13343,9 +13347,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/limit_cmd.h linux-3.7.1-v +#define CRLIM_KEEP (~1ULL) + +#endif /* _UAPI_VS_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/monitor.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/monitor.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/monitor.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/monitor.h --- linux-3.7.1/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/monitor.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/monitor.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,96 @@ +#ifndef _UAPI_VS_MONITOR_H +#define _UAPI_VS_MONITOR_H @@ -13443,9 +13447,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/monitor.h linux-3.7.1-vs2 +}; + +#endif /* _UAPI_VS_MONITOR_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/network.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/network.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/network.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/network.h --- linux-3.7.1/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/network.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/network.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,76 @@ +#ifndef _UAPI_VS_NETWORK_H +#define _UAPI_VS_NETWORK_H @@ -13523,9 +13527,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/network.h linux-3.7.1-vs2 +#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) + +#endif /* _UAPI_VS_NETWORK_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/network_cmd.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/network_cmd.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/network_cmd.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/network_cmd.h --- linux-3.7.1/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/network_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/network_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,123 @@ +#ifndef _UAPI_VS_NETWORK_CMD_H +#define _UAPI_VS_NETWORK_CMD_H @@ -13650,9 +13654,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/network_cmd.h linux-3.7.1 +}; + +#endif /* _UAPI_VS_NETWORK_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/sched_cmd.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/sched_cmd.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/sched_cmd.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/sched_cmd.h --- linux-3.7.1/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/sched_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/sched_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,13 @@ +#ifndef _UAPI_VS_SCHED_CMD_H +#define _UAPI_VS_SCHED_CMD_H @@ -13667,9 +13671,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/sched_cmd.h linux-3.7.1-v +#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0) + +#endif /* _UAPI_VS_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/signal_cmd.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/signal_cmd.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/signal_cmd.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/signal_cmd.h --- linux-3.7.1/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/signal_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/signal_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,31 @@ +#ifndef _UAPI_VS_SIGNAL_CMD_H +#define _UAPI_VS_SIGNAL_CMD_H @@ -13702,9 +13706,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/signal_cmd.h linux-3.7.1- +}; + +#endif /* _UAPI_VS_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/space_cmd.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/space_cmd.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/space_cmd.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/space_cmd.h --- linux-3.7.1/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/space_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/space_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,28 @@ +#ifndef _UAPI_VS_SPACE_CMD_H +#define _UAPI_VS_SPACE_CMD_H @@ -13734,9 +13738,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/space_cmd.h linux-3.7.1-v +}; + +#endif /* _UAPI_VS_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/switch.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/switch.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/switch.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/switch.h --- linux-3.7.1/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/switch.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/switch.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,90 @@ +#ifndef _UAPI_VS_SWITCH_H +#define _UAPI_VS_SWITCH_H @@ -13828,9 +13832,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/switch.h linux-3.7.1-vs2. +#define VCMD_get_vci VC_CMD(VERSION, 1, 0) + +#endif /* _UAPI_VS_SWITCH_H */ -diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/tag_cmd.h linux-3.7.1-vs2.3.5.3/include/uapi/vserver/tag_cmd.h +diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/tag_cmd.h linux-3.7.1-vs2.3.5.4/include/uapi/vserver/tag_cmd.h --- linux-3.7.1/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/include/uapi/vserver/tag_cmd.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/include/uapi/vserver/tag_cmd.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _UAPI_VS_TAG_CMD_H +#define _UAPI_VS_TAG_CMD_H @@ -13846,9 +13850,9 @@ diff -NurpP --minimal linux-3.7.1/include/uapi/vserver/tag_cmd.h linux-3.7.1-vs2 +#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0) + +#endif /* _UAPI_VS_TAG_CMD_H */ -diff -NurpP --minimal linux-3.7.1/init/Kconfig linux-3.7.1-vs2.3.5.3/init/Kconfig +diff -NurpP --minimal linux-3.7.1/init/Kconfig linux-3.7.1-vs2.3.5.4/init/Kconfig --- linux-3.7.1/init/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/init/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/init/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -699,6 +699,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK menuconfig CGROUPS boolean "Control Group support" @@ -13865,9 +13869,9 @@ diff -NurpP --minimal linux-3.7.1/init/Kconfig linux-3.7.1-vs2.3.5.3/init/Kconfi select UIDGID_STRICT_TYPE_CHECKS default n -diff -NurpP --minimal linux-3.7.1/init/main.c linux-3.7.1-vs2.3.5.3/init/main.c +diff -NurpP --minimal linux-3.7.1/init/main.c linux-3.7.1-vs2.3.5.4/init/main.c --- linux-3.7.1/init/main.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/init/main.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/init/main.c 2012-12-18 15:13:16.000000000 +0000 @@ -70,6 +70,7 @@ #include #include @@ -13876,9 +13880,9 @@ diff -NurpP --minimal linux-3.7.1/init/main.c linux-3.7.1-vs2.3.5.3/init/main.c #include #include -diff -NurpP --minimal linux-3.7.1/ipc/mqueue.c linux-3.7.1-vs2.3.5.3/ipc/mqueue.c +diff -NurpP --minimal linux-3.7.1/ipc/mqueue.c linux-3.7.1-vs2.3.5.4/ipc/mqueue.c --- linux-3.7.1/ipc/mqueue.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/ipc/mqueue.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/ipc/mqueue.c 2012-12-18 15:13:16.000000000 +0000 @@ -35,6 +35,8 @@ #include #include @@ -13954,9 +13958,9 @@ diff -NurpP --minimal linux-3.7.1/ipc/mqueue.c linux-3.7.1-vs2.3.5.3/ipc/mqueue. free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-3.7.1/ipc/msg.c linux-3.7.1-vs2.3.5.3/ipc/msg.c +diff -NurpP --minimal linux-3.7.1/ipc/msg.c linux-3.7.1-vs2.3.5.4/ipc/msg.c --- linux-3.7.1/ipc/msg.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/ipc/msg.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/ipc/msg.c 2012-12-18 15:13:16.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -13973,9 +13977,9 @@ diff -NurpP --minimal linux-3.7.1/ipc/msg.c linux-3.7.1-vs2.3.5.3/ipc/msg.c msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-3.7.1/ipc/namespace.c linux-3.7.1-vs2.3.5.3/ipc/namespace.c +diff -NurpP --minimal linux-3.7.1/ipc/namespace.c linux-3.7.1-vs2.3.5.4/ipc/namespace.c --- linux-3.7.1/ipc/namespace.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/ipc/namespace.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/ipc/namespace.c 2012-12-18 15:13:16.000000000 +0000 @@ -13,11 +13,12 @@ #include #include @@ -14017,9 +14021,9 @@ diff -NurpP --minimal linux-3.7.1/ipc/namespace.c linux-3.7.1-vs2.3.5.3/ipc/name } /* -diff -NurpP --minimal linux-3.7.1/ipc/sem.c linux-3.7.1-vs2.3.5.3/ipc/sem.c +diff -NurpP --minimal linux-3.7.1/ipc/sem.c linux-3.7.1-vs2.3.5.4/ipc/sem.c --- linux-3.7.1/ipc/sem.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/ipc/sem.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/ipc/sem.c 2012-12-18 15:13:16.000000000 +0000 @@ -86,6 +86,8 @@ #include #include @@ -14057,9 +14061,9 @@ diff -NurpP --minimal linux-3.7.1/ipc/sem.c linux-3.7.1-vs2.3.5.3/ipc/sem.c security_sem_free(sma); ipc_rcu_putref(sma); } -diff -NurpP --minimal linux-3.7.1/ipc/shm.c linux-3.7.1-vs2.3.5.3/ipc/shm.c +diff -NurpP --minimal linux-3.7.1/ipc/shm.c linux-3.7.1-vs2.3.5.4/ipc/shm.c --- linux-3.7.1/ipc/shm.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/ipc/shm.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/ipc/shm.c 2012-12-18 15:13:16.000000000 +0000 @@ -39,6 +39,8 @@ #include #include @@ -14115,9 +14119,9 @@ diff -NurpP --minimal linux-3.7.1/ipc/shm.c linux-3.7.1-vs2.3.5.3/ipc/shm.c return error; no_id: -diff -NurpP --minimal linux-3.7.1/kernel/Makefile linux-3.7.1-vs2.3.5.3/kernel/Makefile +diff -NurpP --minimal linux-3.7.1/kernel/Makefile linux-3.7.1-vs2.3.5.4/kernel/Makefile --- linux-3.7.1/kernel/Makefile 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/Makefile 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/Makefile 2012-12-18 15:13:16.000000000 +0000 @@ -24,6 +24,7 @@ endif obj-y += sched/ @@ -14126,9 +14130,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/Makefile linux-3.7.1-vs2.3.5.3/kernel/M ifeq ($(CONFIG_CHECKPOINT_RESTORE),y) obj-$(CONFIG_X86) += kcmp.o -diff -NurpP --minimal linux-3.7.1/kernel/auditsc.c linux-3.7.1-vs2.3.5.3/kernel/auditsc.c +diff -NurpP --minimal linux-3.7.1/kernel/auditsc.c linux-3.7.1-vs2.3.5.4/kernel/auditsc.c --- linux-3.7.1/kernel/auditsc.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/auditsc.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/auditsc.c 2012-12-18 15:13:16.000000000 +0000 @@ -2372,7 +2372,7 @@ int audit_set_loginuid(kuid_t loginuid) if (uid_valid(task->loginuid)) return -EPERM; @@ -14138,9 +14142,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/auditsc.c linux-3.7.1-vs2.3.5.3/kernel/ return -EPERM; #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ -diff -NurpP --minimal linux-3.7.1/kernel/capability.c linux-3.7.1-vs2.3.5.3/kernel/capability.c +diff -NurpP --minimal linux-3.7.1/kernel/capability.c linux-3.7.1-vs2.3.5.4/kernel/capability.c --- linux-3.7.1/kernel/capability.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/capability.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/capability.c 2012-12-18 15:13:16.000000000 +0000 @@ -15,6 +15,7 @@ #include #include @@ -14166,9 +14170,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/capability.c linux-3.7.1-vs2.3.5.3/kern /** * has_capability_noaudit - Does a task have a capability (unaudited) in the * initial user ns -diff -NurpP --minimal linux-3.7.1/kernel/compat.c linux-3.7.1-vs2.3.5.3/kernel/compat.c +diff -NurpP --minimal linux-3.7.1/kernel/compat.c linux-3.7.1-vs2.3.5.4/kernel/compat.c --- linux-3.7.1/kernel/compat.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/compat.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/compat.c 2012-12-18 15:13:16.000000000 +0000 @@ -27,6 +27,7 @@ #include #include @@ -14186,9 +14190,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/compat.c linux-3.7.1-vs2.3.5.3/kernel/c return 0; } -diff -NurpP --minimal linux-3.7.1/kernel/cred.c linux-3.7.1-vs2.3.5.3/kernel/cred.c +diff -NurpP --minimal linux-3.7.1/kernel/cred.c linux-3.7.1-vs2.3.5.4/kernel/cred.c --- linux-3.7.1/kernel/cred.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/cred.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/cred.c 2012-12-18 15:13:16.000000000 +0000 @@ -70,31 +70,6 @@ struct cred init_cred = { #endif }; @@ -14258,9 +14262,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/cred.c linux-3.7.1-vs2.3.5.3/kernel/cre EXPORT_SYMBOL(prepare_creds); /* -diff -NurpP --minimal linux-3.7.1/kernel/exit.c linux-3.7.1-vs2.3.5.3/kernel/exit.c +diff -NurpP --minimal linux-3.7.1/kernel/exit.c linux-3.7.1-vs2.3.5.4/kernel/exit.c --- linux-3.7.1/kernel/exit.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/exit.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/exit.c 2012-12-18 15:13:16.000000000 +0000 @@ -48,6 +48,10 @@ #include #include @@ -14356,9 +14360,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/exit.c linux-3.7.1-vs2.3.5.3/kernel/exi BUG(); /* Avoid "noreturn function does return". */ for (;;) -diff -NurpP --minimal linux-3.7.1/kernel/fork.c linux-3.7.1-vs2.3.5.3/kernel/fork.c +diff -NurpP --minimal linux-3.7.1/kernel/fork.c linux-3.7.1-vs2.3.5.4/kernel/fork.c --- linux-3.7.1/kernel/fork.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/fork.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/fork.c 2012-12-18 15:13:16.000000000 +0000 @@ -70,6 +70,9 @@ #include #include @@ -14451,9 +14455,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/fork.c linux-3.7.1-vs2.3.5.3/kernel/for write_unlock_irq(&tasklist_lock); proc_fork_connector(p); cgroup_post_fork(p); -diff -NurpP --minimal linux-3.7.1/kernel/kthread.c linux-3.7.1-vs2.3.5.3/kernel/kthread.c +diff -NurpP --minimal linux-3.7.1/kernel/kthread.c linux-3.7.1-vs2.3.5.4/kernel/kthread.c --- linux-3.7.1/kernel/kthread.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/kthread.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/kthread.c 2012-12-18 15:13:16.000000000 +0000 @@ -17,6 +17,7 @@ #include #include @@ -14462,9 +14466,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/kthread.c linux-3.7.1-vs2.3.5.3/kernel/ #include static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-3.7.1/kernel/nsproxy.c linux-3.7.1-vs2.3.5.3/kernel/nsproxy.c +diff -NurpP --minimal linux-3.7.1/kernel/nsproxy.c linux-3.7.1-vs2.3.5.4/kernel/nsproxy.c --- linux-3.7.1/kernel/nsproxy.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/nsproxy.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/nsproxy.c 2012-12-18 15:13:16.000000000 +0000 @@ -20,11 +20,14 @@ #include #include @@ -14646,9 +14650,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/nsproxy.c linux-3.7.1-vs2.3.5.3/kernel/ return -EPERM; *new_nsp = create_new_namespaces(unshare_flags, current, -diff -NurpP --minimal linux-3.7.1/kernel/pid.c linux-3.7.1-vs2.3.5.3/kernel/pid.c +diff -NurpP --minimal linux-3.7.1/kernel/pid.c linux-3.7.1-vs2.3.5.4/kernel/pid.c --- linux-3.7.1/kernel/pid.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/pid.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/pid.c 2012-12-18 15:13:16.000000000 +0000 @@ -36,6 +36,7 @@ #include #include @@ -14706,9 +14710,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/pid.c linux-3.7.1-vs2.3.5.3/kernel/pid. pid_t pid_vnr(struct pid *pid) { return pid_nr_ns(pid, current->nsproxy->pid_ns); -diff -NurpP --minimal linux-3.7.1/kernel/pid_namespace.c linux-3.7.1-vs2.3.5.3/kernel/pid_namespace.c +diff -NurpP --minimal linux-3.7.1/kernel/pid_namespace.c linux-3.7.1-vs2.3.5.4/kernel/pid_namespace.c --- linux-3.7.1/kernel/pid_namespace.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/pid_namespace.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/pid_namespace.c 2012-12-18 15:13:16.000000000 +0000 @@ -17,6 +17,7 @@ #include #include @@ -14733,9 +14737,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/pid_namespace.c linux-3.7.1-vs2.3.5.3/k kmem_cache_free(pid_ns_cachep, ns); } -diff -NurpP --minimal linux-3.7.1/kernel/posix-timers.c linux-3.7.1-vs2.3.5.3/kernel/posix-timers.c +diff -NurpP --minimal linux-3.7.1/kernel/posix-timers.c linux-3.7.1-vs2.3.5.4/kernel/posix-timers.c --- linux-3.7.1/kernel/posix-timers.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/posix-timers.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/posix-timers.c 2012-12-18 15:13:16.000000000 +0000 @@ -47,6 +47,7 @@ #include #include @@ -14771,9 +14775,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/posix-timers.c linux-3.7.1-vs2.3.5.3/ke /* If we failed to send the signal the timer stops. */ return ret > 0; } -diff -NurpP --minimal linux-3.7.1/kernel/printk.c linux-3.7.1-vs2.3.5.3/kernel/printk.c +diff -NurpP --minimal linux-3.7.1/kernel/printk.c linux-3.7.1-vs2.3.5.4/kernel/printk.c --- linux-3.7.1/kernel/printk.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/printk.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/printk.c 2012-12-18 15:13:16.000000000 +0000 @@ -42,6 +42,7 @@ #include #include @@ -14841,9 +14845,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/printk.c linux-3.7.1-vs2.3.5.3/kernel/p error = syslog_print_all(buf, len, clear); break; /* Clear ring buffer */ -diff -NurpP --minimal linux-3.7.1/kernel/ptrace.c linux-3.7.1-vs2.3.5.3/kernel/ptrace.c +diff -NurpP --minimal linux-3.7.1/kernel/ptrace.c linux-3.7.1-vs2.3.5.4/kernel/ptrace.c --- linux-3.7.1/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/ptrace.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/ptrace.c 2012-12-18 15:13:16.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -14864,9 +14868,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/ptrace.c linux-3.7.1-vs2.3.5.3/kernel/p return security_ptrace_access_check(task, mode); } -diff -NurpP --minimal linux-3.7.1/kernel/sched/core.c linux-3.7.1-vs2.3.5.3/kernel/sched/core.c +diff -NurpP --minimal linux-3.7.1/kernel/sched/core.c linux-3.7.1-vs2.3.5.4/kernel/sched/core.c --- linux-3.7.1/kernel/sched/core.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/sched/core.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/sched/core.c 2012-12-18 15:13:16.000000000 +0000 @@ -72,6 +72,8 @@ #include #include @@ -14906,9 +14910,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/sched/core.c linux-3.7.1-vs2.3.5.3/kern retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-3.7.1/kernel/sched/cputime.c linux-3.7.1-vs2.3.5.3/kernel/sched/cputime.c +diff -NurpP --minimal linux-3.7.1/kernel/sched/cputime.c linux-3.7.1-vs2.3.5.4/kernel/sched/cputime.c --- linux-3.7.1/kernel/sched/cputime.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/sched/cputime.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/sched/cputime.c 2012-12-18 15:13:16.000000000 +0000 @@ -3,6 +3,7 @@ #include #include @@ -14949,9 +14953,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/sched/cputime.c linux-3.7.1-vs2.3.5.3/k account_group_system_time(p, cputime); /* Add system time to cpustat. */ -diff -NurpP --minimal linux-3.7.1/kernel/sched/fair.c linux-3.7.1-vs2.3.5.3/kernel/sched/fair.c +diff -NurpP --minimal linux-3.7.1/kernel/sched/fair.c linux-3.7.1-vs2.3.5.4/kernel/sched/fair.c --- linux-3.7.1/kernel/sched/fair.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/sched/fair.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/sched/fair.c 2012-12-18 15:13:16.000000000 +0000 @@ -26,6 +26,7 @@ #include #include @@ -14978,9 +14982,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/sched/fair.c linux-3.7.1-vs2.3.5.3/kern update_cfs_load(cfs_rq, 0); account_entity_dequeue(cfs_rq, se); -diff -NurpP --minimal linux-3.7.1/kernel/signal.c linux-3.7.1-vs2.3.5.3/kernel/signal.c +diff -NurpP --minimal linux-3.7.1/kernel/signal.c linux-3.7.1-vs2.3.5.4/kernel/signal.c --- linux-3.7.1/kernel/signal.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/signal.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/signal.c 2012-12-18 15:13:16.000000000 +0000 @@ -31,6 +31,8 @@ #include #include @@ -15073,9 +15077,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/signal.c linux-3.7.1-vs2.3.5.3/kernel/s if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-3.7.1/kernel/softirq.c linux-3.7.1-vs2.3.5.3/kernel/softirq.c +diff -NurpP --minimal linux-3.7.1/kernel/softirq.c linux-3.7.1-vs2.3.5.4/kernel/softirq.c --- linux-3.7.1/kernel/softirq.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/softirq.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/softirq.c 2012-12-18 15:13:16.000000000 +0000 @@ -25,6 +25,7 @@ #include #include @@ -15084,9 +15088,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/softirq.c linux-3.7.1-vs2.3.5.3/kernel/ #define CREATE_TRACE_POINTS #include -diff -NurpP --minimal linux-3.7.1/kernel/sys.c linux-3.7.1-vs2.3.5.3/kernel/sys.c +diff -NurpP --minimal linux-3.7.1/kernel/sys.c linux-3.7.1-vs2.3.5.4/kernel/sys.c --- linux-3.7.1/kernel/sys.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/sys.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/sys.c 2012-12-18 15:13:16.000000000 +0000 @@ -47,6 +47,7 @@ #include #include @@ -15183,9 +15187,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/sys.c linux-3.7.1-vs2.3.5.3/kernel/sys. return 0; return -EPERM; -diff -NurpP --minimal linux-3.7.1/kernel/sysctl.c linux-3.7.1-vs2.3.5.3/kernel/sysctl.c +diff -NurpP --minimal linux-3.7.1/kernel/sysctl.c linux-3.7.1-vs2.3.5.4/kernel/sysctl.c --- linux-3.7.1/kernel/sysctl.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/sysctl.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/sysctl.c 2012-12-18 15:13:16.000000000 +0000 @@ -82,6 +82,7 @@ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) #include @@ -15208,9 +15212,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/sysctl.c linux-3.7.1-vs2.3.5.3/kernel/s #ifdef CONFIG_CHR_DEV_SG { .procname = "sg-big-buff", -diff -NurpP --minimal linux-3.7.1/kernel/sysctl_binary.c linux-3.7.1-vs2.3.5.3/kernel/sysctl_binary.c +diff -NurpP --minimal linux-3.7.1/kernel/sysctl_binary.c linux-3.7.1-vs2.3.5.4/kernel/sysctl_binary.c --- linux-3.7.1/kernel/sysctl_binary.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/sysctl_binary.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/sysctl_binary.c 2012-12-18 15:13:16.000000000 +0000 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t { CTL_INT, KERN_PANIC, "panic" }, @@ -15219,9 +15223,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/sysctl_binary.c linux-3.7.1-vs2.3.5.3/k { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-3.7.1/kernel/time/timekeeping.c linux-3.7.1-vs2.3.5.3/kernel/time/timekeeping.c +diff -NurpP --minimal linux-3.7.1/kernel/time/timekeeping.c linux-3.7.1-vs2.3.5.4/kernel/time/timekeeping.c --- linux-3.7.1/kernel/time/timekeeping.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/time/timekeeping.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/time/timekeeping.c 2012-12-18 15:13:16.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -15238,9 +15242,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/time/timekeeping.c linux-3.7.1-vs2.3.5. } EXPORT_SYMBOL(getnstimeofday); -diff -NurpP --minimal linux-3.7.1/kernel/time.c linux-3.7.1-vs2.3.5.3/kernel/time.c +diff -NurpP --minimal linux-3.7.1/kernel/time.c linux-3.7.1-vs2.3.5.4/kernel/time.c --- linux-3.7.1/kernel/time.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/time.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/time.c 2012-12-18 15:13:16.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -15267,9 +15271,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/time.c linux-3.7.1-vs2.3.5.3/kernel/tim return 0; } -diff -NurpP --minimal linux-3.7.1/kernel/timer.c linux-3.7.1-vs2.3.5.3/kernel/timer.c +diff -NurpP --minimal linux-3.7.1/kernel/timer.c linux-3.7.1-vs2.3.5.4/kernel/timer.c --- linux-3.7.1/kernel/timer.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/timer.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/timer.c 2012-12-18 15:13:16.000000000 +0000 @@ -40,6 +40,10 @@ #include #include @@ -15281,9 +15285,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/timer.c linux-3.7.1-vs2.3.5.3/kernel/ti #include #include -diff -NurpP --minimal linux-3.7.1/kernel/user_namespace.c linux-3.7.1-vs2.3.5.3/kernel/user_namespace.c +diff -NurpP --minimal linux-3.7.1/kernel/user_namespace.c linux-3.7.1-vs2.3.5.4/kernel/user_namespace.c --- linux-3.7.1/kernel/user_namespace.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/user_namespace.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/user_namespace.c 2012-12-18 15:13:16.000000000 +0000 @@ -20,6 +20,7 @@ #include #include @@ -15310,9 +15314,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/user_namespace.c linux-3.7.1-vs2.3.5.3/ put_user_ns(parent); } EXPORT_SYMBOL(free_user_ns); -diff -NurpP --minimal linux-3.7.1/kernel/utsname.c linux-3.7.1-vs2.3.5.3/kernel/utsname.c +diff -NurpP --minimal linux-3.7.1/kernel/utsname.c linux-3.7.1-vs2.3.5.4/kernel/utsname.c --- linux-3.7.1/kernel/utsname.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/utsname.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/utsname.c 2012-12-18 15:13:16.000000000 +0000 @@ -16,14 +16,17 @@ #include #include @@ -15381,9 +15385,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/utsname.c linux-3.7.1-vs2.3.5.3/kernel/ kfree(ns); } -diff -NurpP --minimal linux-3.7.1/kernel/vserver/Kconfig linux-3.7.1-vs2.3.5.3/kernel/vserver/Kconfig +diff -NurpP --minimal linux-3.7.1/kernel/vserver/Kconfig linux-3.7.1-vs2.3.5.4/kernel/vserver/Kconfig --- linux-3.7.1/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,233 @@ +# +# Linux VServer configuration @@ -15618,9 +15622,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/Kconfig linux-3.7.1-vs2.3.5.3/k + bool + default n + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/Makefile linux-3.7.1-vs2.3.5.3/kernel/vserver/Makefile +diff -NurpP --minimal linux-3.7.1/kernel/vserver/Makefile linux-3.7.1-vs2.3.5.4/kernel/vserver/Makefile --- linux-3.7.1/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/Makefile 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/Makefile 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,18 @@ +# +# Makefile for the Linux vserver routines. @@ -15640,9 +15644,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/Makefile linux-3.7.1-vs2.3.5.3/ +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/cacct.c linux-3.7.1-vs2.3.5.3/kernel/vserver/cacct.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/cacct.c linux-3.7.1-vs2.3.5.4/kernel/vserver/cacct.c --- linux-3.7.1/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/cacct.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/cacct.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,42 @@ +/* + * linux/kernel/vserver/cacct.c @@ -15686,9 +15690,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/cacct.c linux-3.7.1-vs2.3.5.3/k + return 0; +} + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/cacct_init.h linux-3.7.1-vs2.3.5.3/kernel/vserver/cacct_init.h +diff -NurpP --minimal linux-3.7.1/kernel/vserver/cacct_init.h linux-3.7.1-vs2.3.5.4/kernel/vserver/cacct_init.h --- linux-3.7.1/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/cacct_init.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/cacct_init.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,25 @@ + + @@ -15715,9 +15719,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/cacct_init.h linux-3.7.1-vs2.3. + return; +} + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/cacct_proc.h linux-3.7.1-vs2.3.5.3/kernel/vserver/cacct_proc.h +diff -NurpP --minimal linux-3.7.1/kernel/vserver/cacct_proc.h linux-3.7.1-vs2.3.5.4/kernel/vserver/cacct_proc.h --- linux-3.7.1/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/cacct_proc.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/cacct_proc.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,53 @@ +#ifndef _VX_CACCT_PROC_H +#define _VX_CACCT_PROC_H @@ -15772,9 +15776,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/cacct_proc.h linux-3.7.1-vs2.3. +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-3.7.1/kernel/vserver/context.c linux-3.7.1-vs2.3.5.3/kernel/vserver/context.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/context.c linux-3.7.1-vs2.3.5.4/kernel/vserver/context.c --- linux-3.7.1/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/context.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/context.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,1119 @@ +/* + * linux/kernel/vserver/context.c @@ -16895,9 +16899,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/context.c linux-3.7.1-vs2.3.5.3 + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/cvirt.c linux-3.7.1-vs2.3.5.3/kernel/vserver/cvirt.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/cvirt.c linux-3.7.1-vs2.3.5.4/kernel/vserver/cvirt.c --- linux-3.7.1/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/cvirt.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/cvirt.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,313 @@ +/* + * linux/kernel/vserver/cvirt.c @@ -17212,9 +17216,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/cvirt.c linux-3.7.1-vs2.3.5.3/k + +#endif + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/cvirt_init.h linux-3.7.1-vs2.3.5.3/kernel/vserver/cvirt_init.h +diff -NurpP --minimal linux-3.7.1/kernel/vserver/cvirt_init.h linux-3.7.1-vs2.3.5.4/kernel/vserver/cvirt_init.h --- linux-3.7.1/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/cvirt_init.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/cvirt_init.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,70 @@ + + @@ -17286,9 +17290,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/cvirt_init.h linux-3.7.1-vs2.3. + return; +} + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/cvirt_proc.h linux-3.7.1-vs2.3.5.3/kernel/vserver/cvirt_proc.h +diff -NurpP --minimal linux-3.7.1/kernel/vserver/cvirt_proc.h linux-3.7.1-vs2.3.5.4/kernel/vserver/cvirt_proc.h --- linux-3.7.1/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/cvirt_proc.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/cvirt_proc.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,123 @@ +#ifndef _VX_CVIRT_PROC_H +#define _VX_CVIRT_PROC_H @@ -17413,9 +17417,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/cvirt_proc.h linux-3.7.1-vs2.3. +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-3.7.1/kernel/vserver/debug.c linux-3.7.1-vs2.3.5.3/kernel/vserver/debug.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/debug.c linux-3.7.1-vs2.3.5.4/kernel/vserver/debug.c --- linux-3.7.1/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/debug.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/debug.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,32 @@ +/* + * kernel/vserver/debug.c @@ -17449,9 +17453,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/debug.c linux-3.7.1-vs2.3.5.3/k + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/device.c linux-3.7.1-vs2.3.5.3/kernel/vserver/device.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/device.c linux-3.7.1-vs2.3.5.4/kernel/vserver/device.c --- linux-3.7.1/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/device.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/device.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,443 @@ +/* + * linux/kernel/vserver/device.c @@ -17896,9 +17900,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/device.c linux-3.7.1-vs2.3.5.3/ +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/dlimit.c linux-3.7.1-vs2.3.5.3/kernel/vserver/dlimit.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/dlimit.c linux-3.7.1-vs2.3.5.4/kernel/vserver/dlimit.c --- linux-3.7.1/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/dlimit.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/dlimit.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,531 @@ +/* + * linux/kernel/vserver/dlimit.c @@ -18431,9 +18435,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/dlimit.c linux-3.7.1-vs2.3.5.3/ +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/helper.c linux-3.7.1-vs2.3.5.3/kernel/vserver/helper.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/helper.c linux-3.7.1-vs2.3.5.4/kernel/vserver/helper.c --- linux-3.7.1/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/helper.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/helper.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,229 @@ +/* + * linux/kernel/vserver/helper.c @@ -18664,9 +18668,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/helper.c linux-3.7.1-vs2.3.5.3/ + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/history.c linux-3.7.1-vs2.3.5.3/kernel/vserver/history.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/history.c linux-3.7.1-vs2.3.5.4/kernel/vserver/history.c --- linux-3.7.1/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/history.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/history.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,258 @@ +/* + * kernel/vserver/history.c @@ -18926,10 +18930,10 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/history.c linux-3.7.1-vs2.3.5.3 + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/inet.c linux-3.7.1-vs2.3.5.3/kernel/vserver/inet.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/inet.c linux-3.7.1-vs2.3.5.4/kernel/vserver/inet.c --- linux-3.7.1/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/inet.c 2012-12-18 15:13:16.000000000 +0000 -@@ -0,0 +1,226 @@ ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/inet.c 2013-01-04 23:06:14.000000000 +0000 +@@ -0,0 +1,240 @@ + +#include +#include @@ -18949,13 +18953,18 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/inet.c linux-3.7.1-vs2.3.5.3/ke + ret = 1; + else { + struct nx_addr_v4 *ptr; ++ unsigned long flags; + ++ spin_lock_irqsave(&nxi1->addr_lock, flags); ++ spin_lock(&nxi2->addr_lock); + for (ptr = &nxi1->v4; ptr; ptr = ptr->next) { + if (v4_nx_addr_in_nx_info(nxi2, ptr, -1)) { + ret = 1; + break; + } + } ++ spin_unlock(&nxi2->addr_lock); ++ spin_unlock_irqrestore(&nxi1->addr_lock, flags); + } + + vxdprintk(VXD_CBIT(net, 2), @@ -18976,13 +18985,18 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/inet.c linux-3.7.1-vs2.3.5.3/ke + ret = 1; + else { + struct nx_addr_v6 *ptr; ++ unsigned long flags; + ++ spin_lock_irqsave(&nxi1->addr_lock, flags); ++ spin_lock(&nxi2->addr_lock); + for (ptr = &nxi1->v6; ptr; ptr = ptr->next) { + if (v6_nx_addr_in_nx_info(nxi2, ptr, -1)) { + ret = 1; + break; + } + } ++ spin_unlock(&nxi2->addr_lock); ++ spin_unlock_irqrestore(&nxi1->addr_lock, flags); + } + + vxdprintk(VXD_CBIT(net, 2), @@ -19093,6 +19107,7 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/inet.c linux-3.7.1-vs2.3.5.3/ke + + if (fl4->saddr == INADDR_ANY) { + struct nx_addr_v4 *ptr; ++ unsigned long flags; + __be32 found = 0; + + rt = __ip_route_output_key(net, fl4); @@ -19106,6 +19121,7 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/inet.c linux-3.7.1-vs2.3.5.3/ke + goto found; + } + ++ spin_lock_irqsave(&nxi->addr_lock, flags); + for (ptr = &nxi->v4; ptr; ptr = ptr->next) { + __be32 primary = ptr->ip[0].s_addr; + __be32 mask = ptr->mask.s_addr; @@ -19127,12 +19143,14 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/inet.c linux-3.7.1-vs2.3.5.3/ke + found = fl4->saddr; + ip_rt_put(rt); + if (found == primary) -+ goto found; ++ goto found_unlock; + } + } + /* still no source ip? */ + found = ipv4_is_loopback(fl4->daddr) + ? IPI_LOOPBACK : nxi->v4.ip[0].s_addr; ++ found_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, flags); + found: + /* assign src ip to flow */ + fl4->saddr = found; @@ -19156,9 +19174,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/inet.c linux-3.7.1-vs2.3.5.3/ke + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/init.c linux-3.7.1-vs2.3.5.3/kernel/vserver/init.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/init.c linux-3.7.1-vs2.3.5.4/kernel/vserver/init.c --- linux-3.7.1/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/init.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/init.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,45 @@ +/* + * linux/kernel/init.c @@ -19205,9 +19223,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/init.c linux-3.7.1-vs2.3.5.3/ke +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/inode.c linux-3.7.1-vs2.3.5.3/kernel/vserver/inode.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/inode.c linux-3.7.1-vs2.3.5.4/kernel/vserver/inode.c --- linux-3.7.1/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/inode.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/inode.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,437 @@ +/* + * linux/kernel/vserver/inode.c @@ -19646,9 +19664,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/inode.c linux-3.7.1-vs2.3.5.3/k + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/limit.c linux-3.7.1-vs2.3.5.3/kernel/vserver/limit.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/limit.c linux-3.7.1-vs2.3.5.4/kernel/vserver/limit.c --- linux-3.7.1/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/limit.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/limit.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,345 @@ +/* + * linux/kernel/vserver/limit.c @@ -19995,9 +20013,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/limit.c linux-3.7.1-vs2.3.5.3/k + return cache; +} + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/limit_init.h linux-3.7.1-vs2.3.5.3/kernel/vserver/limit_init.h +diff -NurpP --minimal linux-3.7.1/kernel/vserver/limit_init.h linux-3.7.1-vs2.3.5.4/kernel/vserver/limit_init.h --- linux-3.7.1/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/limit_init.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/limit_init.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,31 @@ + + @@ -20030,9 +20048,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/limit_init.h linux-3.7.1-vs2.3. + } +} + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/limit_proc.h linux-3.7.1-vs2.3.5.3/kernel/vserver/limit_proc.h +diff -NurpP --minimal linux-3.7.1/kernel/vserver/limit_proc.h linux-3.7.1-vs2.3.5.4/kernel/vserver/limit_proc.h --- linux-3.7.1/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/limit_proc.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/limit_proc.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,57 @@ +#ifndef _VX_LIMIT_PROC_H +#define _VX_LIMIT_PROC_H @@ -20091,10 +20109,10 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/limit_proc.h linux-3.7.1-vs2.3. +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/network.c linux-3.7.1-vs2.3.5.3/kernel/vserver/network.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/network.c linux-3.7.1-vs2.3.5.4/kernel/vserver/network.c --- linux-3.7.1/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/network.c 2012-12-18 15:13:16.000000000 +0000 -@@ -0,0 +1,1049 @@ ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/network.c 2013-01-04 22:38:16.000000000 +0000 +@@ -0,0 +1,1053 @@ +/* + * linux/kernel/vserver/network.c + * @@ -20717,12 +20735,13 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/network.c linux-3.7.1-vs2.3.5.3 +{ + struct nx_addr_v4 *nxa = NULL; + struct nx_addr_v4 *new = __alloc_nx_addr_v4(); ++ unsigned long irqflags; + int ret = -EEXIST; + + if (IS_ERR(new)) + return PTR_ERR(new); + -+ spin_lock(&nxi->addr_lock); ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); + if (__find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa)) + goto out_unlock; + @@ -20742,7 +20761,7 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/network.c linux-3.7.1-vs2.3.5.3 + nxa->flags = flags; + ret = 0; +out_unlock: -+ spin_unlock(&nxi->addr_lock); ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); + if (new) + __dealloc_nx_addr_v4(new); + return ret; @@ -20753,9 +20772,10 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/network.c linux-3.7.1-vs2.3.5.3 +{ + struct nx_addr_v4 *nxa = NULL; + struct nx_addr_v4 *old = NULL; ++ unsigned long irqflags; + int ret = 0; + -+ spin_lock(&nxi->addr_lock); ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); + switch (type) { + case NXA_TYPE_ADDR: + old = __find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa); @@ -20787,7 +20807,7 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/network.c linux-3.7.1-vs2.3.5.3 + default: + ret = -EINVAL; + } -+ spin_unlock(&nxi->addr_lock); ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); + __dealloc_nx_addr_v4_all(old); + return ret; +} @@ -20960,12 +20980,13 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/network.c linux-3.7.1-vs2.3.5.3 +{ + struct nx_addr_v6 *nxa = NULL; + struct nx_addr_v6 *new = __alloc_nx_addr_v6(); ++ unsigned long irqflags; + int ret = -EEXIST; + + if (IS_ERR(new)) + return PTR_ERR(new); + -+ spin_lock(&nxi->addr_lock); ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); + if (__find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa)) + goto out_unlock; + @@ -20982,7 +21003,7 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/network.c linux-3.7.1-vs2.3.5.3 + nxa->flags = flags; + ret = 0; +out_unlock: -+ spin_unlock(&nxi->addr_lock); ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); + if (new) + __dealloc_nx_addr_v6(new); + return ret; @@ -20994,9 +21015,10 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/network.c linux-3.7.1-vs2.3.5.3 +{ + struct nx_addr_v6 *nxa = NULL; + struct nx_addr_v6 *old = NULL; ++ unsigned long irqflags; + int ret = 0; + -+ spin_lock(&nxi->addr_lock); ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); + switch (type) { + case NXA_TYPE_ADDR: + old = __find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa); @@ -21028,7 +21050,7 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/network.c linux-3.7.1-vs2.3.5.3 + default: + ret = -EINVAL; + } -+ spin_unlock(&nxi->addr_lock); ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); + __dealloc_nx_addr_v6_all(old); + return ret; +} @@ -21144,9 +21166,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/network.c linux-3.7.1-vs2.3.5.3 +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/proc.c linux-3.7.1-vs2.3.5.3/kernel/vserver/proc.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/proc.c linux-3.7.1-vs2.3.5.4/kernel/vserver/proc.c --- linux-3.7.1/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/proc.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/proc.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,1110 @@ +/* + * linux/kernel/vserver/proc.c @@ -22258,9 +22280,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/proc.c linux-3.7.1-vs2.3.5.3/ke + return buffer - orig; +} + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/sched.c linux-3.7.1-vs2.3.5.3/kernel/vserver/sched.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/sched.c linux-3.7.1-vs2.3.5.4/kernel/vserver/sched.c --- linux-3.7.1/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/sched.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/sched.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,83 @@ +/* + * linux/kernel/vserver/sched.c @@ -22345,9 +22367,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/sched.c linux-3.7.1-vs2.3.5.3/k + return 0; +} + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/sched_init.h linux-3.7.1-vs2.3.5.3/kernel/vserver/sched_init.h +diff -NurpP --minimal linux-3.7.1/kernel/vserver/sched_init.h linux-3.7.1-vs2.3.5.4/kernel/vserver/sched_init.h --- linux-3.7.1/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/sched_init.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/sched_init.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,27 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) @@ -22376,9 +22398,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/sched_init.h linux-3.7.1-vs2.3. +{ + return; +} -diff -NurpP --minimal linux-3.7.1/kernel/vserver/sched_proc.h linux-3.7.1-vs2.3.5.3/kernel/vserver/sched_proc.h +diff -NurpP --minimal linux-3.7.1/kernel/vserver/sched_proc.h linux-3.7.1-vs2.3.5.4/kernel/vserver/sched_proc.h --- linux-3.7.1/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/sched_proc.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/sched_proc.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,32 @@ +#ifndef _VX_SCHED_PROC_H +#define _VX_SCHED_PROC_H @@ -22412,9 +22434,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/sched_proc.h linux-3.7.1-vs2.3. +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-3.7.1/kernel/vserver/signal.c linux-3.7.1-vs2.3.5.3/kernel/vserver/signal.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/signal.c linux-3.7.1-vs2.3.5.4/kernel/vserver/signal.c --- linux-3.7.1/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/signal.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/signal.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,134 @@ +/* + * linux/kernel/vserver/signal.c @@ -22550,9 +22572,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/signal.c linux-3.7.1-vs2.3.5.3/ + return ret; +} + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/space.c linux-3.7.1-vs2.3.5.3/kernel/vserver/space.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/space.c linux-3.7.1-vs2.3.5.4/kernel/vserver/space.c --- linux-3.7.1/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/space.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/space.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,436 @@ +/* + * linux/kernel/vserver/space.c @@ -22990,9 +23012,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/space.c linux-3.7.1-vs2.3.5.3/k + return 0; +} + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/switch.c linux-3.7.1-vs2.3.5.3/kernel/vserver/switch.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/switch.c linux-3.7.1-vs2.3.5.4/kernel/vserver/switch.c --- linux-3.7.1/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/switch.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/switch.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,556 @@ +/* + * linux/kernel/vserver/switch.c @@ -23550,9 +23572,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/switch.c linux-3.7.1-vs2.3.5.3/ +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-3.7.1/kernel/vserver/sysctl.c linux-3.7.1-vs2.3.5.3/kernel/vserver/sysctl.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/sysctl.c linux-3.7.1-vs2.3.5.4/kernel/vserver/sysctl.c --- linux-3.7.1/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/sysctl.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/sysctl.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,247 @@ +/* + * kernel/vserver/sysctl.c @@ -23801,9 +23823,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/sysctl.c linux-3.7.1-vs2.3.5.3/ +EXPORT_SYMBOL_GPL(vs_debug_perm); +EXPORT_SYMBOL_GPL(vs_debug_misc); + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/tag.c linux-3.7.1-vs2.3.5.3/kernel/vserver/tag.c +diff -NurpP --minimal linux-3.7.1/kernel/vserver/tag.c linux-3.7.1-vs2.3.5.4/kernel/vserver/tag.c --- linux-3.7.1/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/tag.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/tag.c 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,63 @@ +/* + * linux/kernel/vserver/tag.c @@ -23868,9 +23890,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/tag.c linux-3.7.1-vs2.3.5.3/ker +} + + -diff -NurpP --minimal linux-3.7.1/kernel/vserver/vci_config.h linux-3.7.1-vs2.3.5.3/kernel/vserver/vci_config.h +diff -NurpP --minimal linux-3.7.1/kernel/vserver/vci_config.h linux-3.7.1-vs2.3.5.4/kernel/vserver/vci_config.h --- linux-3.7.1/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/kernel/vserver/vci_config.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/kernel/vserver/vci_config.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,80 @@ + +/* interface version */ @@ -23952,9 +23974,9 @@ diff -NurpP --minimal linux-3.7.1/kernel/vserver/vci_config.h linux-3.7.1-vs2.3. + 0; +} + -diff -NurpP --minimal linux-3.7.1/mm/memcontrol.c linux-3.7.1-vs2.3.5.3/mm/memcontrol.c +diff -NurpP --minimal linux-3.7.1/mm/memcontrol.c linux-3.7.1-vs2.3.5.4/mm/memcontrol.c --- linux-3.7.1/mm/memcontrol.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/mm/memcontrol.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/mm/memcontrol.c 2012-12-18 15:13:16.000000000 +0000 @@ -884,6 +884,31 @@ struct mem_cgroup *mem_cgroup_from_task( return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id)); } @@ -23987,9 +24009,9 @@ diff -NurpP --minimal linux-3.7.1/mm/memcontrol.c linux-3.7.1-vs2.3.5.3/mm/memco struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) { struct mem_cgroup *memcg = NULL; -diff -NurpP --minimal linux-3.7.1/mm/oom_kill.c linux-3.7.1-vs2.3.5.3/mm/oom_kill.c +diff -NurpP --minimal linux-3.7.1/mm/oom_kill.c linux-3.7.1-vs2.3.5.4/mm/oom_kill.c --- linux-3.7.1/mm/oom_kill.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/mm/oom_kill.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/mm/oom_kill.c 2012-12-18 15:13:16.000000000 +0000 @@ -35,6 +35,8 @@ #include #include @@ -24064,9 +24086,9 @@ diff -NurpP --minimal linux-3.7.1/mm/oom_kill.c linux-3.7.1-vs2.3.5.3/mm/oom_kil } if (PTR_ERR(p) != -1UL) { oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, -diff -NurpP --minimal linux-3.7.1/mm/page_alloc.c linux-3.7.1-vs2.3.5.3/mm/page_alloc.c +diff -NurpP --minimal linux-3.7.1/mm/page_alloc.c linux-3.7.1-vs2.3.5.4/mm/page_alloc.c --- linux-3.7.1/mm/page_alloc.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/mm/page_alloc.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/mm/page_alloc.c 2012-12-18 15:13:16.000000000 +0000 @@ -58,6 +58,8 @@ #include #include @@ -24096,9 +24118,9 @@ diff -NurpP --minimal linux-3.7.1/mm/page_alloc.c linux-3.7.1-vs2.3.5.3/mm/page_ } #endif -diff -NurpP --minimal linux-3.7.1/mm/pgtable-generic.c linux-3.7.1-vs2.3.5.3/mm/pgtable-generic.c +diff -NurpP --minimal linux-3.7.1/mm/pgtable-generic.c linux-3.7.1-vs2.3.5.4/mm/pgtable-generic.c --- linux-3.7.1/mm/pgtable-generic.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/mm/pgtable-generic.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/mm/pgtable-generic.c 2012-12-18 15:13:16.000000000 +0000 @@ -6,6 +6,8 @@ * Copyright (C) 2010 Linus Torvalds */ @@ -24108,9 +24130,9 @@ diff -NurpP --minimal linux-3.7.1/mm/pgtable-generic.c linux-3.7.1-vs2.3.5.3/mm/ #include #include #include -diff -NurpP --minimal linux-3.7.1/mm/shmem.c linux-3.7.1-vs2.3.5.3/mm/shmem.c +diff -NurpP --minimal linux-3.7.1/mm/shmem.c linux-3.7.1-vs2.3.5.4/mm/shmem.c --- linux-3.7.1/mm/shmem.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/mm/shmem.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/mm/shmem.c 2012-12-18 15:13:16.000000000 +0000 @@ -1820,7 +1820,7 @@ static int shmem_statfs(struct dentry *d { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); @@ -24129,9 +24151,9 @@ diff -NurpP --minimal linux-3.7.1/mm/shmem.c linux-3.7.1-vs2.3.5.3/mm/shmem.c sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-3.7.1/mm/slab.c linux-3.7.1-vs2.3.5.3/mm/slab.c +diff -NurpP --minimal linux-3.7.1/mm/slab.c linux-3.7.1-vs2.3.5.4/mm/slab.c --- linux-3.7.1/mm/slab.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/mm/slab.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/mm/slab.c 2012-12-18 15:13:16.000000000 +0000 @@ -445,6 +445,8 @@ static void kmem_list3_init(struct kmem_ #define STATS_INC_FREEMISS(x) do { } while (0) #endif @@ -24165,9 +24187,9 @@ diff -NurpP --minimal linux-3.7.1/mm/slab.c linux-3.7.1-vs2.3.5.3/mm/slab.c kmemcheck_slab_free(cachep, objp, cachep->object_size); -diff -NurpP --minimal linux-3.7.1/mm/slab_vs.h linux-3.7.1-vs2.3.5.3/mm/slab_vs.h +diff -NurpP --minimal linux-3.7.1/mm/slab_vs.h linux-3.7.1-vs2.3.5.4/mm/slab_vs.h --- linux-3.7.1/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/mm/slab_vs.h 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/mm/slab_vs.h 2012-12-18 15:13:16.000000000 +0000 @@ -0,0 +1,29 @@ + +#include @@ -24198,9 +24220,9 @@ diff -NurpP --minimal linux-3.7.1/mm/slab_vs.h linux-3.7.1-vs2.3.5.3/mm/slab_vs. + atomic_sub(cachep->size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-3.7.1/mm/swapfile.c linux-3.7.1-vs2.3.5.3/mm/swapfile.c +diff -NurpP --minimal linux-3.7.1/mm/swapfile.c linux-3.7.1-vs2.3.5.4/mm/swapfile.c --- linux-3.7.1/mm/swapfile.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/mm/swapfile.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/mm/swapfile.c 2012-12-18 15:13:16.000000000 +0000 @@ -39,6 +39,7 @@ #include #include @@ -24235,9 +24257,9 @@ diff -NurpP --minimal linux-3.7.1/mm/swapfile.c linux-3.7.1-vs2.3.5.3/mm/swapfil } /* -diff -NurpP --minimal linux-3.7.1/net/bridge/br_multicast.c linux-3.7.1-vs2.3.5.3/net/bridge/br_multicast.c +diff -NurpP --minimal linux-3.7.1/net/bridge/br_multicast.c linux-3.7.1-vs2.3.5.4/net/bridge/br_multicast.c --- linux-3.7.1/net/bridge/br_multicast.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/bridge/br_multicast.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/bridge/br_multicast.c 2012-12-18 15:13:16.000000000 +0000 @@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_ ip6h->hop_limit = 1; ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); @@ -24247,9 +24269,9 @@ diff -NurpP --minimal linux-3.7.1/net/bridge/br_multicast.c linux-3.7.1-vs2.3.5. kfree_skb(skb); return NULL; } -diff -NurpP --minimal linux-3.7.1/net/core/dev.c linux-3.7.1-vs2.3.5.3/net/core/dev.c +diff -NurpP --minimal linux-3.7.1/net/core/dev.c linux-3.7.1-vs2.3.5.4/net/core/dev.c --- linux-3.7.1/net/core/dev.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/core/dev.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/core/dev.c 2012-12-18 15:13:16.000000000 +0000 @@ -126,6 +126,7 @@ #include #include @@ -24367,9 +24389,9 @@ diff -NurpP --minimal linux-3.7.1/net/core/dev.c linux-3.7.1-vs2.3.5.3/net/core/ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu " "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n", dev->name, stats->rx_bytes, stats->rx_packets, -diff -NurpP --minimal linux-3.7.1/net/core/rtnetlink.c linux-3.7.1-vs2.3.5.3/net/core/rtnetlink.c +diff -NurpP --minimal linux-3.7.1/net/core/rtnetlink.c linux-3.7.1-vs2.3.5.4/net/core/rtnetlink.c --- linux-3.7.1/net/core/rtnetlink.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/core/rtnetlink.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/core/rtnetlink.c 2012-12-18 15:13:16.000000000 +0000 @@ -1080,6 +1080,8 @@ static int rtnl_dump_ifinfo(struct sk_bu hlist_for_each_entry_rcu(dev, node, head, index_hlist) { if (idx < s_idx) @@ -24389,9 +24411,9 @@ diff -NurpP --minimal linux-3.7.1/net/core/rtnetlink.c linux-3.7.1-vs2.3.5.3/net skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL); if (skb == NULL) goto errout; -diff -NurpP --minimal linux-3.7.1/net/core/sock.c linux-3.7.1-vs2.3.5.3/net/core/sock.c +diff -NurpP --minimal linux-3.7.1/net/core/sock.c linux-3.7.1-vs2.3.5.4/net/core/sock.c --- linux-3.7.1/net/core/sock.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/core/sock.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/core/sock.c 2012-12-18 15:13:16.000000000 +0000 @@ -132,6 +132,10 @@ #include @@ -24459,9 +24481,9 @@ diff -NurpP --minimal linux-3.7.1/net/core/sock.c linux-3.7.1-vs2.3.5.3/net/core /* * Before updating sk_refcnt, we must commit prior changes to memory * (Documentation/RCU/rculist_nulls.txt for details) -diff -NurpP --minimal linux-3.7.1/net/ipv4/af_inet.c linux-3.7.1-vs2.3.5.3/net/ipv4/af_inet.c +diff -NurpP --minimal linux-3.7.1/net/ipv4/af_inet.c linux-3.7.1-vs2.3.5.4/net/ipv4/af_inet.c --- linux-3.7.1/net/ipv4/af_inet.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv4/af_inet.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv4/af_inet.c 2012-12-18 15:13:16.000000000 +0000 @@ -118,6 +118,7 @@ #ifdef CONFIG_IP_MROUTE #include @@ -24539,9 +24561,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv4/af_inet.c linux-3.7.1-vs2.3.5.3/net/i sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; } -diff -NurpP --minimal linux-3.7.1/net/ipv4/arp.c linux-3.7.1-vs2.3.5.3/net/ipv4/arp.c +diff -NurpP --minimal linux-3.7.1/net/ipv4/arp.c linux-3.7.1-vs2.3.5.4/net/ipv4/arp.c --- linux-3.7.1/net/ipv4/arp.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv4/arp.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv4/arp.c 2012-12-18 15:13:16.000000000 +0000 @@ -1318,6 +1318,7 @@ static void arp_format_neigh_entry(struc struct net_device *dev = n->dev; int hatype = dev->type; @@ -24558,9 +24580,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv4/arp.c linux-3.7.1-vs2.3.5.3/net/ipv4/ sprintf(tbuf, "%pI4", n->key); seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n", tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00", -diff -NurpP --minimal linux-3.7.1/net/ipv4/devinet.c linux-3.7.1-vs2.3.5.3/net/ipv4/devinet.c +diff -NurpP --minimal linux-3.7.1/net/ipv4/devinet.c linux-3.7.1-vs2.3.5.4/net/ipv4/devinet.c --- linux-3.7.1/net/ipv4/devinet.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv4/devinet.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv4/devinet.c 2012-12-18 15:13:16.000000000 +0000 @@ -513,6 +513,7 @@ struct in_device *inetdev_by_index(struc } EXPORT_SYMBOL(inetdev_by_index); @@ -24627,9 +24649,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv4/devinet.c linux-3.7.1-vs2.3.5.3/net/i if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-3.7.1/net/ipv4/fib_trie.c linux-3.7.1-vs2.3.5.3/net/ipv4/fib_trie.c +diff -NurpP --minimal linux-3.7.1/net/ipv4/fib_trie.c linux-3.7.1-vs2.3.5.4/net/ipv4/fib_trie.c --- linux-3.7.1/net/ipv4/fib_trie.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv4/fib_trie.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv4/fib_trie.c 2012-12-18 15:13:16.000000000 +0000 @@ -2557,6 +2557,7 @@ static int fib_route_seq_show(struct seq || fa->fa_type == RTN_MULTICAST) continue; @@ -24638,9 +24660,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv4/fib_trie.c linux-3.7.1-vs2.3.5.3/net/ if (fi) seq_printf(seq, "%s\t%08X\t%08X\t%04X\t%d\t%u\t" -diff -NurpP --minimal linux-3.7.1/net/ipv4/inet_connection_sock.c linux-3.7.1-vs2.3.5.3/net/ipv4/inet_connection_sock.c +diff -NurpP --minimal linux-3.7.1/net/ipv4/inet_connection_sock.c linux-3.7.1-vs2.3.5.4/net/ipv4/inet_connection_sock.c --- linux-3.7.1/net/ipv4/inet_connection_sock.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv4/inet_connection_sock.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv4/inet_connection_sock.c 2012-12-18 15:13:16.000000000 +0000 @@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low, } EXPORT_SYMBOL(inet_get_local_port_range); @@ -24690,9 +24712,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv4/inet_connection_sock.c linux-3.7.1-vs break; } if (!relax && reuse && sk2->sk_reuse && -diff -NurpP --minimal linux-3.7.1/net/ipv4/inet_diag.c linux-3.7.1-vs2.3.5.3/net/ipv4/inet_diag.c +diff -NurpP --minimal linux-3.7.1/net/ipv4/inet_diag.c linux-3.7.1-vs2.3.5.4/net/ipv4/inet_diag.c --- linux-3.7.1/net/ipv4/inet_diag.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv4/inet_diag.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv4/inet_diag.c 2012-12-18 15:13:16.000000000 +0000 @@ -31,6 +31,8 @@ #include @@ -24804,9 +24826,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv4/inet_diag.c linux-3.7.1-vs2.3.5.3/net if (num < s_num) goto next_dying; if (r->sdiag_family != AF_UNSPEC && -diff -NurpP --minimal linux-3.7.1/net/ipv4/inet_hashtables.c linux-3.7.1-vs2.3.5.3/net/ipv4/inet_hashtables.c +diff -NurpP --minimal linux-3.7.1/net/ipv4/inet_hashtables.c linux-3.7.1-vs2.3.5.4/net/ipv4/inet_hashtables.c --- linux-3.7.1/net/ipv4/inet_hashtables.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv4/inet_hashtables.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv4/inet_hashtables.c 2012-12-18 15:13:16.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -24843,9 +24865,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv4/inet_hashtables.c linux-3.7.1-vs2.3.5 /* * 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.7.1/net/ipv4/netfilter.c linux-3.7.1-vs2.3.5.3/net/ipv4/netfilter.c +diff -NurpP --minimal linux-3.7.1/net/ipv4/netfilter.c linux-3.7.1-vs2.3.5.4/net/ipv4/netfilter.c --- linux-3.7.1/net/ipv4/netfilter.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv4/netfilter.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv4/netfilter.c 2012-12-18 15:13:16.000000000 +0000 @@ -6,7 +6,7 @@ #include #include @@ -24855,9 +24877,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv4/netfilter.c linux-3.7.1-vs2.3.5.3/net #include #include #include -diff -NurpP --minimal linux-3.7.1/net/ipv4/raw.c linux-3.7.1-vs2.3.5.3/net/ipv4/raw.c +diff -NurpP --minimal linux-3.7.1/net/ipv4/raw.c linux-3.7.1-vs2.3.5.4/net/ipv4/raw.c --- linux-3.7.1/net/ipv4/raw.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv4/raw.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv4/raw.c 2012-12-18 15:13:16.000000000 +0000 @@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru if (net_eq(sock_net(sk), net) && inet->inet_num == num && @@ -24950,9 +24972,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv4/raw.c linux-3.7.1-vs2.3.5.3/net/ipv4/ if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-3.7.1/net/ipv4/route.c linux-3.7.1-vs2.3.5.3/net/ipv4/route.c +diff -NurpP --minimal linux-3.7.1/net/ipv4/route.c linux-3.7.1-vs2.3.5.4/net/ipv4/route.c --- linux-3.7.1/net/ipv4/route.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv4/route.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv4/route.c 2012-12-18 15:13:16.000000000 +0000 @@ -1952,7 +1952,7 @@ struct rtable *__ip_route_output_key(str @@ -24962,9 +24984,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv4/route.c linux-3.7.1-vs2.3.5.3/net/ipv rth = ERR_PTR(-ENODEV); if (dev_out == NULL) goto out; -diff -NurpP --minimal linux-3.7.1/net/ipv4/tcp.c linux-3.7.1-vs2.3.5.3/net/ipv4/tcp.c +diff -NurpP --minimal linux-3.7.1/net/ipv4/tcp.c linux-3.7.1-vs2.3.5.4/net/ipv4/tcp.c --- linux-3.7.1/net/ipv4/tcp.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv4/tcp.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv4/tcp.c 2012-12-18 15:13:16.000000000 +0000 @@ -268,6 +268,7 @@ #include #include @@ -24973,9 +24995,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv4/tcp.c linux-3.7.1-vs2.3.5.3/net/ipv4/ #include #include -diff -NurpP --minimal linux-3.7.1/net/ipv4/tcp_ipv4.c linux-3.7.1-vs2.3.5.3/net/ipv4/tcp_ipv4.c +diff -NurpP --minimal linux-3.7.1/net/ipv4/tcp_ipv4.c linux-3.7.1-vs2.3.5.4/net/ipv4/tcp_ipv4.c --- linux-3.7.1/net/ipv4/tcp_ipv4.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv4/tcp_ipv4.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv4/tcp_ipv4.c 2012-12-18 15:13:16.000000000 +0000 @@ -2264,6 +2264,12 @@ static void *listening_get_next(struct s req = req->dl_next; while (1) { @@ -25081,9 +25103,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv4/tcp_ipv4.c linux-3.7.1-vs2.3.5.3/net/ destp = ntohs(tw->tw_dport); srcp = ntohs(tw->tw_sport); -diff -NurpP --minimal linux-3.7.1/net/ipv4/tcp_minisocks.c linux-3.7.1-vs2.3.5.3/net/ipv4/tcp_minisocks.c +diff -NurpP --minimal linux-3.7.1/net/ipv4/tcp_minisocks.c linux-3.7.1-vs2.3.5.4/net/ipv4/tcp_minisocks.c --- linux-3.7.1/net/ipv4/tcp_minisocks.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv4/tcp_minisocks.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv4/tcp_minisocks.c 2012-12-18 15:13:16.000000000 +0000 @@ -23,6 +23,9 @@ #include #include @@ -25106,9 +25128,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv4/tcp_minisocks.c linux-3.7.1-vs2.3.5.3 #if IS_ENABLED(CONFIG_IPV6) if (tw->tw_family == PF_INET6) { struct ipv6_pinfo *np = inet6_sk(sk); -diff -NurpP --minimal linux-3.7.1/net/ipv4/udp.c linux-3.7.1-vs2.3.5.3/net/ipv4/udp.c +diff -NurpP --minimal linux-3.7.1/net/ipv4/udp.c linux-3.7.1-vs2.3.5.4/net/ipv4/udp.c --- linux-3.7.1/net/ipv4/udp.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv4/udp.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv4/udp.c 2012-12-18 15:13:16.000000000 +0000 @@ -300,14 +300,7 @@ fail: } EXPORT_SYMBOL(udp_lib_get_port); @@ -25241,9 +25263,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv4/udp.c linux-3.7.1-vs2.3.5.3/net/ipv4/ __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); -diff -NurpP --minimal linux-3.7.1/net/ipv6/Kconfig linux-3.7.1-vs2.3.5.3/net/ipv6/Kconfig +diff -NurpP --minimal linux-3.7.1/net/ipv6/Kconfig linux-3.7.1-vs2.3.5.4/net/ipv6/Kconfig --- linux-3.7.1/net/ipv6/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv6/Kconfig 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv6/Kconfig 2012-12-18 15:13:16.000000000 +0000 @@ -4,8 +4,8 @@ # IPv6 as module will cause a CRASH if you try to unload it @@ -25255,9 +25277,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv6/Kconfig linux-3.7.1-vs2.3.5.3/net/ipv ---help--- This is complemental support for the IP version 6. You will still be able to do traditional IPv4 networking as well. -diff -NurpP --minimal linux-3.7.1/net/ipv6/addrconf.c linux-3.7.1-vs2.3.5.3/net/ipv6/addrconf.c +diff -NurpP --minimal linux-3.7.1/net/ipv6/addrconf.c linux-3.7.1-vs2.3.5.4/net/ipv6/addrconf.c --- linux-3.7.1/net/ipv6/addrconf.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv6/addrconf.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv6/addrconf.c 2012-12-18 15:13:16.000000000 +0000 @@ -92,6 +92,8 @@ #include #include @@ -25357,9 +25379,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv6/addrconf.c linux-3.7.1-vs2.3.5.3/net/ idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-3.7.1/net/ipv6/af_inet6.c linux-3.7.1-vs2.3.5.3/net/ipv6/af_inet6.c +diff -NurpP --minimal linux-3.7.1/net/ipv6/af_inet6.c linux-3.7.1-vs2.3.5.4/net/ipv6/af_inet6.c --- linux-3.7.1/net/ipv6/af_inet6.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv6/af_inet6.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv6/af_inet6.c 2012-12-18 15:13:16.000000000 +0000 @@ -43,6 +43,8 @@ #include #include @@ -25455,9 +25477,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv6/af_inet6.c linux-3.7.1-vs2.3.5.3/net/ if (ipv6_addr_any(&np->rcv_saddr)) sin->sin6_addr = np->saddr; else -diff -NurpP --minimal linux-3.7.1/net/ipv6/datagram.c linux-3.7.1-vs2.3.5.3/net/ipv6/datagram.c +diff -NurpP --minimal linux-3.7.1/net/ipv6/datagram.c linux-3.7.1-vs2.3.5.4/net/ipv6/datagram.c --- linux-3.7.1/net/ipv6/datagram.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv6/datagram.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv6/datagram.c 2012-12-18 15:13:16.000000000 +0000 @@ -645,7 +645,7 @@ int datagram_send_ctl(struct net *net, s rcu_read_lock(); @@ -25467,9 +25489,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv6/datagram.c linux-3.7.1-vs2.3.5.3/net/ if (!dev) { rcu_read_unlock(); return -ENODEV; -diff -NurpP --minimal linux-3.7.1/net/ipv6/fib6_rules.c linux-3.7.1-vs2.3.5.3/net/ipv6/fib6_rules.c +diff -NurpP --minimal linux-3.7.1/net/ipv6/fib6_rules.c linux-3.7.1-vs2.3.5.4/net/ipv6/fib6_rules.c --- linux-3.7.1/net/ipv6/fib6_rules.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv6/fib6_rules.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv6/fib6_rules.c 2012-12-18 15:13:16.000000000 +0000 @@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r ip6_dst_idev(&rt->dst)->dev, &flp6->daddr, @@ -25479,9 +25501,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv6/fib6_rules.c linux-3.7.1-vs2.3.5.3/ne goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-3.7.1/net/ipv6/inet6_hashtables.c linux-3.7.1-vs2.3.5.3/net/ipv6/inet6_hashtables.c +diff -NurpP --minimal linux-3.7.1/net/ipv6/inet6_hashtables.c linux-3.7.1-vs2.3.5.4/net/ipv6/inet6_hashtables.c --- linux-3.7.1/net/ipv6/inet6_hashtables.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv6/inet6_hashtables.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv6/inet6_hashtables.c 2012-12-18 15:13:16.000000000 +0000 @@ -16,6 +16,7 @@ #include @@ -25517,9 +25539,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv6/inet6_hashtables.c linux-3.7.1-vs2.3. } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-3.7.1/net/ipv6/ip6_output.c linux-3.7.1-vs2.3.5.3/net/ipv6/ip6_output.c +diff -NurpP --minimal linux-3.7.1/net/ipv6/ip6_output.c linux-3.7.1-vs2.3.5.4/net/ipv6/ip6_output.c --- linux-3.7.1/net/ipv6/ip6_output.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv6/ip6_output.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv6/ip6_output.c 2012-12-18 15:13:16.000000000 +0000 @@ -964,7 +964,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, @@ -25530,9 +25552,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv6/ip6_output.c linux-3.7.1-vs2.3.5.3/ne if (err) goto out_err_release; } -diff -NurpP --minimal linux-3.7.1/net/ipv6/ndisc.c linux-3.7.1-vs2.3.5.3/net/ipv6/ndisc.c +diff -NurpP --minimal linux-3.7.1/net/ipv6/ndisc.c linux-3.7.1-vs2.3.5.4/net/ipv6/ndisc.c --- linux-3.7.1/net/ipv6/ndisc.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv6/ndisc.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv6/ndisc.c 2012-12-18 15:13:16.000000000 +0000 @@ -517,7 +517,7 @@ static void ndisc_send_na(struct net_dev } else { if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, @@ -25542,9 +25564,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv6/ndisc.c linux-3.7.1-vs2.3.5.3/net/ipv return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-3.7.1/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.7.1-vs2.3.5.3/net/ipv6/netfilter/ip6t_MASQUERADE.c +diff -NurpP --minimal linux-3.7.1/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.7.1-vs2.3.5.4/net/ipv6/netfilter/ip6t_MASQUERADE.c --- linux-3.7.1/net/ipv6/netfilter/ip6t_MASQUERADE.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv6/netfilter/ip6t_MASQUERADE.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv6/netfilter/ip6t_MASQUERADE.c 2012-12-18 15:13:16.000000000 +0000 @@ -34,7 +34,7 @@ masquerade_tg6(struct sk_buff *skb, cons ctinfo == IP_CT_RELATED_REPLY)); @@ -25554,9 +25576,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.7 return NF_DROP; nfct_nat(ct)->masq_index = par->out->ifindex; -diff -NurpP --minimal linux-3.7.1/net/ipv6/raw.c linux-3.7.1-vs2.3.5.3/net/ipv6/raw.c +diff -NurpP --minimal linux-3.7.1/net/ipv6/raw.c linux-3.7.1-vs2.3.5.4/net/ipv6/raw.c --- linux-3.7.1/net/ipv6/raw.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv6/raw.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv6/raw.c 2012-12-18 15:13:16.000000000 +0000 @@ -30,6 +30,7 @@ #include #include @@ -25579,9 +25601,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv6/raw.c linux-3.7.1-vs2.3.5.3/net/ipv6/ /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -diff -NurpP --minimal linux-3.7.1/net/ipv6/route.c linux-3.7.1-vs2.3.5.3/net/ipv6/route.c +diff -NurpP --minimal linux-3.7.1/net/ipv6/route.c linux-3.7.1-vs2.3.5.4/net/ipv6/route.c --- linux-3.7.1/net/ipv6/route.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv6/route.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv6/route.c 2012-12-18 15:13:16.000000000 +0000 @@ -57,6 +57,7 @@ #include #include @@ -25629,9 +25651,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv6/route.c linux-3.7.1-vs2.3.5.3/net/ipv seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); #ifdef CONFIG_IPV6_SUBTREES -diff -NurpP --minimal linux-3.7.1/net/ipv6/tcp_ipv6.c linux-3.7.1-vs2.3.5.3/net/ipv6/tcp_ipv6.c +diff -NurpP --minimal linux-3.7.1/net/ipv6/tcp_ipv6.c linux-3.7.1-vs2.3.5.4/net/ipv6/tcp_ipv6.c --- linux-3.7.1/net/ipv6/tcp_ipv6.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv6/tcp_ipv6.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv6/tcp_ipv6.c 2012-12-18 15:13:16.000000000 +0000 @@ -71,6 +71,7 @@ #include @@ -25658,9 +25680,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv6/tcp_ipv6.c linux-3.7.1-vs2.3.5.3/net/ addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-3.7.1/net/ipv6/udp.c linux-3.7.1-vs2.3.5.3/net/ipv6/udp.c +diff -NurpP --minimal linux-3.7.1/net/ipv6/udp.c linux-3.7.1-vs2.3.5.4/net/ipv6/udp.c --- linux-3.7.1/net/ipv6/udp.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv6/udp.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv6/udp.c 2012-12-18 15:13:16.000000000 +0000 @@ -45,42 +45,68 @@ #include #include @@ -25754,9 +25776,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv6/udp.c linux-3.7.1-vs2.3.5.3/net/ipv6/ } if (!ipv6_addr_any(&np->daddr)) { if (!ipv6_addr_equal(&np->daddr, saddr)) -diff -NurpP --minimal linux-3.7.1/net/ipv6/xfrm6_policy.c linux-3.7.1-vs2.3.5.3/net/ipv6/xfrm6_policy.c +diff -NurpP --minimal linux-3.7.1/net/ipv6/xfrm6_policy.c linux-3.7.1-vs2.3.5.4/net/ipv6/xfrm6_policy.c --- linux-3.7.1/net/ipv6/xfrm6_policy.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/ipv6/xfrm6_policy.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/ipv6/xfrm6_policy.c 2012-12-18 15:13:16.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, @@ -25766,9 +25788,9 @@ diff -NurpP --minimal linux-3.7.1/net/ipv6/xfrm6_policy.c linux-3.7.1-vs2.3.5.3/ dst_release(dst); return 0; } -diff -NurpP --minimal linux-3.7.1/net/netfilter/ipvs/ip_vs_xmit.c linux-3.7.1-vs2.3.5.3/net/netfilter/ipvs/ip_vs_xmit.c +diff -NurpP --minimal linux-3.7.1/net/netfilter/ipvs/ip_vs_xmit.c linux-3.7.1-vs2.3.5.4/net/netfilter/ipvs/ip_vs_xmit.c --- linux-3.7.1/net/netfilter/ipvs/ip_vs_xmit.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/netfilter/ipvs/ip_vs_xmit.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/netfilter/ipvs/ip_vs_xmit.c 2012-12-18 15:13:16.000000000 +0000 @@ -273,7 +273,7 @@ __ip_vs_route_output_v6(struct net *net, return dst; if (ipv6_addr_any(&fl6.saddr) && @@ -25778,9 +25800,9 @@ diff -NurpP --minimal linux-3.7.1/net/netfilter/ipvs/ip_vs_xmit.c linux-3.7.1-vs goto out_err; if (do_xfrm) { dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-3.7.1/net/netlink/af_netlink.c linux-3.7.1-vs2.3.5.3/net/netlink/af_netlink.c +diff -NurpP --minimal linux-3.7.1/net/netlink/af_netlink.c linux-3.7.1-vs2.3.5.4/net/netlink/af_netlink.c --- linux-3.7.1/net/netlink/af_netlink.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/netlink/af_netlink.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/netlink/af_netlink.c 2012-12-18 15:13:16.000000000 +0000 @@ -55,6 +55,9 @@ #include #include @@ -25820,9 +25842,9 @@ diff -NurpP --minimal linux-3.7.1/net/netlink/af_netlink.c linux-3.7.1-vs2.3.5.3 s = sk_next(s); if (s) { iter->link = i; -diff -NurpP --minimal linux-3.7.1/net/socket.c linux-3.7.1-vs2.3.5.3/net/socket.c +diff -NurpP --minimal linux-3.7.1/net/socket.c linux-3.7.1-vs2.3.5.4/net/socket.c --- linux-3.7.1/net/socket.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/socket.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/socket.c 2012-12-18 15:13:16.000000000 +0000 @@ -99,6 +99,10 @@ #include @@ -25929,9 +25951,9 @@ diff -NurpP --minimal linux-3.7.1/net/socket.c linux-3.7.1-vs2.3.5.3/net/socket. err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-3.7.1/net/sunrpc/auth.c linux-3.7.1-vs2.3.5.3/net/sunrpc/auth.c +diff -NurpP --minimal linux-3.7.1/net/sunrpc/auth.c linux-3.7.1-vs2.3.5.4/net/sunrpc/auth.c --- linux-3.7.1/net/sunrpc/auth.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/sunrpc/auth.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/sunrpc/auth.c 2012-12-18 15:13:16.000000000 +0000 @@ -15,6 +15,7 @@ #include #include @@ -25956,9 +25978,9 @@ diff -NurpP --minimal linux-3.7.1/net/sunrpc/auth.c linux-3.7.1-vs2.3.5.3/net/su }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-3.7.1/net/sunrpc/auth_unix.c linux-3.7.1-vs2.3.5.3/net/sunrpc/auth_unix.c +diff -NurpP --minimal linux-3.7.1/net/sunrpc/auth_unix.c linux-3.7.1-vs2.3.5.4/net/sunrpc/auth_unix.c --- linux-3.7.1/net/sunrpc/auth_unix.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/sunrpc/auth_unix.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/sunrpc/auth_unix.c 2012-12-18 15:13:16.000000000 +0000 @@ -13,11 +13,13 @@ #include #include @@ -26016,9 +26038,9 @@ diff -NurpP --minimal linux-3.7.1/net/sunrpc/auth_unix.c linux-3.7.1-vs2.3.5.3/n hold = p++; for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++) *p++ = htonl((u32) cred->uc_gids[i]); -diff -NurpP --minimal linux-3.7.1/net/sunrpc/clnt.c linux-3.7.1-vs2.3.5.3/net/sunrpc/clnt.c +diff -NurpP --minimal linux-3.7.1/net/sunrpc/clnt.c linux-3.7.1-vs2.3.5.4/net/sunrpc/clnt.c --- linux-3.7.1/net/sunrpc/clnt.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/sunrpc/clnt.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/sunrpc/clnt.c 2012-12-18 15:13:16.000000000 +0000 @@ -31,6 +31,7 @@ #include #include @@ -26037,9 +26059,9 @@ diff -NurpP --minimal linux-3.7.1/net/sunrpc/clnt.c linux-3.7.1-vs2.3.5.3/net/su return clnt; } EXPORT_SYMBOL_GPL(rpc_create); -diff -NurpP --minimal linux-3.7.1/net/unix/af_unix.c linux-3.7.1-vs2.3.5.3/net/unix/af_unix.c +diff -NurpP --minimal linux-3.7.1/net/unix/af_unix.c linux-3.7.1-vs2.3.5.4/net/unix/af_unix.c --- linux-3.7.1/net/unix/af_unix.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/net/unix/af_unix.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/net/unix/af_unix.c 2012-12-18 15:13:16.000000000 +0000 @@ -114,6 +114,8 @@ #include #include @@ -26076,9 +26098,9 @@ diff -NurpP --minimal linux-3.7.1/net/unix/af_unix.c linux-3.7.1-vs2.3.5.3/net/u if (sock_net(sk) == seq_file_net(seq)) return sk; } -diff -NurpP --minimal linux-3.7.1/scripts/checksyscalls.sh linux-3.7.1-vs2.3.5.3/scripts/checksyscalls.sh +diff -NurpP --minimal linux-3.7.1/scripts/checksyscalls.sh linux-3.7.1-vs2.3.5.4/scripts/checksyscalls.sh --- linux-3.7.1/scripts/checksyscalls.sh 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/scripts/checksyscalls.sh 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/scripts/checksyscalls.sh 2012-12-18 15:13:16.000000000 +0000 @@ -193,7 +193,6 @@ cat << EOF #define __IGNORE_afs_syscall #define __IGNORE_getpmsg @@ -26087,9 +26109,9 @@ diff -NurpP --minimal linux-3.7.1/scripts/checksyscalls.sh linux-3.7.1-vs2.3.5.3 EOF } -diff -NurpP --minimal linux-3.7.1/security/commoncap.c linux-3.7.1-vs2.3.5.3/security/commoncap.c +diff -NurpP --minimal linux-3.7.1/security/commoncap.c linux-3.7.1-vs2.3.5.4/security/commoncap.c --- linux-3.7.1/security/commoncap.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/security/commoncap.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/security/commoncap.c 2012-12-18 15:13:16.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) @@ -26131,9 +26153,9 @@ diff -NurpP --minimal linux-3.7.1/security/commoncap.c linux-3.7.1-vs2.3.5.3/sec return -EPERM; return 0; } -diff -NurpP --minimal linux-3.7.1/security/selinux/hooks.c linux-3.7.1-vs2.3.5.3/security/selinux/hooks.c +diff -NurpP --minimal linux-3.7.1/security/selinux/hooks.c linux-3.7.1-vs2.3.5.4/security/selinux/hooks.c --- linux-3.7.1/security/selinux/hooks.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.7.1-vs2.3.5.3/security/selinux/hooks.c 2012-12-18 15:13:16.000000000 +0000 ++++ linux-3.7.1-vs2.3.5.4/security/selinux/hooks.c 2012-12-18 15:13:16.000000000 +0000 @@ -66,7 +66,6 @@ #include #include -- 2.44.0