-diff -NurpP --minimal linux-3.0.21/Documentation/vserver/debug.txt linux-3.0.21-vs2.3.2.3/Documentation/vserver/debug.txt
---- linux-3.0.21/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/Documentation/vserver/debug.txt 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/Documentation/vserver/debug.txt linux-3.0.25-vs2.3.2.3/Documentation/vserver/debug.txt
+--- linux-3.0.25/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/Documentation/vserver/debug.txt 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,154 @@
+
+debug_cvirt:
+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-3.0.21/arch/alpha/Kconfig linux-3.0.21-vs2.3.2.3/arch/alpha/Kconfig
---- linux-3.0.21/arch/alpha/Kconfig 2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/alpha/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/alpha/Kconfig linux-3.0.25-vs2.3.2.3/arch/alpha/Kconfig
+--- linux-3.0.25/arch/alpha/Kconfig 2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/alpha/Kconfig 2011-06-10 22:11:24.000000000 +0200
@@ -668,6 +668,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.21/arch/alpha/kernel/entry.S linux-3.0.21-vs2.3.2.3/arch/alpha/kernel/entry.S
---- linux-3.0.21/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/alpha/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/alpha/kernel/entry.S linux-3.0.25-vs2.3.2.3/arch/alpha/kernel/entry.S
+--- linux-3.0.25/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/alpha/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200
@@ -860,24 +860,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
ret
.end sys_getxpid
-diff -NurpP --minimal linux-3.0.21/arch/alpha/kernel/ptrace.c linux-3.0.21-vs2.3.2.3/arch/alpha/kernel/ptrace.c
---- linux-3.0.21/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/arch/alpha/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/alpha/kernel/ptrace.c linux-3.0.25-vs2.3.2.3/arch/alpha/kernel/ptrace.c
+--- linux-3.0.25/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/arch/alpha/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/user.h>
#include <linux/security.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.0.21/arch/alpha/kernel/systbls.S linux-3.0.21-vs2.3.2.3/arch/alpha/kernel/systbls.S
---- linux-3.0.21/arch/alpha/kernel/systbls.S 2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/alpha/kernel/systbls.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/alpha/kernel/systbls.S linux-3.0.25-vs2.3.2.3/arch/alpha/kernel/systbls.S
+--- linux-3.0.25/arch/alpha/kernel/systbls.S 2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/alpha/kernel/systbls.S 2011-06-10 22:11:24.000000000 +0200
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-3.0.21/arch/alpha/kernel/traps.c linux-3.0.21-vs2.3.2.3/arch/alpha/kernel/traps.c
---- linux-3.0.21/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/alpha/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/alpha/kernel/traps.c linux-3.0.25-vs2.3.2.3/arch/alpha/kernel/traps.c
+--- linux-3.0.25/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/alpha/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.0.21/arch/arm/Kconfig linux-3.0.21-vs2.3.2.3/arch/arm/Kconfig
---- linux-3.0.21/arch/arm/Kconfig 2012-02-15 01:04:18.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/arch/arm/Kconfig 2011-12-19 15:55:53.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/arch/arm/Kconfig linux-3.0.25-vs2.3.2.3/arch/arm/Kconfig
+--- linux-3.0.25/arch/arm/Kconfig 2012-03-19 21:16:33.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/arch/arm/Kconfig 2012-03-15 13:32:35.000000000 +0100
@@ -2061,6 +2061,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.21/arch/arm/kernel/calls.S linux-3.0.21-vs2.3.2.3/arch/arm/kernel/calls.S
---- linux-3.0.21/arch/arm/kernel/calls.S 2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/arm/kernel/calls.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/arm/kernel/calls.S linux-3.0.25-vs2.3.2.3/arch/arm/kernel/calls.S
+--- linux-3.0.25/arch/arm/kernel/calls.S 2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/arm/kernel/calls.S 2011-06-10 22:11:24.000000000 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.0.21/arch/arm/kernel/process.c linux-3.0.21-vs2.3.2.3/arch/arm/kernel/process.c
---- linux-3.0.21/arch/arm/kernel/process.c 2012-02-15 01:04:18.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/arch/arm/kernel/process.c 2011-12-19 15:55:53.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/arch/arm/kernel/process.c linux-3.0.25-vs2.3.2.3/arch/arm/kernel/process.c
+--- linux-3.0.25/arch/arm/kernel/process.c 2012-03-19 21:16:33.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/arch/arm/kernel/process.c 2011-12-19 15:55:53.000000000 +0100
@@ -318,7 +318,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-3.0.21/arch/arm/kernel/traps.c linux-3.0.21-vs2.3.2.3/arch/arm/kernel/traps.c
---- linux-3.0.21/arch/arm/kernel/traps.c 2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/arm/kernel/traps.c 2011-06-22 12:39:12.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/arm/kernel/traps.c linux-3.0.25-vs2.3.2.3/arch/arm/kernel/traps.c
+--- linux-3.0.25/arch/arm/kernel/traps.c 2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/arm/kernel/traps.c 2011-06-22 12:39:12.000000000 +0200
@@ -242,8 +242,8 @@ static int __die(const char *str, int er
print_modules();
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.0.21/arch/cris/Kconfig linux-3.0.21-vs2.3.2.3/arch/cris/Kconfig
---- linux-3.0.21/arch/cris/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/cris/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/cris/Kconfig linux-3.0.25-vs2.3.2.3/arch/cris/Kconfig
+--- linux-3.0.25/arch/cris/Kconfig 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/cris/Kconfig 2011-06-10 22:11:24.000000000 +0200
@@ -678,6 +678,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.21/arch/frv/kernel/kernel_thread.S linux-3.0.21-vs2.3.2.3/arch/frv/kernel/kernel_thread.S
---- linux-3.0.21/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/arch/frv/kernel/kernel_thread.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/frv/kernel/kernel_thread.S linux-3.0.25-vs2.3.2.3/arch/frv/kernel/kernel_thread.S
+--- linux-3.0.25/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/arch/frv/kernel/kernel_thread.S 2011-06-10 22:11:24.000000000 +0200
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-3.0.21/arch/h8300/Kconfig linux-3.0.21-vs2.3.2.3/arch/h8300/Kconfig
---- linux-3.0.21/arch/h8300/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/h8300/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/h8300/Kconfig linux-3.0.25-vs2.3.2.3/arch/h8300/Kconfig
+--- linux-3.0.25/arch/h8300/Kconfig 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/h8300/Kconfig 2011-06-10 22:11:24.000000000 +0200
@@ -213,6 +213,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.21/arch/ia64/Kconfig linux-3.0.21-vs2.3.2.3/arch/ia64/Kconfig
---- linux-3.0.21/arch/ia64/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/ia64/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/ia64/Kconfig linux-3.0.25-vs2.3.2.3/arch/ia64/Kconfig
+--- linux-3.0.25/arch/ia64/Kconfig 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/ia64/Kconfig 2011-06-10 22:11:24.000000000 +0200
@@ -671,6 +671,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.21/arch/ia64/include/asm/tlb.h linux-3.0.21-vs2.3.2.3/arch/ia64/include/asm/tlb.h
---- linux-3.0.21/arch/ia64/include/asm/tlb.h 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/ia64/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/ia64/include/asm/tlb.h linux-3.0.25-vs2.3.2.3/arch/ia64/include/asm/tlb.h
+--- linux-3.0.25/arch/ia64/include/asm/tlb.h 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/ia64/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.21/arch/ia64/kernel/entry.S linux-3.0.21-vs2.3.2.3/arch/ia64/kernel/entry.S
---- linux-3.0.21/arch/ia64/kernel/entry.S 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/ia64/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/ia64/kernel/entry.S linux-3.0.25-vs2.3.2.3/arch/ia64/kernel/entry.S
+--- linux-3.0.25/arch/ia64/kernel/entry.S 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/ia64/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200
@@ -1714,7 +1714,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.0.21/arch/ia64/kernel/perfmon.c linux-3.0.21-vs2.3.2.3/arch/ia64/kernel/perfmon.c
---- linux-3.0.21/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/arch/ia64/kernel/perfmon.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/ia64/kernel/perfmon.c linux-3.0.25-vs2.3.2.3/arch/ia64/kernel/perfmon.c
+--- linux-3.0.25/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/arch/ia64/kernel/perfmon.c 2011-06-10 22:11:24.000000000 +0200
@@ -42,6 +42,7 @@
#include <linux/completion.h>
#include <linux/tracehook.h>
#include <asm/errno.h>
#include <asm/intrinsics.h>
-diff -NurpP --minimal linux-3.0.21/arch/ia64/kernel/process.c linux-3.0.21-vs2.3.2.3/arch/ia64/kernel/process.c
---- linux-3.0.21/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/arch/ia64/kernel/process.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/ia64/kernel/process.c linux-3.0.25-vs2.3.2.3/arch/ia64/kernel/process.c
+--- linux-3.0.25/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/arch/ia64/kernel/process.c 2011-06-10 22:11:24.000000000 +0200
@@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
init_utsname()->release);
-diff -NurpP --minimal linux-3.0.21/arch/ia64/kernel/ptrace.c linux-3.0.21-vs2.3.2.3/arch/ia64/kernel/ptrace.c
---- linux-3.0.21/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/arch/ia64/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/ia64/kernel/ptrace.c linux-3.0.25-vs2.3.2.3/arch/ia64/kernel/ptrace.c
+--- linux-3.0.25/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/arch/ia64/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.21/arch/ia64/kernel/traps.c linux-3.0.21-vs2.3.2.3/arch/ia64/kernel/traps.c
---- linux-3.0.21/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/ia64/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/ia64/kernel/traps.c linux-3.0.25-vs2.3.2.3/arch/ia64/kernel/traps.c
+--- linux-3.0.25/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/ia64/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
}
}
}
-diff -NurpP --minimal linux-3.0.21/arch/ia64/mm/fault.c linux-3.0.21-vs2.3.2.3/arch/ia64/mm/fault.c
---- linux-3.0.21/arch/ia64/mm/fault.c 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/ia64/mm/fault.c 2011-06-10 22:28:23.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/ia64/mm/fault.c linux-3.0.25-vs2.3.2.3/arch/ia64/mm/fault.c
+--- linux-3.0.25/arch/ia64/mm/fault.c 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/ia64/mm/fault.c 2011-06-10 22:28:23.000000000 +0200
@@ -11,6 +11,7 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.21/arch/m32r/kernel/traps.c linux-3.0.21-vs2.3.2.3/arch/m32r/kernel/traps.c
---- linux-3.0.21/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/arch/m32r/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/m32r/kernel/traps.c linux-3.0.25-vs2.3.2.3/arch/m32r/kernel/traps.c
+--- linux-3.0.25/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/arch/m32r/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.0.21/arch/m68k/Kconfig linux-3.0.21-vs2.3.2.3/arch/m68k/Kconfig
---- linux-3.0.21/arch/m68k/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/m68k/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/m68k/Kconfig linux-3.0.25-vs2.3.2.3/arch/m68k/Kconfig
+--- linux-3.0.25/arch/m68k/Kconfig 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/m68k/Kconfig 2011-06-10 22:11:24.000000000 +0200
@@ -241,6 +241,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.21/arch/mips/Kconfig linux-3.0.21-vs2.3.2.3/arch/mips/Kconfig
---- linux-3.0.21/arch/mips/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/mips/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/mips/Kconfig linux-3.0.25-vs2.3.2.3/arch/mips/Kconfig
+--- linux-3.0.25/arch/mips/Kconfig 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/mips/Kconfig 2011-06-10 22:11:24.000000000 +0200
@@ -2485,6 +2485,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.21/arch/mips/kernel/ptrace.c linux-3.0.21-vs2.3.2.3/arch/mips/kernel/ptrace.c
---- linux-3.0.21/arch/mips/kernel/ptrace.c 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/mips/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/mips/kernel/ptrace.c linux-3.0.25-vs2.3.2.3/arch/mips/kernel/ptrace.c
+--- linux-3.0.25/arch/mips/kernel/ptrace.c 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/mips/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-3.0.21/arch/mips/kernel/scall32-o32.S linux-3.0.21-vs2.3.2.3/arch/mips/kernel/scall32-o32.S
---- linux-3.0.21/arch/mips/kernel/scall32-o32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/mips/kernel/scall32-o32.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/mips/kernel/scall32-o32.S linux-3.0.25-vs2.3.2.3/arch/mips/kernel/scall32-o32.S
+--- linux-3.0.25/arch/mips/kernel/scall32-o32.S 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/mips/kernel/scall32-o32.S 2011-06-10 22:11:24.000000000 +0200
@@ -523,7 +523,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-3.0.21/arch/mips/kernel/scall64-64.S linux-3.0.21-vs2.3.2.3/arch/mips/kernel/scall64-64.S
---- linux-3.0.21/arch/mips/kernel/scall64-64.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/mips/kernel/scall64-64.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/mips/kernel/scall64-64.S linux-3.0.25-vs2.3.2.3/arch/mips/kernel/scall64-64.S
+--- linux-3.0.25/arch/mips/kernel/scall64-64.S 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/mips/kernel/scall64-64.S 2011-06-10 22:11:24.000000000 +0200
@@ -362,7 +362,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.0.21/arch/mips/kernel/scall64-n32.S linux-3.0.21-vs2.3.2.3/arch/mips/kernel/scall64-n32.S
---- linux-3.0.21/arch/mips/kernel/scall64-n32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/mips/kernel/scall64-n32.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/mips/kernel/scall64-n32.S linux-3.0.25-vs2.3.2.3/arch/mips/kernel/scall64-n32.S
+--- linux-3.0.25/arch/mips/kernel/scall64-n32.S 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/mips/kernel/scall64-n32.S 2011-06-10 22:11:24.000000000 +0200
@@ -361,7 +361,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.0.21/arch/mips/kernel/scall64-o32.S linux-3.0.21-vs2.3.2.3/arch/mips/kernel/scall64-o32.S
---- linux-3.0.21/arch/mips/kernel/scall64-o32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/mips/kernel/scall64-o32.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/mips/kernel/scall64-o32.S linux-3.0.25-vs2.3.2.3/arch/mips/kernel/scall64-o32.S
+--- linux-3.0.25/arch/mips/kernel/scall64-o32.S 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/mips/kernel/scall64-o32.S 2011-06-10 22:11:24.000000000 +0200
@@ -480,7 +480,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.0.21/arch/mips/kernel/traps.c linux-3.0.21-vs2.3.2.3/arch/mips/kernel/traps.c
---- linux-3.0.21/arch/mips/kernel/traps.c 2011-05-22 16:17:00.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/mips/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/mips/kernel/traps.c linux-3.0.25-vs2.3.2.3/arch/mips/kernel/traps.c
+--- linux-3.0.25/arch/mips/kernel/traps.c 2011-05-22 16:17:00.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/mips/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
@@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.0.21/arch/parisc/Kconfig linux-3.0.21-vs2.3.2.3/arch/parisc/Kconfig
---- linux-3.0.21/arch/parisc/Kconfig 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/parisc/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/parisc/Kconfig linux-3.0.25-vs2.3.2.3/arch/parisc/Kconfig
+--- linux-3.0.25/arch/parisc/Kconfig 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/parisc/Kconfig 2011-06-10 22:11:24.000000000 +0200
@@ -279,6 +279,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.21/arch/parisc/kernel/syscall_table.S linux-3.0.21-vs2.3.2.3/arch/parisc/kernel/syscall_table.S
---- linux-3.0.21/arch/parisc/kernel/syscall_table.S 2012-02-15 01:04:18.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/arch/parisc/kernel/syscall_table.S 2011-08-29 03:45:07.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/parisc/kernel/syscall_table.S linux-3.0.25-vs2.3.2.3/arch/parisc/kernel/syscall_table.S
+--- linux-3.0.25/arch/parisc/kernel/syscall_table.S 2012-03-19 21:16:35.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/arch/parisc/kernel/syscall_table.S 2011-08-29 03:45:07.000000000 +0200
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.0.21/arch/parisc/kernel/traps.c linux-3.0.21-vs2.3.2.3/arch/parisc/kernel/traps.c
---- linux-3.0.21/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/parisc/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/parisc/kernel/traps.c linux-3.0.25-vs2.3.2.3/arch/parisc/kernel/traps.c
+--- linux-3.0.25/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/parisc/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.0.21/arch/parisc/mm/fault.c linux-3.0.21-vs2.3.2.3/arch/parisc/mm/fault.c
---- linux-3.0.21/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/parisc/mm/fault.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/parisc/mm/fault.c linux-3.0.25-vs2.3.2.3/arch/parisc/mm/fault.c
+--- linux-3.0.25/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/parisc/mm/fault.c 2011-06-10 22:11:24.000000000 +0200
@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
if (vma) {
printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
vma->vm_start, vma->vm_end);
-diff -NurpP --minimal linux-3.0.21/arch/powerpc/Kconfig linux-3.0.21-vs2.3.2.3/arch/powerpc/Kconfig
---- linux-3.0.21/arch/powerpc/Kconfig 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/powerpc/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/powerpc/Kconfig linux-3.0.25-vs2.3.2.3/arch/powerpc/Kconfig
+--- linux-3.0.25/arch/powerpc/Kconfig 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/powerpc/Kconfig 2011-06-10 22:11:24.000000000 +0200
@@ -978,6 +978,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.0.21/arch/powerpc/include/asm/unistd.h linux-3.0.21-vs2.3.2.3/arch/powerpc/include/asm/unistd.h
---- linux-3.0.21/arch/powerpc/include/asm/unistd.h 2011-07-22 11:17:40.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/powerpc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/powerpc/include/asm/unistd.h linux-3.0.25-vs2.3.2.3/arch/powerpc/include/asm/unistd.h
+--- linux-3.0.25/arch/powerpc/include/asm/unistd.h 2011-07-22 11:17:40.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/powerpc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.0.21/arch/powerpc/kernel/process.c linux-3.0.21-vs2.3.2.3/arch/powerpc/kernel/process.c
---- linux-3.0.21/arch/powerpc/kernel/process.c 2011-07-22 11:17:40.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/powerpc/kernel/process.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/powerpc/kernel/process.c linux-3.0.25-vs2.3.2.3/arch/powerpc/kernel/process.c
+--- linux-3.0.25/arch/powerpc/kernel/process.c 2011-07-22 11:17:40.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/powerpc/kernel/process.c 2011-06-10 22:11:24.000000000 +0200
@@ -656,8 +656,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.0.21/arch/powerpc/kernel/traps.c linux-3.0.21-vs2.3.2.3/arch/powerpc/kernel/traps.c
---- linux-3.0.21/arch/powerpc/kernel/traps.c 2011-07-22 11:17:40.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/powerpc/kernel/traps.c 2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/powerpc/kernel/traps.c linux-3.0.25-vs2.3.2.3/arch/powerpc/kernel/traps.c
+--- linux-3.0.25/arch/powerpc/kernel/traps.c 2011-07-22 11:17:40.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/powerpc/kernel/traps.c 2011-07-19 00:44:39.000000000 +0200
@@ -1075,8 +1075,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.0.21/arch/powerpc/kernel/vdso.c linux-3.0.21-vs2.3.2.3/arch/powerpc/kernel/vdso.c
---- linux-3.0.21/arch/powerpc/kernel/vdso.c 2011-05-22 16:17:02.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/powerpc/kernel/vdso.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/powerpc/kernel/vdso.c linux-3.0.25-vs2.3.2.3/arch/powerpc/kernel/vdso.c
+--- linux-3.0.25/arch/powerpc/kernel/vdso.c 2011-05-22 16:17:02.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/powerpc/kernel/vdso.c 2011-06-10 22:11:24.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/security.h>
#include <linux/bootmem.h>
#include <asm/pgtable.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-3.0.21/arch/s390/Kconfig linux-3.0.21-vs2.3.2.3/arch/s390/Kconfig
---- linux-3.0.21/arch/s390/Kconfig 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/s390/Kconfig 2011-07-01 11:35:34.000000000 +0200
-@@ -628,6 +628,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.0.25/arch/s390/Kconfig linux-3.0.25-vs2.3.2.3/arch/s390/Kconfig
+--- linux-3.0.25/arch/s390/Kconfig 2012-03-19 21:16:36.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/arch/s390/Kconfig 2012-03-15 13:32:35.000000000 +0100
+@@ -631,6 +631,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.21/arch/s390/include/asm/tlb.h linux-3.0.21-vs2.3.2.3/arch/s390/include/asm/tlb.h
---- linux-3.0.21/arch/s390/include/asm/tlb.h 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/s390/include/asm/tlb.h 2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/s390/include/asm/tlb.h linux-3.0.25-vs2.3.2.3/arch/s390/include/asm/tlb.h
+--- linux-3.0.25/arch/s390/include/asm/tlb.h 2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/s390/include/asm/tlb.h 2011-06-15 02:40:14.000000000 +0200
@@ -24,6 +24,8 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0.21/arch/s390/include/asm/unistd.h linux-3.0.21-vs2.3.2.3/arch/s390/include/asm/unistd.h
---- linux-3.0.21/arch/s390/include/asm/unistd.h 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/s390/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/s390/include/asm/unistd.h linux-3.0.25-vs2.3.2.3/arch/s390/include/asm/unistd.h
+--- linux-3.0.25/arch/s390/include/asm/unistd.h 2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/s390/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200
@@ -202,7 +202,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.0.21/arch/s390/kernel/ptrace.c linux-3.0.21-vs2.3.2.3/arch/s390/kernel/ptrace.c
---- linux-3.0.21/arch/s390/kernel/ptrace.c 2012-02-15 01:04:19.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/arch/s390/kernel/ptrace.c 2011-12-19 15:55:53.000000000 +0100
-@@ -20,6 +20,7 @@
+diff -NurpP --minimal linux-3.0.25/arch/s390/kernel/ptrace.c linux-3.0.25-vs2.3.2.3/arch/s390/kernel/ptrace.c
+--- linux-3.0.25/arch/s390/kernel/ptrace.c 2012-03-19 21:16:36.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/arch/s390/kernel/ptrace.c 2012-03-15 13:33:10.000000000 +0100
+@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
#include <linux/compat.h>
+#include <linux/vs_base.h>
#include <trace/syscall.h>
- #include <asm/compat.h>
#include <asm/segment.h>
-diff -NurpP --minimal linux-3.0.21/arch/s390/kernel/syscalls.S linux-3.0.21-vs2.3.2.3/arch/s390/kernel/syscalls.S
---- linux-3.0.21/arch/s390/kernel/syscalls.S 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/s390/kernel/syscalls.S 2011-06-10 22:11:24.000000000 +0200
+ #include <asm/page.h>
+diff -NurpP --minimal linux-3.0.25/arch/s390/kernel/syscalls.S linux-3.0.25-vs2.3.2.3/arch/s390/kernel/syscalls.S
+--- linux-3.0.25/arch/s390/kernel/syscalls.S 2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/s390/kernel/syscalls.S 2011-06-10 22:11:24.000000000 +0200
@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
-diff -NurpP --minimal linux-3.0.21/arch/sh/Kconfig linux-3.0.21-vs2.3.2.3/arch/sh/Kconfig
---- linux-3.0.21/arch/sh/Kconfig 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/sh/Kconfig 2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/sh/Kconfig linux-3.0.25-vs2.3.2.3/arch/sh/Kconfig
+--- linux-3.0.25/arch/sh/Kconfig 2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/sh/Kconfig 2011-07-19 00:44:39.000000000 +0200
@@ -893,6 +893,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.21/arch/sh/kernel/irq.c linux-3.0.21-vs2.3.2.3/arch/sh/kernel/irq.c
---- linux-3.0.21/arch/sh/kernel/irq.c 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/sh/kernel/irq.c 2011-07-19 00:45:06.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/sh/kernel/irq.c linux-3.0.25-vs2.3.2.3/arch/sh/kernel/irq.c
+--- linux-3.0.25/arch/sh/kernel/irq.c 2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/sh/kernel/irq.c 2011-07-19 00:45:06.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.0.21/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0.21-vs2.3.2.3/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-3.0.21/arch/sh/kernel/vsyscall/vsyscall.c 2011-05-22 16:17:07.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/sh/kernel/vsyscall/vsyscall.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0.25-vs2.3.2.3/arch/sh/kernel/vsyscall/vsyscall.c
+--- linux-3.0.25/arch/sh/kernel/vsyscall/vsyscall.c 2011-05-22 16:17:07.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/sh/kernel/vsyscall/vsyscall.c 2011-06-10 22:11:24.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/elf.h>
#include <linux/sched.h>
/*
* Should the kernel map a VDSO page into processes and pass its
-diff -NurpP --minimal linux-3.0.21/arch/sparc/Kconfig linux-3.0.21-vs2.3.2.3/arch/sparc/Kconfig
---- linux-3.0.21/arch/sparc/Kconfig 2012-02-15 01:04:19.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/arch/sparc/Kconfig 2011-10-18 13:51:13.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/sparc/Kconfig linux-3.0.25-vs2.3.2.3/arch/sparc/Kconfig
+--- linux-3.0.25/arch/sparc/Kconfig 2012-03-19 21:16:36.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/arch/sparc/Kconfig 2011-10-18 13:51:13.000000000 +0200
@@ -602,6 +602,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.21/arch/sparc/include/asm/tlb_64.h linux-3.0.21-vs2.3.2.3/arch/sparc/include/asm/tlb_64.h
---- linux-3.0.21/arch/sparc/include/asm/tlb_64.h 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/sparc/include/asm/tlb_64.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/sparc/include/asm/tlb_64.h linux-3.0.25-vs2.3.2.3/arch/sparc/include/asm/tlb_64.h
+--- linux-3.0.25/arch/sparc/include/asm/tlb_64.h 2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/sparc/include/asm/tlb_64.h 2011-06-10 22:11:24.000000000 +0200
@@ -3,6 +3,7 @@
#include <linux/swap.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
-diff -NurpP --minimal linux-3.0.21/arch/sparc/include/asm/unistd.h linux-3.0.21-vs2.3.2.3/arch/sparc/include/asm/unistd.h
---- linux-3.0.21/arch/sparc/include/asm/unistd.h 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/sparc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/sparc/include/asm/unistd.h linux-3.0.25-vs2.3.2.3/arch/sparc/include/asm/unistd.h
+--- linux-3.0.25/arch/sparc/include/asm/unistd.h 2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/sparc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200
@@ -335,7 +335,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.0.21/arch/sparc/kernel/systbls_32.S linux-3.0.21-vs2.3.2.3/arch/sparc/kernel/systbls_32.S
---- linux-3.0.21/arch/sparc/kernel/systbls_32.S 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/sparc/kernel/systbls_32.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/sparc/kernel/systbls_32.S linux-3.0.25-vs2.3.2.3/arch/sparc/kernel/systbls_32.S
+--- linux-3.0.25/arch/sparc/kernel/systbls_32.S 2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/sparc/kernel/systbls_32.S 2011-06-10 22:11:24.000000000 +0200
@@ -70,7 +70,7 @@ sys_call_table:
/*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
/*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
/*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
/*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.0.21/arch/sparc/kernel/systbls_64.S linux-3.0.21-vs2.3.2.3/arch/sparc/kernel/systbls_64.S
---- linux-3.0.21/arch/sparc/kernel/systbls_64.S 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/sparc/kernel/systbls_64.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/sparc/kernel/systbls_64.S linux-3.0.25-vs2.3.2.3/arch/sparc/kernel/systbls_64.S
+--- linux-3.0.25/arch/sparc/kernel/systbls_64.S 2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/sparc/kernel/systbls_64.S 2011-06-10 22:11:24.000000000 +0200
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
/*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
.word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.0.21/arch/um/Kconfig.rest linux-3.0.21-vs2.3.2.3/arch/um/Kconfig.rest
---- linux-3.0.21/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/um/Kconfig.rest 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/um/Kconfig.rest linux-3.0.25-vs2.3.2.3/arch/um/Kconfig.rest
+--- linux-3.0.25/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/um/Kconfig.rest 2011-06-10 22:11:24.000000000 +0200
@@ -18,6 +18,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.21/arch/um/include/asm/tlb.h linux-3.0.21-vs2.3.2.3/arch/um/include/asm/tlb.h
---- linux-3.0.21/arch/um/include/asm/tlb.h 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/um/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/um/include/asm/tlb.h linux-3.0.25-vs2.3.2.3/arch/um/include/asm/tlb.h
+--- linux-3.0.25/arch/um/include/asm/tlb.h 2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/um/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200
@@ -3,6 +3,7 @@
#include <linux/pagemap.h>
#include <asm/percpu.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0.21/arch/um/include/shared/kern_constants.h linux-3.0.21-vs2.3.2.3/arch/um/include/shared/kern_constants.h
---- linux-3.0.21/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/arch/um/include/shared/kern_constants.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1 @@
-+#include "../../../../include/generated/asm-offsets.h"
-diff -NurpP --minimal linux-3.0.21/arch/um/include/shared/user_constants.h linux-3.0.21-vs2.3.2.3/arch/um/include/shared/user_constants.h
---- linux-3.0.21/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/arch/um/include/shared/user_constants.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,40 @@
-+/*
-+ * DO NOT MODIFY.
-+ *
-+ * This file was generated by arch/um/Makefile
-+ *
-+ */
-+
-+#define HOST_SC_CR2 176 /* offsetof(struct sigcontext, cr2) # */
-+#define HOST_SC_ERR 152 /* offsetof(struct sigcontext, err) # */
-+#define HOST_SC_TRAPNO 160 /* offsetof(struct sigcontext, trapno) # */
-+#define HOST_FP_SIZE 64 /* sizeof(struct _fpstate) / sizeof(unsigned long) # */
-+#define HOST_RBX 5 /* RBX # */
-+#define HOST_RCX 11 /* RCX # */
-+#define HOST_RDI 14 /* RDI # */
-+#define HOST_RSI 13 /* RSI # */
-+#define HOST_RDX 12 /* RDX # */
-+#define HOST_RBP 4 /* RBP # */
-+#define HOST_RAX 10 /* RAX # */
-+#define HOST_R8 9 /* R8 # */
-+#define HOST_R9 8 /* R9 # */
-+#define HOST_R10 7 /* R10 # */
-+#define HOST_R11 6 /* R11 # */
-+#define HOST_R12 3 /* R12 # */
-+#define HOST_R13 2 /* R13 # */
-+#define HOST_R14 1 /* R14 # */
-+#define HOST_R15 0 /* R15 # */
-+#define HOST_ORIG_RAX 15 /* ORIG_RAX # */
-+#define HOST_CS 17 /* CS # */
-+#define HOST_SS 20 /* SS # */
-+#define HOST_EFLAGS 18 /* EFLAGS # */
-+#define HOST_IP 16 /* RIP # */
-+#define HOST_SP 19 /* RSP # */
-+#define UM_FRAME_SIZE 216 /* sizeof(struct user_regs_struct) # */
-+#define UM_POLLIN 1 /* POLLIN # */
-+#define UM_POLLPRI 2 /* POLLPRI # */
-+#define UM_POLLOUT 4 /* POLLOUT # */
-+#define UM_PROT_READ 1 /* PROT_READ # */
-+#define UM_PROT_WRITE 2 /* PROT_WRITE # */
-+#define UM_PROT_EXEC 4 /* PROT_EXEC # */
-+
-diff -NurpP --minimal linux-3.0.21/arch/x86/Kconfig linux-3.0.21-vs2.3.2.3/arch/x86/Kconfig
---- linux-3.0.21/arch/x86/Kconfig 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/x86/Kconfig 2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/x86/Kconfig linux-3.0.25-vs2.3.2.3/arch/x86/Kconfig
+--- linux-3.0.25/arch/x86/Kconfig 2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/x86/Kconfig 2011-07-22 11:20:39.000000000 +0200
@@ -2159,6 +2159,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.21/arch/x86/ia32/ia32entry.S linux-3.0.21-vs2.3.2.3/arch/x86/ia32/ia32entry.S
---- linux-3.0.21/arch/x86/ia32/ia32entry.S 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/x86/ia32/ia32entry.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/x86/ia32/ia32entry.S linux-3.0.25-vs2.3.2.3/arch/x86/ia32/ia32entry.S
+--- linux-3.0.25/arch/x86/ia32/ia32entry.S 2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/x86/ia32/ia32entry.S 2011-06-10 22:11:24.000000000 +0200
@@ -776,7 +776,7 @@ ia32_sys_call_table:
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
-diff -NurpP --minimal linux-3.0.21/arch/x86/include/asm/unistd_64.h linux-3.0.21-vs2.3.2.3/arch/x86/include/asm/unistd_64.h
---- linux-3.0.21/arch/x86/include/asm/unistd_64.h 2011-07-22 11:17:43.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/x86/include/asm/unistd_64.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/x86/include/asm/unistd_64.h linux-3.0.25-vs2.3.2.3/arch/x86/include/asm/unistd_64.h
+--- linux-3.0.25/arch/x86/include/asm/unistd_64.h 2011-07-22 11:17:43.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/x86/include/asm/unistd_64.h 2011-06-10 22:11:24.000000000 +0200
@@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
#define __NR_utimes 235
__SYSCALL(__NR_utimes, sys_utimes)
#define __NR_mbind 237
__SYSCALL(__NR_mbind, sys_mbind)
#define __NR_set_mempolicy 238
-diff -NurpP --minimal linux-3.0.21/arch/x86/kernel/syscall_table_32.S linux-3.0.21-vs2.3.2.3/arch/x86/kernel/syscall_table_32.S
---- linux-3.0.21/arch/x86/kernel/syscall_table_32.S 2011-07-22 11:17:43.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/arch/x86/kernel/syscall_table_32.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/arch/x86/kernel/syscall_table_32.S linux-3.0.25-vs2.3.2.3/arch/x86/kernel/syscall_table_32.S
+--- linux-3.0.25/arch/x86/kernel/syscall_table_32.S 2011-07-22 11:17:43.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/arch/x86/kernel/syscall_table_32.S 2011-06-10 22:11:24.000000000 +0200
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-3.0.21/block/genhd.c linux-3.0.21-vs2.3.2.3/block/genhd.c
---- linux-3.0.21/block/genhd.c 2012-02-15 01:04:19.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/block/genhd.c 2011-11-15 17:37:04.000000000 +0100
-@@ -1162,17 +1162,17 @@ static int diskstats_show(struct seq_fil
+diff -NurpP --minimal linux-3.0.25/block/genhd.c linux-3.0.25-vs2.3.2.3/block/genhd.c
+--- linux-3.0.25/block/genhd.c 2012-03-19 21:16:38.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/block/genhd.c 2012-03-23 14:54:00.000000000 +0100
+@@ -1165,17 +1165,17 @@ static int diskstats_show(struct seq_fil
cpu = part_stat_lock();
part_round_stats(cpu, hd);
part_stat_unlock();
jiffies_to_msecs(part_stat_read(hd, ticks[WRITE])),
part_in_flight(hd),
jiffies_to_msecs(part_stat_read(hd, io_ticks)),
-diff -NurpP --minimal linux-3.0.21/drivers/block/Kconfig linux-3.0.21-vs2.3.2.3/drivers/block/Kconfig
---- linux-3.0.21/drivers/block/Kconfig 2011-07-22 11:17:44.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/drivers/block/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/drivers/block/Kconfig linux-3.0.25-vs2.3.2.3/drivers/block/Kconfig
+--- linux-3.0.25/drivers/block/Kconfig 2011-07-22 11:17:44.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/drivers/block/Kconfig 2011-06-10 22:11:24.000000000 +0200
@@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.0.21/drivers/block/Makefile linux-3.0.21-vs2.3.2.3/drivers/block/Makefile
---- linux-3.0.21/drivers/block/Makefile 2011-07-22 11:17:44.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/drivers/block/Makefile 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/drivers/block/Makefile linux-3.0.25-vs2.3.2.3/drivers/block/Makefile
+--- linux-3.0.25/drivers/block/Makefile 2011-07-22 11:17:44.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/drivers/block/Makefile 2011-06-10 22:11:24.000000000 +0200
@@ -34,6 +34,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-3.0.21/drivers/block/loop.c linux-3.0.21-vs2.3.2.3/drivers/block/loop.c
---- linux-3.0.21/drivers/block/loop.c 2012-02-15 01:04:19.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/drivers/block/loop.c 2011-08-31 19:37:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/drivers/block/loop.c linux-3.0.25-vs2.3.2.3/drivers/block/loop.c
+--- linux-3.0.25/drivers/block/loop.c 2012-03-19 21:16:39.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/drivers/block/loop.c 2011-08-31 19:37:44.000000000 +0200
@@ -75,6 +75,7 @@
#include <linux/kthread.h>
#include <linux/splice.h>
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.0.21/drivers/block/vroot.c linux-3.0.21-vs2.3.2.3/drivers/block/vroot.c
---- linux-3.0.21/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/drivers/block/vroot.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/drivers/block/vroot.c linux-3.0.25-vs2.3.2.3/drivers/block/vroot.c
+--- linux-3.0.25/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/drivers/block/vroot.c 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,292 @@
+/*
+ * linux/drivers/block/vroot.c
+
+#endif
+
-diff -NurpP --minimal linux-3.0.21/drivers/infiniband/Kconfig linux-3.0.21-vs2.3.2.3/drivers/infiniband/Kconfig
---- linux-3.0.21/drivers/infiniband/Kconfig 2011-07-22 11:17:45.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/drivers/infiniband/Kconfig 2012-02-15 05:19:42.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/drivers/infiniband/Kconfig linux-3.0.25-vs2.3.2.3/drivers/infiniband/Kconfig
+--- linux-3.0.25/drivers/infiniband/Kconfig 2011-07-22 11:17:45.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/drivers/infiniband/Kconfig 2012-02-15 05:19:42.000000000 +0100
@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
config INFINIBAND_ADDR_TRANS
bool
default y
source "drivers/infiniband/hw/mthca/Kconfig"
-diff -NurpP --minimal linux-3.0.21/drivers/infiniband/core/addr.c linux-3.0.21-vs2.3.2.3/drivers/infiniband/core/addr.c
---- linux-3.0.21/drivers/infiniband/core/addr.c 2012-02-15 01:04:20.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/drivers/infiniband/core/addr.c 2012-02-15 05:20:43.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/drivers/infiniband/core/addr.c linux-3.0.25-vs2.3.2.3/drivers/infiniband/core/addr.c
+--- linux-3.0.25/drivers/infiniband/core/addr.c 2012-03-19 21:16:40.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/drivers/infiniband/core/addr.c 2012-02-15 05:20:43.000000000 +0100
@@ -254,7 +254,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
if (ret)
goto put;
-diff -NurpP --minimal linux-3.0.21/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-3.0.21-vs2.3.2.3/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-3.0.21/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-05-22 16:17:16.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-3.0.25-vs2.3.2.3/drivers/infiniband/hw/ipath/ipath_user_pages.c
+--- linux-3.0.25/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-05-22 16:17:16.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-06-10 22:11:24.000000000 +0200
@@ -35,6 +35,7 @@
#include <linux/device.h>
#include <linux/slab.h>
#include "ipath_kernel.h"
-diff -NurpP --minimal linux-3.0.21/drivers/md/dm-ioctl.c linux-3.0.21-vs2.3.2.3/drivers/md/dm-ioctl.c
---- linux-3.0.21/drivers/md/dm-ioctl.c 2011-05-22 16:17:18.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/drivers/md/dm-ioctl.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/drivers/md/dm-ioctl.c linux-3.0.25-vs2.3.2.3/drivers/md/dm-ioctl.c
+--- linux-3.0.25/drivers/md/dm-ioctl.c 2011-05-22 16:17:18.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/drivers/md/dm-ioctl.c 2011-06-10 22:11:24.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.0.21/drivers/md/dm.c linux-3.0.21-vs2.3.2.3/drivers/md/dm.c
---- linux-3.0.21/drivers/md/dm.c 2012-02-15 01:04:20.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/drivers/md/dm.c 2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/drivers/md/dm.c linux-3.0.25-vs2.3.2.3/drivers/md/dm.c
+--- linux-3.0.25/drivers/md/dm.c 2012-03-19 21:16:41.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/drivers/md/dm.c 2011-08-08 23:04:47.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.0.21/drivers/md/dm.h linux-3.0.21-vs2.3.2.3/drivers/md/dm.h
---- linux-3.0.21/drivers/md/dm.h 2011-05-22 16:17:18.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/drivers/md/dm.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/drivers/md/dm.h linux-3.0.25-vs2.3.2.3/drivers/md/dm.h
+--- linux-3.0.25/drivers/md/dm.h 2011-05-22 16:17:18.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/drivers/md/dm.h 2011-06-10 22:11:24.000000000 +0200
@@ -41,6 +41,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.0.21/drivers/net/tun.c linux-3.0.21-vs2.3.2.3/drivers/net/tun.c
---- linux-3.0.21/drivers/net/tun.c 2012-02-15 01:04:21.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/drivers/net/tun.c 2011-08-29 03:45:08.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/drivers/net/tun.c linux-3.0.25-vs2.3.2.3/drivers/net/tun.c
+--- linux-3.0.25/drivers/net/tun.c 2012-03-19 21:16:45.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/drivers/net/tun.c 2011-08-29 03:45:08.000000000 +0200
@@ -64,6 +64,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.0.21/drivers/tty/sysrq.c linux-3.0.21-vs2.3.2.3/drivers/tty/sysrq.c
---- linux-3.0.21/drivers/tty/sysrq.c 2011-05-22 16:17:44.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/drivers/tty/sysrq.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/drivers/tty/sysrq.c linux-3.0.25-vs2.3.2.3/drivers/tty/sysrq.c
+--- linux-3.0.25/drivers/tty/sysrq.c 2011-05-22 16:17:44.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/drivers/tty/sysrq.c 2011-06-10 22:11:24.000000000 +0200
@@ -41,6 +41,7 @@
#include <linux/oom.h>
#include <linux/slab.h>
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.0.21/drivers/tty/tty_io.c linux-3.0.21-vs2.3.2.3/drivers/tty/tty_io.c
---- linux-3.0.21/drivers/tty/tty_io.c 2012-02-15 01:04:22.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/drivers/tty/tty_io.c 2011-11-15 17:37:05.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/drivers/tty/tty_io.c linux-3.0.25-vs2.3.2.3/drivers/tty/tty_io.c
+--- linux-3.0.25/drivers/tty/tty_io.c 2012-03-19 21:16:50.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/drivers/tty/tty_io.c 2011-11-15 17:37:05.000000000 +0100
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.0.21/fs/attr.c linux-3.0.21-vs2.3.2.3/fs/attr.c
---- linux-3.0.21/fs/attr.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/attr.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/attr.c linux-3.0.25-vs2.3.2.3/fs/attr.c
+--- linux-3.0.25/fs/attr.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/attr.c 2011-06-10 22:11:24.000000000 +0200
@@ -13,6 +13,9 @@
#include <linux/fsnotify.h>
#include <linux/fcntl.h>
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.0.21/fs/binfmt_aout.c linux-3.0.21-vs2.3.2.3/fs/binfmt_aout.c
---- linux-3.0.21/fs/binfmt_aout.c 2010-10-21 13:07:47.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/binfmt_aout.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/binfmt_aout.c linux-3.0.25-vs2.3.2.3/fs/binfmt_aout.c
+--- linux-3.0.25/fs/binfmt_aout.c 2010-10-21 13:07:47.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/binfmt_aout.c 2011-06-10 22:11:24.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/init.h>
#include <linux/coredump.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.0.21/fs/binfmt_elf.c linux-3.0.21-vs2.3.2.3/fs/binfmt_elf.c
---- linux-3.0.21/fs/binfmt_elf.c 2012-02-15 01:04:23.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/binfmt_elf.c 2011-11-15 17:37:06.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/binfmt_elf.c linux-3.0.25-vs2.3.2.3/fs/binfmt_elf.c
+--- linux-3.0.25/fs/binfmt_elf.c 2012-03-19 21:16:51.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/binfmt_elf.c 2012-03-15 13:32:35.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/elf.h>
#include <linux/utsname.h>
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.0.21/fs/binfmt_flat.c linux-3.0.21-vs2.3.2.3/fs/binfmt_flat.c
---- linux-3.0.21/fs/binfmt_flat.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/binfmt_flat.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/binfmt_flat.c linux-3.0.25-vs2.3.2.3/fs/binfmt_flat.c
+--- linux-3.0.25/fs/binfmt_flat.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/binfmt_flat.c 2011-06-10 22:11:24.000000000 +0200
@@ -35,6 +35,7 @@
#include <linux/init.h>
#include <linux/flat.h>
#include <asm/byteorder.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-3.0.21/fs/binfmt_som.c linux-3.0.21-vs2.3.2.3/fs/binfmt_som.c
---- linux-3.0.21/fs/binfmt_som.c 2010-02-25 11:52:04.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/binfmt_som.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/binfmt_som.c linux-3.0.25-vs2.3.2.3/fs/binfmt_som.c
+--- linux-3.0.25/fs/binfmt_som.c 2010-02-25 11:52:04.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/binfmt_som.c 2011-06-10 22:11:24.000000000 +0200
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.0.21/fs/block_dev.c linux-3.0.21-vs2.3.2.3/fs/block_dev.c
---- linux-3.0.21/fs/block_dev.c 2012-02-15 01:04:23.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/block_dev.c 2011-11-15 17:37:06.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/block_dev.c linux-3.0.25-vs2.3.2.3/fs/block_dev.c
+--- linux-3.0.25/fs/block_dev.c 2012-03-19 21:16:51.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/block_dev.c 2012-03-23 14:54:00.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.0.21/fs/btrfs/ctree.h linux-3.0.21-vs2.3.2.3/fs/btrfs/ctree.h
---- linux-3.0.21/fs/btrfs/ctree.h 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/btrfs/ctree.h 2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/btrfs/ctree.h linux-3.0.25-vs2.3.2.3/fs/btrfs/ctree.h
+--- linux-3.0.25/fs/btrfs/ctree.h 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/btrfs/ctree.h 2011-07-19 00:44:39.000000000 +0200
@@ -600,11 +600,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
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.0.21/fs/btrfs/disk-io.c linux-3.0.21-vs2.3.2.3/fs/btrfs/disk-io.c
---- linux-3.0.21/fs/btrfs/disk-io.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/btrfs/disk-io.c 2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/btrfs/disk-io.c linux-3.0.25-vs2.3.2.3/fs/btrfs/disk-io.c
+--- linux-3.0.25/fs/btrfs/disk-io.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/btrfs/disk-io.c 2011-06-22 12:39:15.000000000 +0200
@@ -1765,6 +1765,9 @@ struct btrfs_root *open_ctree(struct sup
goto fail_alloc;
}
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.0.21/fs/btrfs/inode.c linux-3.0.21-vs2.3.2.3/fs/btrfs/inode.c
---- linux-3.0.21/fs/btrfs/inode.c 2012-02-15 01:04:23.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/btrfs/inode.c 2011-10-18 13:51:13.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/btrfs/inode.c linux-3.0.25-vs2.3.2.3/fs/btrfs/inode.c
+--- linux-3.0.25/fs/btrfs/inode.c 2012-03-19 21:16:51.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/btrfs/inode.c 2011-10-18 13:51:13.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/falloc.h>
#include <linux/slab.h>
};
static const struct inode_operations btrfs_special_inode_operations = {
.getattr = btrfs_getattr,
-diff -NurpP --minimal linux-3.0.21/fs/btrfs/ioctl.c linux-3.0.21-vs2.3.2.3/fs/btrfs/ioctl.c
---- linux-3.0.21/fs/btrfs/ioctl.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/btrfs/ioctl.c 2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/btrfs/ioctl.c linux-3.0.25-vs2.3.2.3/fs/btrfs/ioctl.c
+--- linux-3.0.25/fs/btrfs/ioctl.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/btrfs/ioctl.c 2011-06-22 12:39:15.000000000 +0200
@@ -70,10 +70,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.0.21/fs/btrfs/super.c linux-3.0.21-vs2.3.2.3/fs/btrfs/super.c
---- linux-3.0.21/fs/btrfs/super.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/btrfs/super.c 2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/btrfs/super.c linux-3.0.25-vs2.3.2.3/fs/btrfs/super.c
+--- linux-3.0.25/fs/btrfs/super.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/btrfs/super.c 2011-07-19 00:44:39.000000000 +0200
@@ -162,7 +162,7 @@ enum {
Opt_notreelog, Opt_ratio, Opt_flushoncommit, Opt_discard,
Opt_space_cache, Opt_clear_cache, Opt_user_subvol_rm_allowed,
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-3.0.21/fs/char_dev.c linux-3.0.21-vs2.3.2.3/fs/char_dev.c
---- linux-3.0.21/fs/char_dev.c 2011-03-15 18:07:31.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/char_dev.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/char_dev.c linux-3.0.25-vs2.3.2.3/fs/char_dev.c
+--- linux-3.0.25/fs/char_dev.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/char_dev.c 2011-06-10 22:11:24.000000000 +0200
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.0.21/fs/dcache.c linux-3.0.21-vs2.3.2.3/fs/dcache.c
---- linux-3.0.21/fs/dcache.c 2012-02-15 01:04:24.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/dcache.c 2012-01-26 08:39:53.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/dcache.c linux-3.0.25-vs2.3.2.3/fs/dcache.c
+--- linux-3.0.25/fs/dcache.c 2012-03-19 21:16:51.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/dcache.c 2012-01-26 08:39:53.000000000 +0100
@@ -36,6 +36,7 @@
#include <linux/bit_spinlock.h>
#include <linux/rculist_bl.h>
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.0.21/fs/devpts/inode.c linux-3.0.21-vs2.3.2.3/fs/devpts/inode.c
---- linux-3.0.21/fs/devpts/inode.c 2011-05-22 16:17:50.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/devpts/inode.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/devpts/inode.c linux-3.0.25-vs2.3.2.3/fs/devpts/inode.c
+--- linux-3.0.25/fs/devpts/inode.c 2011-05-22 16:17:50.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/devpts/inode.c 2011-06-10 22:11:24.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-3.0.21/fs/ext2/balloc.c linux-3.0.21-vs2.3.2.3/fs/ext2/balloc.c
---- linux-3.0.21/fs/ext2/balloc.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext2/balloc.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext2/balloc.c linux-3.0.25-vs2.3.2.3/fs/ext2/balloc.c
+--- linux-3.0.25/fs/ext2/balloc.c 2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext2/balloc.c 2011-06-10 22:11:24.000000000 +0200
@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.0.21/fs/ext2/ext2.h linux-3.0.21-vs2.3.2.3/fs/ext2/ext2.h
---- linux-3.0.21/fs/ext2/ext2.h 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext2/ext2.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext2/ext2.h linux-3.0.25-vs2.3.2.3/fs/ext2/ext2.h
+--- linux-3.0.25/fs/ext2/ext2.h 2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext2/ext2.h 2011-06-10 22:11:24.000000000 +0200
@@ -126,6 +126,7 @@ extern void ext2_set_inode_flags(struct
extern void ext2_get_inode_flags(struct ext2_inode_info *);
extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.0.21/fs/ext2/file.c linux-3.0.21-vs2.3.2.3/fs/ext2/file.c
---- linux-3.0.21/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext2/file.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext2/file.c linux-3.0.25-vs2.3.2.3/fs/ext2/file.c
+--- linux-3.0.25/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext2/file.c 2011-06-10 22:11:24.000000000 +0200
@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
.setattr = ext2_setattr,
.check_acl = ext2_check_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-3.0.21/fs/ext2/ialloc.c linux-3.0.21-vs2.3.2.3/fs/ext2/ialloc.c
---- linux-3.0.21/fs/ext2/ialloc.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext2/ialloc.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext2/ialloc.c linux-3.0.25-vs2.3.2.3/fs/ext2/ialloc.c
+--- linux-3.0.25/fs/ext2/ialloc.c 2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext2/ialloc.c 2011-06-10 22:11:24.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.0.21/fs/ext2/inode.c linux-3.0.21-vs2.3.2.3/fs/ext2/inode.c
---- linux-3.0.21/fs/ext2/inode.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext2/inode.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext2/inode.c linux-3.0.25-vs2.3.2.3/fs/ext2/inode.c
+--- linux-3.0.25/fs/ext2/inode.c 2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext2/inode.c 2011-06-10 22:11:24.000000000 +0200
@@ -32,6 +32,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.0.21/fs/ext2/ioctl.c linux-3.0.21-vs2.3.2.3/fs/ext2/ioctl.c
---- linux-3.0.21/fs/ext2/ioctl.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext2/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext2/ioctl.c linux-3.0.25-vs2.3.2.3/fs/ext2/ioctl.c
+--- linux-3.0.25/fs/ext2/ioctl.c 2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext2/ioctl.c 2011-06-10 22:11:24.000000000 +0200
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
mutex_unlock(&inode->i_mutex);
-diff -NurpP --minimal linux-3.0.21/fs/ext2/namei.c linux-3.0.21-vs2.3.2.3/fs/ext2/namei.c
---- linux-3.0.21/fs/ext2/namei.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext2/namei.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext2/namei.c linux-3.0.25-vs2.3.2.3/fs/ext2/namei.c
+--- linux-3.0.25/fs/ext2/namei.c 2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext2/namei.c 2011-06-10 22:11:24.000000000 +0200
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
};
const struct inode_operations ext2_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.21/fs/ext2/super.c linux-3.0.21-vs2.3.2.3/fs/ext2/super.c
---- linux-3.0.21/fs/ext2/super.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext2/super.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext2/super.c linux-3.0.25-vs2.3.2.3/fs/ext2/super.c
+--- linux-3.0.25/fs/ext2/super.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext2/super.c 2011-06-10 22:11:24.000000000 +0200
@@ -394,7 +394,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.0.21/fs/ext3/file.c linux-3.0.21-vs2.3.2.3/fs/ext3/file.c
---- linux-3.0.21/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext3/file.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext3/file.c linux-3.0.25-vs2.3.2.3/fs/ext3/file.c
+--- linux-3.0.25/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext3/file.c 2011-06-10 22:11:24.000000000 +0200
@@ -81,5 +81,6 @@ const struct inode_operations ext3_file_
#endif
.check_acl = ext3_check_acl,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-3.0.21/fs/ext3/ialloc.c linux-3.0.21-vs2.3.2.3/fs/ext3/ialloc.c
---- linux-3.0.21/fs/ext3/ialloc.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext3/ialloc.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext3/ialloc.c linux-3.0.25-vs2.3.2.3/fs/ext3/ialloc.c
+--- linux-3.0.25/fs/ext3/ialloc.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext3/ialloc.c 2011-06-10 22:11:24.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.0.21/fs/ext3/inode.c linux-3.0.21-vs2.3.2.3/fs/ext3/inode.c
---- linux-3.0.21/fs/ext3/inode.c 2012-02-15 01:04:24.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/ext3/inode.c 2012-01-18 02:58:46.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/ext3/inode.c linux-3.0.25-vs2.3.2.3/fs/ext3/inode.c
+--- linux-3.0.25/fs/ext3/inode.c 2012-03-19 21:16:51.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/ext3/inode.c 2012-01-18 02:58:46.000000000 +0100
@@ -38,6 +38,7 @@
#include <linux/bio.h>
#include <linux/fiemap.h>
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.0.21/fs/ext3/ioctl.c linux-3.0.21-vs2.3.2.3/fs/ext3/ioctl.c
---- linux-3.0.21/fs/ext3/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext3/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext3/ioctl.c linux-3.0.25-vs2.3.2.3/fs/ext3/ioctl.c
+--- linux-3.0.25/fs/ext3/ioctl.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext3/ioctl.c 2011-06-10 22:11:24.000000000 +0200
@@ -8,6 +8,7 @@
*/
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.0.21/fs/ext3/namei.c linux-3.0.21-vs2.3.2.3/fs/ext3/namei.c
---- linux-3.0.21/fs/ext3/namei.c 2012-02-15 01:04:24.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/ext3/namei.c 2011-08-29 03:45:09.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext3/namei.c linux-3.0.25-vs2.3.2.3/fs/ext3/namei.c
+--- linux-3.0.25/fs/ext3/namei.c 2012-03-19 21:16:51.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/ext3/namei.c 2011-08-29 03:45:09.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
};
const struct inode_operations ext3_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.21/fs/ext3/super.c linux-3.0.21-vs2.3.2.3/fs/ext3/super.c
---- linux-3.0.21/fs/ext3/super.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext3/super.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext3/super.c linux-3.0.25-vs2.3.2.3/fs/ext3/super.c
+--- linux-3.0.25/fs/ext3/super.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext3/super.c 2011-06-10 22:11:24.000000000 +0200
@@ -821,7 +821,8 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.0.21/fs/ext4/ext4.h linux-3.0.21-vs2.3.2.3/fs/ext4/ext4.h
---- linux-3.0.21/fs/ext4/ext4.h 2012-02-15 01:04:24.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/ext4/ext4.h 2011-11-15 17:37:06.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/ext4/ext4.h linux-3.0.25-vs2.3.2.3/fs/ext4/ext4.h
+--- linux-3.0.25/fs/ext4/ext4.h 2012-03-19 21:16:51.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/ext4/ext4.h 2011-11-15 17:37:06.000000000 +0100
@@ -351,8 +351,12 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
/* move_extent.c */
extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
__u64 start_orig, __u64 start_donor,
-diff -NurpP --minimal linux-3.0.21/fs/ext4/file.c linux-3.0.21-vs2.3.2.3/fs/ext4/file.c
---- linux-3.0.21/fs/ext4/file.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext4/file.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext4/file.c linux-3.0.25-vs2.3.2.3/fs/ext4/file.c
+--- linux-3.0.25/fs/ext4/file.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext4/file.c 2011-06-10 22:11:24.000000000 +0200
@@ -282,5 +282,6 @@ const struct inode_operations ext4_file_
#endif
.check_acl = ext4_check_acl,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.0.21/fs/ext4/ialloc.c linux-3.0.21-vs2.3.2.3/fs/ext4/ialloc.c
---- linux-3.0.21/fs/ext4/ialloc.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext4/ialloc.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext4/ialloc.c linux-3.0.25-vs2.3.2.3/fs/ext4/ialloc.c
+--- linux-3.0.25/fs/ext4/ialloc.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext4/ialloc.c 2011-06-10 22:11:24.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.0.21/fs/ext4/inode.c linux-3.0.21-vs2.3.2.3/fs/ext4/inode.c
---- linux-3.0.21/fs/ext4/inode.c 2012-02-15 01:04:24.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/ext4/inode.c 2011-12-23 16:09:00.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/ext4/inode.c linux-3.0.25-vs2.3.2.3/fs/ext4/inode.c
+--- linux-3.0.25/fs/ext4/inode.c 2012-03-19 21:16:51.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/ext4/inode.c 2011-12-23 16:09:00.000000000 +0100
@@ -42,6 +42,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.0.21/fs/ext4/ioctl.c linux-3.0.21-vs2.3.2.3/fs/ext4/ioctl.c
---- linux-3.0.21/fs/ext4/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ext4/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ext4/ioctl.c linux-3.0.25-vs2.3.2.3/fs/ext4/ioctl.c
+--- linux-3.0.25/fs/ext4/ioctl.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ext4/ioctl.c 2011-06-10 22:11:24.000000000 +0200
@@ -14,10 +14,39 @@
#include <linux/compat.h>
#include <linux/mount.h>
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.0.21/fs/ext4/namei.c linux-3.0.21-vs2.3.2.3/fs/ext4/namei.c
---- linux-3.0.21/fs/ext4/namei.c 2012-02-15 01:04:24.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/ext4/namei.c 2011-11-15 17:37:06.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/ext4/namei.c linux-3.0.25-vs2.3.2.3/fs/ext4/namei.c
+--- linux-3.0.25/fs/ext4/namei.c 2012-03-19 21:16:51.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/ext4/namei.c 2011-11-15 17:37:06.000000000 +0100
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.21/fs/ext4/super.c linux-3.0.21-vs2.3.2.3/fs/ext4/super.c
---- linux-3.0.21/fs/ext4/super.c 2012-02-15 01:04:24.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/ext4/super.c 2012-01-26 08:39:53.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/ext4/super.c linux-3.0.25-vs2.3.2.3/fs/ext4/super.c
+--- linux-3.0.25/fs/ext4/super.c 2012-03-19 21:16:51.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/ext4/super.c 2012-01-26 08:39:53.000000000 +0100
@@ -1292,6 +1292,7 @@ enum {
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.0.21/fs/fcntl.c linux-3.0.21-vs2.3.2.3/fs/fcntl.c
---- linux-3.0.21/fs/fcntl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/fcntl.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/fcntl.c linux-3.0.25-vs2.3.2.3/fs/fcntl.c
+--- linux-3.0.25/fs/fcntl.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/fcntl.c 2011-06-10 22:11:24.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/signal.h>
#include <linux/rcupdate.h>
if (unlikely(filp->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd)) {
-diff -NurpP --minimal linux-3.0.21/fs/file.c linux-3.0.21-vs2.3.2.3/fs/file.c
---- linux-3.0.21/fs/file.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/file.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/file.c linux-3.0.25-vs2.3.2.3/fs/file.c
+--- linux-3.0.25/fs/file.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/file.c 2011-06-10 22:11:24.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
#if 1
/* Sanity check */
if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-3.0.21/fs/file_table.c linux-3.0.21-vs2.3.2.3/fs/file_table.c
---- linux-3.0.21/fs/file_table.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/file_table.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/file_table.c linux-3.0.25-vs2.3.2.3/fs/file_table.c
+--- linux-3.0.25/fs/file_table.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/file_table.c 2011-06-10 22:11:24.000000000 +0200
@@ -24,6 +24,8 @@
#include <linux/percpu_counter.h>
#include <linux/percpu.h>
file_sb_list_del(file);
file_free(file);
}
-diff -NurpP --minimal linux-3.0.21/fs/fs_struct.c linux-3.0.21-vs2.3.2.3/fs/fs_struct.c
---- linux-3.0.21/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/fs_struct.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/fs_struct.c linux-3.0.25-vs2.3.2.3/fs/fs_struct.c
+--- linux-3.0.25/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/fs_struct.c 2011-06-10 22:11:24.000000000 +0200
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
}
return fs;
}
-diff -NurpP --minimal linux-3.0.21/fs/gfs2/file.c linux-3.0.21-vs2.3.2.3/fs/gfs2/file.c
---- linux-3.0.21/fs/gfs2/file.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/gfs2/file.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/gfs2/file.c linux-3.0.25-vs2.3.2.3/fs/gfs2/file.c
+--- linux-3.0.25/fs/gfs2/file.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/gfs2/file.c 2011-06-10 22:11:24.000000000 +0200
@@ -134,6 +134,9 @@ static const u32 fsflags_to_gfs2[32] = {
[7] = GFS2_DIF_NOATIME,
[12] = GFS2_DIF_EXHASH,
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-3.0.21/fs/gfs2/inode.h linux-3.0.21-vs2.3.2.3/fs/gfs2/inode.h
---- linux-3.0.21/fs/gfs2/inode.h 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/gfs2/inode.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/gfs2/inode.h linux-3.0.25-vs2.3.2.3/fs/gfs2/inode.h
+--- linux-3.0.25/fs/gfs2/inode.h 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/gfs2/inode.h 2011-06-10 22:11:24.000000000 +0200
@@ -120,6 +120,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.0.21/fs/inode.c linux-3.0.21-vs2.3.2.3/fs/inode.c
---- linux-3.0.21/fs/inode.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/inode.c 2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/inode.c linux-3.0.25-vs2.3.2.3/fs/inode.c
+--- linux-3.0.25/fs/inode.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/inode.c 2011-07-01 11:35:34.000000000 +0200
@@ -26,6 +26,7 @@
#include <linux/ima.h>
#include <linux/cred.h>
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.0.21/fs/ioctl.c linux-3.0.21-vs2.3.2.3/fs/ioctl.c
---- linux-3.0.21/fs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ioctl.c linux-3.0.25-vs2.3.2.3/fs/ioctl.c
+--- linux-3.0.25/fs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ioctl.c 2011-06-10 22:11:24.000000000 +0200
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.0.21/fs/ioprio.c linux-3.0.21-vs2.3.2.3/fs/ioprio.c
---- linux-3.0.21/fs/ioprio.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/ioprio.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ioprio.c linux-3.0.25-vs2.3.2.3/fs/ioprio.c
+--- linux-3.0.25/fs/ioprio.c 2011-01-05 21:50:24.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/ioprio.c 2011-06-10 22:11:24.000000000 +0200
@@ -27,6 +27,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.0.21/fs/jfs/file.c linux-3.0.21-vs2.3.2.3/fs/jfs/file.c
---- linux-3.0.21/fs/jfs/file.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/jfs/file.c 2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/jfs/file.c linux-3.0.25-vs2.3.2.3/fs/jfs/file.c
+--- linux-3.0.25/fs/jfs/file.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/jfs/file.c 2011-07-01 11:35:34.000000000 +0200
@@ -102,7 +102,8 @@ int jfs_setattr(struct dentry *dentry, s
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.0.21/fs/jfs/ioctl.c linux-3.0.21-vs2.3.2.3/fs/jfs/ioctl.c
---- linux-3.0.21/fs/jfs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/jfs/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/jfs/ioctl.c linux-3.0.25-vs2.3.2.3/fs/jfs/ioctl.c
+--- linux-3.0.25/fs/jfs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/jfs/ioctl.c 2011-06-10 22:11:24.000000000 +0200
@@ -11,6 +11,7 @@
#include <linux/mount.h>
#include <linux/time.h>
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.0.21/fs/jfs/jfs_dinode.h linux-3.0.21-vs2.3.2.3/fs/jfs/jfs_dinode.h
---- linux-3.0.21/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/jfs/jfs_dinode.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/jfs/jfs_dinode.h linux-3.0.25-vs2.3.2.3/fs/jfs/jfs_dinode.h
+--- linux-3.0.25/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/jfs/jfs_dinode.h 2011-06-10 22:11:24.000000000 +0200
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.0.21/fs/jfs/jfs_filsys.h linux-3.0.21-vs2.3.2.3/fs/jfs/jfs_filsys.h
---- linux-3.0.21/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/jfs/jfs_filsys.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/jfs/jfs_filsys.h linux-3.0.25-vs2.3.2.3/fs/jfs/jfs_filsys.h
+--- linux-3.0.25/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/jfs/jfs_filsys.h 2011-06-10 22:11:24.000000000 +0200
@@ -263,6 +263,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.0.21/fs/jfs/jfs_imap.c linux-3.0.21-vs2.3.2.3/fs/jfs/jfs_imap.c
---- linux-3.0.21/fs/jfs/jfs_imap.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/jfs/jfs_imap.c 2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/jfs/jfs_imap.c linux-3.0.25-vs2.3.2.3/fs/jfs/jfs_imap.c
+--- linux-3.0.25/fs/jfs/jfs_imap.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/jfs/jfs_imap.c 2011-07-01 11:35:34.000000000 +0200
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.0.21/fs/jfs/jfs_inode.c linux-3.0.21-vs2.3.2.3/fs/jfs/jfs_inode.c
---- linux-3.0.21/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/jfs/jfs_inode.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/jfs/jfs_inode.c linux-3.0.25-vs2.3.2.3/fs/jfs/jfs_inode.c
+--- linux-3.0.25/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/jfs/jfs_inode.c 2011-06-10 22:11:24.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/fs.h>
}
/*
-diff -NurpP --minimal linux-3.0.21/fs/jfs/jfs_inode.h linux-3.0.21-vs2.3.2.3/fs/jfs/jfs_inode.h
---- linux-3.0.21/fs/jfs/jfs_inode.h 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/jfs/jfs_inode.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/jfs/jfs_inode.h linux-3.0.25-vs2.3.2.3/fs/jfs/jfs_inode.h
+--- linux-3.0.25/fs/jfs/jfs_inode.h 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/jfs/jfs_inode.h 2011-06-10 22:11:24.000000000 +0200
@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
int fh_len, int fh_type);
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern int jfs_setattr(struct dentry *, struct iattr *);
-diff -NurpP --minimal linux-3.0.21/fs/jfs/namei.c linux-3.0.21-vs2.3.2.3/fs/jfs/namei.c
---- linux-3.0.21/fs/jfs/namei.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/jfs/namei.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/jfs/namei.c linux-3.0.25-vs2.3.2.3/fs/jfs/namei.c
+--- linux-3.0.25/fs/jfs/namei.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/jfs/namei.c 2011-06-10 22:11:24.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.0.21/fs/jfs/super.c linux-3.0.21-vs2.3.2.3/fs/jfs/super.c
---- linux-3.0.21/fs/jfs/super.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/jfs/super.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/jfs/super.c linux-3.0.25-vs2.3.2.3/fs/jfs/super.c
+--- linux-3.0.25/fs/jfs/super.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/jfs/super.c 2011-06-10 22:11:24.000000000 +0200
@@ -198,7 +198,8 @@ static void jfs_put_super(struct super_b
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-3.0.21/fs/libfs.c linux-3.0.21-vs2.3.2.3/fs/libfs.c
---- linux-3.0.21/fs/libfs.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/libfs.c 2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/libfs.c linux-3.0.25-vs2.3.2.3/fs/libfs.c
+--- linux-3.0.25/fs/libfs.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/libfs.c 2011-07-22 11:20:39.000000000 +0200
@@ -133,7 +133,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(mount_pseudo);
EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-3.0.21/fs/locks.c linux-3.0.21-vs2.3.2.3/fs/locks.c
---- linux-3.0.21/fs/locks.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/locks.c 2011-07-19 00:51:58.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/locks.c linux-3.0.25-vs2.3.2.3/fs/locks.c
+--- linux-3.0.25/fs/locks.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/locks.c 2011-07-19 00:51:58.000000000 +0200
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
return 0;
}
-diff -NurpP --minimal linux-3.0.21/fs/namei.c linux-3.0.21-vs2.3.2.3/fs/namei.c
---- linux-3.0.21/fs/namei.c 2012-02-15 01:04:24.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/namei.c 2011-11-16 14:27:47.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/namei.c linux-3.0.25-vs2.3.2.3/fs/namei.c
+--- linux-3.0.25/fs/namei.c 2012-03-19 21:16:51.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/namei.c 2012-03-23 14:54:00.000000000 +0100
@@ -32,6 +32,14 @@
#include <linux/fcntl.h>
#include <linux/device_cgroup.h>
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-3.0.21/fs/namespace.c linux-3.0.21-vs2.3.2.3/fs/namespace.c
---- linux-3.0.21/fs/namespace.c 2012-02-15 01:04:24.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/namespace.c 2011-12-23 16:09:00.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/namespace.c linux-3.0.25-vs2.3.2.3/fs/namespace.c
+--- linux-3.0.25/fs/namespace.c 2012-03-19 21:16:51.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/namespace.c 2011-12-23 16:09:00.000000000 +0100
@@ -31,6 +31,11 @@
#include <linux/idr.h>
#include <linux/fs_struct.h>
kfree(ns);
}
EXPORT_SYMBOL(put_mnt_ns);
-diff -NurpP --minimal linux-3.0.21/fs/nfs/client.c linux-3.0.21-vs2.3.2.3/fs/nfs/client.c
---- linux-3.0.21/fs/nfs/client.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/nfs/client.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/nfs/client.c linux-3.0.25-vs2.3.2.3/fs/nfs/client.c
+--- linux-3.0.25/fs/nfs/client.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/nfs/client.c 2011-06-10 22:11:24.000000000 +0200
@@ -780,6 +780,9 @@ static int nfs_init_server_rpcclient(str
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.0.21/fs/nfs/dir.c linux-3.0.21-vs2.3.2.3/fs/nfs/dir.c
---- linux-3.0.21/fs/nfs/dir.c 2012-02-15 01:04:24.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/nfs/dir.c 2011-12-19 15:55:53.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/nfs/dir.c linux-3.0.25-vs2.3.2.3/fs/nfs/dir.c
+--- linux-3.0.25/fs/nfs/dir.c 2012-03-19 21:16:51.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/nfs/dir.c 2011-12-19 15:55:53.000000000 +0100
@@ -35,6 +35,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-3.0.21/fs/nfs/inode.c linux-3.0.21-vs2.3.2.3/fs/nfs/inode.c
---- linux-3.0.21/fs/nfs/inode.c 2012-02-15 01:04:24.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/nfs/inode.c 2011-12-19 15:55:53.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/nfs/inode.c linux-3.0.25-vs2.3.2.3/fs/nfs/inode.c
+--- linux-3.0.25/fs/nfs/inode.c 2012-03-19 21:16:51.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/nfs/inode.c 2011-12-19 15:55:53.000000000 +0100
@@ -38,6 +38,7 @@
#include <linux/nfs_xdr.h>
#include <linux/slab.h>
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.0.21/fs/nfs/nfs3xdr.c linux-3.0.21-vs2.3.2.3/fs/nfs/nfs3xdr.c
---- linux-3.0.21/fs/nfs/nfs3xdr.c 2011-03-15 18:07:32.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/nfs/nfs3xdr.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/nfs/nfs3xdr.c linux-3.0.25-vs2.3.2.3/fs/nfs/nfs3xdr.c
+--- linux-3.0.25/fs/nfs/nfs3xdr.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/nfs/nfs3xdr.c 2011-06-10 22:11:24.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
}
/*
-diff -NurpP --minimal linux-3.0.21/fs/nfs/super.c linux-3.0.21-vs2.3.2.3/fs/nfs/super.c
---- linux-3.0.21/fs/nfs/super.c 2012-02-15 01:04:24.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/nfs/super.c 2012-01-26 08:39:53.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/nfs/super.c linux-3.0.25-vs2.3.2.3/fs/nfs/super.c
+--- linux-3.0.25/fs/nfs/super.c 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/nfs/super.c 2012-01-26 08:39:53.000000000 +0100
@@ -53,6 +53,7 @@
#include <linux/nfs_xdr.h>
#include <linux/magic.h>
/*
* options that take text values
-diff -NurpP --minimal linux-3.0.21/fs/nfsd/auth.c linux-3.0.21-vs2.3.2.3/fs/nfsd/auth.c
---- linux-3.0.21/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/nfsd/auth.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/nfsd/auth.c linux-3.0.25-vs2.3.2.3/fs/nfsd/auth.c
+--- linux-3.0.25/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/nfsd/auth.c 2011-06-10 22:11:24.000000000 +0200
@@ -1,6 +1,7 @@
/* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.0.21/fs/nfsd/nfs3xdr.c linux-3.0.21-vs2.3.2.3/fs/nfsd/nfs3xdr.c
---- linux-3.0.21/fs/nfsd/nfs3xdr.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/nfsd/nfs3xdr.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/nfsd/nfs3xdr.c linux-3.0.25-vs2.3.2.3/fs/nfsd/nfs3xdr.c
+--- linux-3.0.25/fs/nfsd/nfs3xdr.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/nfsd/nfs3xdr.c 2011-06-10 22:11:24.000000000 +0200
@@ -7,6 +7,7 @@
*/
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-3.0.21/fs/nfsd/nfs4xdr.c linux-3.0.21-vs2.3.2.3/fs/nfsd/nfs4xdr.c
---- linux-3.0.21/fs/nfsd/nfs4xdr.c 2012-02-15 01:04:24.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/nfsd/nfs4xdr.c 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/nfsd/nfs4xdr.c linux-3.0.25-vs2.3.2.3/fs/nfsd/nfs4xdr.c
+--- linux-3.0.25/fs/nfsd/nfs4xdr.c 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/nfsd/nfs4xdr.c 2011-11-15 17:37:07.000000000 +0100
@@ -45,6 +45,7 @@
#include <linux/statfs.h>
#include <linux/utsname.h>
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-3.0.21/fs/nfsd/nfsxdr.c linux-3.0.21-vs2.3.2.3/fs/nfsd/nfsxdr.c
---- linux-3.0.21/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/nfsd/nfsxdr.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/nfsd/nfsxdr.c linux-3.0.25-vs2.3.2.3/fs/nfsd/nfsxdr.c
+--- linux-3.0.25/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/nfsd/nfsxdr.c 2011-06-10 22:11:24.000000000 +0200
@@ -6,6 +6,7 @@
#include "xdr.h"
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.0.21/fs/ocfs2/dlmglue.c linux-3.0.21-vs2.3.2.3/fs/ocfs2/dlmglue.c
---- linux-3.0.21/fs/ocfs2/dlmglue.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ocfs2/dlmglue.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ocfs2/dlmglue.c linux-3.0.25-vs2.3.2.3/fs/ocfs2/dlmglue.c
+--- linux-3.0.25/fs/ocfs2/dlmglue.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ocfs2/dlmglue.c 2011-06-10 22:11:24.000000000 +0200
@@ -2041,6 +2041,7 @@ static void __ocfs2_stuff_meta_lvb(struc
lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
lvb->lvb_iuid = cpu_to_be32(inode->i_uid);
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
inode->i_nlink = be16_to_cpu(lvb->lvb_inlink);
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-3.0.21/fs/ocfs2/dlmglue.h linux-3.0.21-vs2.3.2.3/fs/ocfs2/dlmglue.h
---- linux-3.0.21/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ocfs2/dlmglue.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ocfs2/dlmglue.h linux-3.0.25-vs2.3.2.3/fs/ocfs2/dlmglue.h
+--- linux-3.0.25/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ocfs2/dlmglue.h 2011-06-10 22:11:24.000000000 +0200
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.0.21/fs/ocfs2/file.c linux-3.0.21-vs2.3.2.3/fs/ocfs2/file.c
---- linux-3.0.21/fs/ocfs2/file.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ocfs2/file.c 2011-06-10 22:43:33.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ocfs2/file.c linux-3.0.25-vs2.3.2.3/fs/ocfs2/file.c
+--- linux-3.0.25/fs/ocfs2/file.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ocfs2/file.c 2011-06-10 22:43:33.000000000 +0200
@@ -1111,7 +1111,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.0.21/fs/ocfs2/inode.c linux-3.0.21-vs2.3.2.3/fs/ocfs2/inode.c
---- linux-3.0.21/fs/ocfs2/inode.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ocfs2/inode.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ocfs2/inode.c linux-3.0.25-vs2.3.2.3/fs/ocfs2/inode.c
+--- linux-3.0.25/fs/ocfs2/inode.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ocfs2/inode.c 2011-06-10 22:11:24.000000000 +0200
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
-diff -NurpP --minimal linux-3.0.21/fs/ocfs2/inode.h linux-3.0.21-vs2.3.2.3/fs/ocfs2/inode.h
---- linux-3.0.21/fs/ocfs2/inode.h 2011-01-05 21:50:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/ocfs2/inode.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ocfs2/inode.h linux-3.0.25-vs2.3.2.3/fs/ocfs2/inode.h
+--- linux-3.0.25/fs/ocfs2/inode.h 2011-01-05 21:50:26.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/ocfs2/inode.h 2011-06-10 22:11:24.000000000 +0200
@@ -151,6 +151,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.0.21/fs/ocfs2/ioctl.c linux-3.0.21-vs2.3.2.3/fs/ocfs2/ioctl.c
---- linux-3.0.21/fs/ocfs2/ioctl.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ocfs2/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ocfs2/ioctl.c linux-3.0.25-vs2.3.2.3/fs/ocfs2/ioctl.c
+--- linux-3.0.25/fs/ocfs2/ioctl.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ocfs2/ioctl.c 2011-06-10 22:11:24.000000000 +0200
@@ -78,7 +78,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = filp->f_path.dentry->d_inode;
-diff -NurpP --minimal linux-3.0.21/fs/ocfs2/namei.c linux-3.0.21-vs2.3.2.3/fs/ocfs2/namei.c
---- linux-3.0.21/fs/ocfs2/namei.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ocfs2/namei.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ocfs2/namei.c linux-3.0.25-vs2.3.2.3/fs/ocfs2/namei.c
+--- linux-3.0.25/fs/ocfs2/namei.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ocfs2/namei.c 2011-06-10 22:11:24.000000000 +0200
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
fe->i_mode = cpu_to_le16(inode->i_mode);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-3.0.21/fs/ocfs2/ocfs2.h linux-3.0.21-vs2.3.2.3/fs/ocfs2/ocfs2.h
---- linux-3.0.21/fs/ocfs2/ocfs2.h 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ocfs2/ocfs2.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ocfs2/ocfs2.h linux-3.0.25-vs2.3.2.3/fs/ocfs2/ocfs2.h
+--- linux-3.0.25/fs/ocfs2/ocfs2.h 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ocfs2/ocfs2.h 2011-06-10 22:11:24.000000000 +0200
@@ -272,6 +272,7 @@ enum ocfs2_mount_options
writes */
OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-3.0.21/fs/ocfs2/ocfs2_fs.h linux-3.0.21-vs2.3.2.3/fs/ocfs2/ocfs2_fs.h
---- linux-3.0.21/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ocfs2/ocfs2_fs.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ocfs2/ocfs2_fs.h linux-3.0.25-vs2.3.2.3/fs/ocfs2/ocfs2_fs.h
+--- linux-3.0.25/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ocfs2/ocfs2_fs.h 2011-06-10 22:11:24.000000000 +0200
@@ -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 */
#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.0.21/fs/ocfs2/super.c linux-3.0.21-vs2.3.2.3/fs/ocfs2/super.c
---- linux-3.0.21/fs/ocfs2/super.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/ocfs2/super.c 2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/ocfs2/super.c linux-3.0.25-vs2.3.2.3/fs/ocfs2/super.c
+--- linux-3.0.25/fs/ocfs2/super.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/ocfs2/super.c 2011-06-15 02:40:14.000000000 +0200
@@ -184,6 +184,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.0.21/fs/open.c linux-3.0.21-vs2.3.2.3/fs/open.c
---- linux-3.0.21/fs/open.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/open.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/open.c linux-3.0.25-vs2.3.2.3/fs/open.c
+--- linux-3.0.25/fs/open.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/open.c 2011-06-10 22:11:24.000000000 +0200
@@ -30,6 +30,11 @@
#include <linux/fs_struct.h>
#include <linux/ima.h>
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-3.0.21/fs/proc/array.c linux-3.0.21-vs2.3.2.3/fs/proc/array.c
---- linux-3.0.21/fs/proc/array.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/proc/array.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/proc/array.c linux-3.0.25-vs2.3.2.3/fs/proc/array.c
+--- linux-3.0.25/fs/proc/array.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/proc/array.c 2011-06-10 22:11:24.000000000 +0200
@@ -81,6 +81,8 @@
#include <linux/pid_namespace.h>
#include <linux/ptrace.h>
seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \
%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n",
-diff -NurpP --minimal linux-3.0.21/fs/proc/base.c linux-3.0.21-vs2.3.2.3/fs/proc/base.c
---- linux-3.0.21/fs/proc/base.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/proc/base.c 2012-02-15 05:20:43.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/proc/base.c linux-3.0.25-vs2.3.2.3/fs/proc/base.c
+--- linux-3.0.25/fs/proc/base.c 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/proc/base.c 2012-02-15 05:20:43.000000000 +0100
@@ -83,6 +83,8 @@
#include <linux/pid_namespace.h>
#include <linux/fs_struct.h>
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.0.21/fs/proc/generic.c linux-3.0.21-vs2.3.2.3/fs/proc/generic.c
---- linux-3.0.21/fs/proc/generic.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/proc/generic.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/proc/generic.c linux-3.0.25-vs2.3.2.3/fs/proc/generic.c
+--- linux-3.0.25/fs/proc/generic.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/proc/generic.c 2011-06-10 22:11:24.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.0.21/fs/proc/inode.c linux-3.0.21-vs2.3.2.3/fs/proc/inode.c
---- linux-3.0.21/fs/proc/inode.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/proc/inode.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/proc/inode.c linux-3.0.25-vs2.3.2.3/fs/proc/inode.c
+--- linux-3.0.25/fs/proc/inode.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/proc/inode.c 2011-06-10 22:11:24.000000000 +0200
@@ -442,6 +442,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.0.21/fs/proc/internal.h linux-3.0.21-vs2.3.2.3/fs/proc/internal.h
---- linux-3.0.21/fs/proc/internal.h 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/proc/internal.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/proc/internal.h linux-3.0.25-vs2.3.2.3/fs/proc/internal.h
+--- linux-3.0.25/fs/proc/internal.h 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/proc/internal.h 2011-06-10 22:11:24.000000000 +0200
@@ -10,6 +10,7 @@
*/
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-3.0.21/fs/proc/loadavg.c linux-3.0.21-vs2.3.2.3/fs/proc/loadavg.c
---- linux-3.0.21/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/proc/loadavg.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/proc/loadavg.c linux-3.0.25-vs2.3.2.3/fs/proc/loadavg.c
+--- linux-3.0.25/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/proc/loadavg.c 2011-06-10 22:11:24.000000000 +0200
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.0.21/fs/proc/meminfo.c linux-3.0.21-vs2.3.2.3/fs/proc/meminfo.c
---- linux-3.0.21/fs/proc/meminfo.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/proc/meminfo.c 2011-12-23 16:09:00.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/proc/meminfo.c linux-3.0.25-vs2.3.2.3/fs/proc/meminfo.c
+--- linux-3.0.25/fs/proc/meminfo.c 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/proc/meminfo.c 2011-12-23 16:09:00.000000000 +0100
@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
allowed = ((totalram_pages - hugetlb_total_pages())
* sysctl_overcommit_ratio / 100) + total_swap_pages;
total_swapcache_pages - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.0.21/fs/proc/root.c linux-3.0.21-vs2.3.2.3/fs/proc/root.c
---- linux-3.0.21/fs/proc/root.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/proc/root.c 2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/proc/root.c linux-3.0.25-vs2.3.2.3/fs/proc/root.c
+--- linux-3.0.25/fs/proc/root.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/proc/root.c 2011-06-22 12:39:15.000000000 +0200
@@ -18,9 +18,14 @@
#include <linux/bitops.h>
#include <linux/mount.h>
};
int pid_ns_prepare_proc(struct pid_namespace *ns)
-diff -NurpP --minimal linux-3.0.21/fs/proc/uptime.c linux-3.0.21-vs2.3.2.3/fs/proc/uptime.c
---- linux-3.0.21/fs/proc/uptime.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/proc/uptime.c 2012-01-26 08:56:00.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/proc/uptime.c linux-3.0.25-vs2.3.2.3/fs/proc/uptime.c
+--- linux-3.0.25/fs/proc/uptime.c 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/proc/uptime.c 2012-01-26 08:56:00.000000000 +0100
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-3.0.21/fs/quota/dquot.c linux-3.0.21-vs2.3.2.3/fs/quota/dquot.c
---- linux-3.0.21/fs/quota/dquot.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/quota/dquot.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/quota/dquot.c linux-3.0.25-vs2.3.2.3/fs/quota/dquot.c
+--- linux-3.0.25/fs/quota/dquot.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/quota/dquot.c 2011-06-10 22:11:24.000000000 +0200
@@ -1548,6 +1548,9 @@ int __dquot_alloc_space(struct inode *in
int reserve = flags & DQUOT_SPACE_RESERVE;
int nofail = flags & DQUOT_SPACE_NOFAIL;
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode))
-diff -NurpP --minimal linux-3.0.21/fs/quota/quota.c linux-3.0.21-vs2.3.2.3/fs/quota/quota.c
---- linux-3.0.21/fs/quota/quota.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/quota/quota.c 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/quota/quota.c linux-3.0.25-vs2.3.2.3/fs/quota/quota.c
+--- linux-3.0.25/fs/quota/quota.c 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/quota/quota.c 2011-11-15 17:37:07.000000000 +0100
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-3.0.21/fs/reiserfs/file.c linux-3.0.21-vs2.3.2.3/fs/reiserfs/file.c
---- linux-3.0.21/fs/reiserfs/file.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/reiserfs/file.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/reiserfs/file.c linux-3.0.25-vs2.3.2.3/fs/reiserfs/file.c
+--- linux-3.0.25/fs/reiserfs/file.c 2011-01-05 21:50:26.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/reiserfs/file.c 2011-06-10 22:11:24.000000000 +0200
@@ -312,4 +312,5 @@ const struct inode_operations reiserfs_f
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
.permission = reiserfs_permission,
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-3.0.21/fs/reiserfs/inode.c linux-3.0.21-vs2.3.2.3/fs/reiserfs/inode.c
---- linux-3.0.21/fs/reiserfs/inode.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/reiserfs/inode.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/reiserfs/inode.c linux-3.0.25-vs2.3.2.3/fs/reiserfs/inode.c
+--- linux-3.0.25/fs/reiserfs/inode.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/reiserfs/inode.c 2011-06-10 22:11:24.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/writeback.h>
#include <linux/quotaops.h>
mark_inode_dirty(inode);
error = journal_end(&th, inode->i_sb, jbegin_count);
if (error)
-diff -NurpP --minimal linux-3.0.21/fs/reiserfs/ioctl.c linux-3.0.21-vs2.3.2.3/fs/reiserfs/ioctl.c
---- linux-3.0.21/fs/reiserfs/ioctl.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/reiserfs/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/reiserfs/ioctl.c linux-3.0.25-vs2.3.2.3/fs/reiserfs/ioctl.c
+--- linux-3.0.25/fs/reiserfs/ioctl.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/reiserfs/ioctl.c 2011-06-10 22:11:24.000000000 +0200
@@ -11,6 +11,21 @@
#include <linux/pagemap.h>
#include <linux/compat.h>
sd_attrs_to_i_attrs(flags, inode);
REISERFS_I(inode)->i_attrs = flags;
inode->i_ctime = CURRENT_TIME_SEC;
-diff -NurpP --minimal linux-3.0.21/fs/reiserfs/namei.c linux-3.0.21-vs2.3.2.3/fs/reiserfs/namei.c
---- linux-3.0.21/fs/reiserfs/namei.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/reiserfs/namei.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/reiserfs/namei.c linux-3.0.25-vs2.3.2.3/fs/reiserfs/namei.c
+--- linux-3.0.25/fs/reiserfs/namei.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/reiserfs/namei.c 2011-06-10 22:11:24.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/reiserfs_acl.h>
#include <linux/reiserfs_xattr.h>
};
/*
-diff -NurpP --minimal linux-3.0.21/fs/reiserfs/super.c linux-3.0.21-vs2.3.2.3/fs/reiserfs/super.c
---- linux-3.0.21/fs/reiserfs/super.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/reiserfs/super.c 2012-01-18 02:58:46.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/reiserfs/super.c linux-3.0.25-vs2.3.2.3/fs/reiserfs/super.c
+--- linux-3.0.25/fs/reiserfs/super.c 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/reiserfs/super.c 2012-01-18 02:58:46.000000000 +0100
@@ -903,6 +903,14 @@ static int reiserfs_parse_options(struct
{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
rs = SB_DISK_SUPER_BLOCK(s);
/* Let's do basic sanity check to verify that underlying device is not
smaller than the filesystem. If the check fails then abort and scream,
-diff -NurpP --minimal linux-3.0.21/fs/reiserfs/xattr.c linux-3.0.21-vs2.3.2.3/fs/reiserfs/xattr.c
---- linux-3.0.21/fs/reiserfs/xattr.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/reiserfs/xattr.c 2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/reiserfs/xattr.c linux-3.0.25-vs2.3.2.3/fs/reiserfs/xattr.c
+--- linux-3.0.25/fs/reiserfs/xattr.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/reiserfs/xattr.c 2011-06-22 12:39:15.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/errno.h>
#include <linux/gfp.h>
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-diff -NurpP --minimal linux-3.0.21/fs/stat.c linux-3.0.21-vs2.3.2.3/fs/stat.c
---- linux-3.0.21/fs/stat.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/stat.c 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/stat.c linux-3.0.25-vs2.3.2.3/fs/stat.c
+--- linux-3.0.25/fs/stat.c 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/stat.c 2011-11-15 17:37:07.000000000 +0100
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
stat->rdev = inode->i_rdev;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-3.0.21/fs/statfs.c linux-3.0.21-vs2.3.2.3/fs/statfs.c
---- linux-3.0.21/fs/statfs.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/statfs.c 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/statfs.c linux-3.0.25-vs2.3.2.3/fs/statfs.c
+--- linux-3.0.25/fs/statfs.c 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/statfs.c 2011-11-15 17:37:07.000000000 +0100
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
return retval;
}
-diff -NurpP --minimal linux-3.0.21/fs/super.c linux-3.0.21-vs2.3.2.3/fs/super.c
---- linux-3.0.21/fs/super.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/super.c 2011-07-23 16:49:09.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/super.c linux-3.0.25-vs2.3.2.3/fs/super.c
+--- linux-3.0.25/fs/super.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/super.c 2011-07-23 16:49:09.000000000 +0200
@@ -32,6 +32,9 @@
#include <linux/backing-dev.h>
#include <linux/rculist_bl.h>
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-3.0.21/fs/sysfs/mount.c linux-3.0.21-vs2.3.2.3/fs/sysfs/mount.c
---- linux-3.0.21/fs/sysfs/mount.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/sysfs/mount.c 2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/sysfs/mount.c linux-3.0.25-vs2.3.2.3/fs/sysfs/mount.c
+--- linux-3.0.25/fs/sysfs/mount.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/sysfs/mount.c 2011-06-22 12:39:15.000000000 +0200
@@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-3.0.21/fs/utimes.c linux-3.0.21-vs2.3.2.3/fs/utimes.c
---- linux-3.0.21/fs/utimes.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/utimes.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/utimes.c linux-3.0.25-vs2.3.2.3/fs/utimes.c
+--- linux-3.0.25/fs/utimes.c 2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/utimes.c 2011-06-10 22:11:24.000000000 +0200
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-3.0.21/fs/xattr.c linux-3.0.21-vs2.3.2.3/fs/xattr.c
---- linux-3.0.21/fs/xattr.c 2011-07-22 11:18:09.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/xattr.c 2011-06-10 23:10:19.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/xattr.c linux-3.0.25-vs2.3.2.3/fs/xattr.c
+--- linux-3.0.25/fs/xattr.c 2011-07-22 11:18:09.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/xattr.c 2011-06-10 23:10:19.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.0.21/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.21-vs2.3.2.3/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-3.0.21/fs/xfs/linux-2.6/xfs_ioctl.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/linux-2.6/xfs_ioctl.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.25-vs2.3.2.3/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-3.0.25/fs/xfs/linux-2.6/xfs_ioctl.c 2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/linux-2.6/xfs_ioctl.c 2011-06-10 22:11:24.000000000 +0200
@@ -28,7 +28,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.0.21/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0.21-vs2.3.2.3/fs/xfs/linux-2.6/xfs_ioctl.h
---- linux-3.0.21/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 18:31:54.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/linux-2.6/xfs_ioctl.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0.25-vs2.3.2.3/fs/xfs/linux-2.6/xfs_ioctl.h
+--- linux-3.0.25/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 18:31:54.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/linux-2.6/xfs_ioctl.h 2011-06-10 22:11:24.000000000 +0200
@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
void __user *uhandle,
u32 hlen);
extern long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-3.0.21/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.21-vs2.3.2.3/fs/xfs/linux-2.6/xfs_iops.c
---- linux-3.0.21/fs/xfs/linux-2.6/xfs_iops.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/linux-2.6/xfs_iops.c 2011-12-19 15:55:53.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.25-vs2.3.2.3/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-3.0.25/fs/xfs/linux-2.6/xfs_iops.c 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/linux-2.6/xfs_iops.c 2011-12-19 15:55:53.000000000 +0100
@@ -30,6 +30,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-3.0.21/fs/xfs/linux-2.6/xfs_linux.h linux-3.0.21-vs2.3.2.3/fs/xfs/linux-2.6/xfs_linux.h
---- linux-3.0.21/fs/xfs/linux-2.6/xfs_linux.h 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/linux-2.6/xfs_linux.h 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/xfs/linux-2.6/xfs_linux.h linux-3.0.25-vs2.3.2.3/fs/xfs/linux-2.6/xfs_linux.h
+--- linux-3.0.25/fs/xfs/linux-2.6/xfs_linux.h 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/linux-2.6/xfs_linux.h 2011-11-15 17:37:07.000000000 +0100
@@ -117,6 +117,7 @@
#define current_cpu() (raw_smp_processor_id())
#define current_test_flags(f) (current->flags & (f))
#define current_set_flags_nested(sp, f) \
(*(sp) = current->flags, current->flags |= (f))
-diff -NurpP --minimal linux-3.0.21/fs/xfs/linux-2.6/xfs_super.c linux-3.0.21-vs2.3.2.3/fs/xfs/linux-2.6/xfs_super.c
---- linux-3.0.21/fs/xfs/linux-2.6/xfs_super.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/linux-2.6/xfs_super.c 2012-01-10 09:19:13.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/xfs/linux-2.6/xfs_super.c linux-3.0.25-vs2.3.2.3/fs/xfs/linux-2.6/xfs_super.c
+--- linux-3.0.25/fs/xfs/linux-2.6/xfs_super.c 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/linux-2.6/xfs_super.c 2012-01-10 09:19:13.000000000 +0100
@@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool;
#define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */
#define MNTOPT_DISCARD "discard" /* Discard unused blocks */
/*
* 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.0.21/fs/xfs/xfs_dinode.h linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_dinode.h
---- linux-3.0.21/fs/xfs/xfs_dinode.h 2011-01-05 21:50:28.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_dinode.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/xfs/xfs_dinode.h linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_dinode.h
+--- linux-3.0.25/fs/xfs/xfs_dinode.h 2011-01-05 21:50:28.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_dinode.h 2011-06-10 22:11:24.000000000 +0200
@@ -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 */
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.0.21/fs/xfs/xfs_fs.h linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_fs.h
---- linux-3.0.21/fs/xfs/xfs_fs.h 2011-01-05 21:50:28.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_fs.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/xfs/xfs_fs.h linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_fs.h
+--- linux-3.0.25/fs/xfs/xfs_fs.h 2011-01-05 21:50:28.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_fs.h 2011-06-10 22:11:24.000000000 +0200
@@ -67,6 +67,9 @@ struct fsxattr {
#define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
#define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
__u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */
-diff -NurpP --minimal linux-3.0.21/fs/xfs/xfs_ialloc.c linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_ialloc.c
---- linux-3.0.21/fs/xfs/xfs_ialloc.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_ialloc.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/xfs/xfs_ialloc.c linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_ialloc.c
+--- linux-3.0.25/fs/xfs/xfs_ialloc.c 2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_ialloc.c 2011-06-10 22:11:24.000000000 +0200
@@ -37,7 +37,6 @@
#include "xfs_error.h"
#include "xfs_bmap.h"
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-3.0.21/fs/xfs/xfs_inode.c linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_inode.c
---- linux-3.0.21/fs/xfs/xfs_inode.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_inode.c 2011-12-23 16:09:00.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/xfs/xfs_inode.c linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_inode.c
+--- linux-3.0.25/fs/xfs/xfs_inode.c 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_inode.c 2011-12-23 16:09:00.000000000 +0100
@@ -243,6 +243,7 @@ xfs_inotobp(
return 0;
}
/* Wrap, we never let the log put out DI_MAX_FLUSH */
if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
-diff -NurpP --minimal linux-3.0.21/fs/xfs/xfs_inode.h linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_inode.h
---- linux-3.0.21/fs/xfs/xfs_inode.h 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_inode.h 2011-12-19 15:55:53.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/xfs/xfs_inode.h linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_inode.h
+--- linux-3.0.25/fs/xfs/xfs_inode.h 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_inode.h 2011-12-19 15:55:53.000000000 +0100
@@ -135,7 +135,9 @@ typedef struct xfs_icdinode {
__uint32_t di_nlink; /* number of links to file */
__uint16_t di_projid_lo; /* lower part of owner's project id */
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.0.21/fs/xfs/xfs_itable.c linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_itable.c
---- linux-3.0.21/fs/xfs/xfs_itable.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_itable.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/xfs/xfs_itable.c linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_itable.c
+--- linux-3.0.25/fs/xfs/xfs_itable.c 2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_itable.c 2011-06-10 22:11:24.000000000 +0200
@@ -98,6 +98,7 @@ xfs_bulkstat_one_int(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
buf->bs_size = dic->di_size;
/*
-diff -NurpP --minimal linux-3.0.21/fs/xfs/xfs_log_recover.c linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_log_recover.c
---- linux-3.0.21/fs/xfs/xfs_log_recover.c 2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_log_recover.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/xfs/xfs_log_recover.c linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_log_recover.c
+--- linux-3.0.25/fs/xfs/xfs_log_recover.c 2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_log_recover.c 2011-06-10 22:11:24.000000000 +0200
@@ -2343,7 +2343,8 @@ xlog_recover_inode_pass2(
}
/* the rest is in on-disk format */
if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-3.0.21/fs/xfs/xfs_mount.h linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_mount.h
---- linux-3.0.21/fs/xfs/xfs_mount.h 2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_mount.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/xfs/xfs_mount.h linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_mount.h
+--- linux-3.0.25/fs/xfs/xfs_mount.h 2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_mount.h 2011-06-10 22:11:24.000000000 +0200
@@ -249,6 +249,7 @@ typedef struct xfs_mount {
allocator */
#define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.0.21/fs/xfs/xfs_vnodeops.c linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_vnodeops.c
---- linux-3.0.21/fs/xfs/xfs_vnodeops.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_vnodeops.c 2012-02-07 02:05:58.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/fs/xfs/xfs_vnodeops.c linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_vnodeops.c
+--- linux-3.0.25/fs/xfs/xfs_vnodeops.c 2012-03-19 21:16:52.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_vnodeops.c 2012-02-07 02:05:58.000000000 +0100
@@ -50,6 +50,78 @@
#include "xfs_vnodeops.h"
#include "xfs_trace.h"
if (iuid != uid) {
if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) {
ASSERT(mask & ATTR_UID);
-diff -NurpP --minimal linux-3.0.21/fs/xfs/xfs_vnodeops.h linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_vnodeops.h
---- linux-3.0.21/fs/xfs/xfs_vnodeops.h 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/fs/xfs/xfs_vnodeops.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/fs/xfs/xfs_vnodeops.h linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_vnodeops.h
+--- linux-3.0.25/fs/xfs/xfs_vnodeops.h 2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/fs/xfs/xfs_vnodeops.h 2011-06-10 22:11:24.000000000 +0200
@@ -13,6 +13,7 @@ struct xfs_inode;
struct xfs_iomap;
int xfs_setattr(struct xfs_inode *ip, struct iattr *vap, int flags);
#define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */
#define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if operation would block */
-diff -NurpP --minimal linux-3.0.21/include/asm-generic/tlb.h linux-3.0.21-vs2.3.2.3/include/asm-generic/tlb.h
---- linux-3.0.21/include/asm-generic/tlb.h 2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/asm-generic/tlb.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/asm-generic/tlb.h linux-3.0.25-vs2.3.2.3/include/asm-generic/tlb.h
+--- linux-3.0.25/include/asm-generic/tlb.h 2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/asm-generic/tlb.h 2011-06-10 22:11:24.000000000 +0200
@@ -16,6 +16,7 @@
#define _ASM_GENERIC__TLB_H
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0.21/include/linux/Kbuild linux-3.0.21-vs2.3.2.3/include/linux/Kbuild
---- linux-3.0.21/include/linux/Kbuild 2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/Kbuild 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/Kbuild linux-3.0.25-vs2.3.2.3/include/linux/Kbuild
+--- linux-3.0.25/include/linux/Kbuild 2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/Kbuild 2011-06-10 22:11:24.000000000 +0200
@@ -17,6 +17,7 @@ header-y += netfilter_bridge/
header-y += netfilter_ipv4/
header-y += netfilter_ipv6/
header-y += wimax/
objhdr-y += version.h
-diff -NurpP --minimal linux-3.0.21/include/linux/capability.h linux-3.0.21-vs2.3.2.3/include/linux/capability.h
---- linux-3.0.21/include/linux/capability.h 2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/capability.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/capability.h linux-3.0.25-vs2.3.2.3/include/linux/capability.h
+--- linux-3.0.25/include/linux/capability.h 2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/capability.h 2011-06-10 22:11:24.000000000 +0200
@@ -279,6 +279,7 @@ struct cpu_vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.0.21/include/linux/cred.h linux-3.0.21-vs2.3.2.3/include/linux/cred.h
---- linux-3.0.21/include/linux/cred.h 2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/cred.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/cred.h linux-3.0.25-vs2.3.2.3/include/linux/cred.h
+--- linux-3.0.25/include/linux/cred.h 2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/cred.h 2011-06-10 22:11:24.000000000 +0200
@@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc
extern int copy_creds(struct task_struct *, unsigned long);
extern const struct cred *get_task_cred(struct task_struct *);
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.0.21/include/linux/devpts_fs.h linux-3.0.21-vs2.3.2.3/include/linux/devpts_fs.h
---- linux-3.0.21/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/devpts_fs.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/devpts_fs.h linux-3.0.25-vs2.3.2.3/include/linux/devpts_fs.h
+--- linux-3.0.25/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/devpts_fs.h 2011-06-10 22:11:24.000000000 +0200
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/ext2_fs.h linux-3.0.21-vs2.3.2.3/include/linux/ext2_fs.h
---- linux-3.0.21/include/linux/ext2_fs.h 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/ext2_fs.h 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/include/linux/ext2_fs.h linux-3.0.25-vs2.3.2.3/include/linux/ext2_fs.h
+--- linux-3.0.25/include/linux/ext2_fs.h 2012-03-19 21:16:53.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/ext2_fs.h 2011-11-15 17:37:07.000000000 +0100
@@ -189,8 +189,12 @@ struct ext2_group_desc
#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-3.0.21/include/linux/ext3_fs.h linux-3.0.21-vs2.3.2.3/include/linux/ext3_fs.h
---- linux-3.0.21/include/linux/ext3_fs.h 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/ext3_fs.h 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/include/linux/ext3_fs.h linux-3.0.25-vs2.3.2.3/include/linux/ext3_fs.h
+--- linux-3.0.25/include/linux/ext3_fs.h 2012-03-19 21:16:53.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/ext3_fs.h 2011-11-15 17:37:07.000000000 +0100
@@ -173,10 +173,14 @@ struct ext3_group_desc
#define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.0.21/include/linux/fs.h linux-3.0.21-vs2.3.2.3/include/linux/fs.h
---- linux-3.0.21/include/linux/fs.h 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/fs.h 2011-12-23 16:09:00.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/include/linux/fs.h linux-3.0.25-vs2.3.2.3/include/linux/fs.h
+--- linux-3.0.25/include/linux/fs.h 2012-03-19 21:16:53.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/fs.h 2012-03-01 21:51:50.000000000 +0100
@@ -208,6 +208,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 */
struct file_ra_state f_ra;
u64 f_version;
-@@ -1101,6 +1137,7 @@ struct file_lock {
+@@ -1102,6 +1138,7 @@ struct file_lock {
struct file *fl_file;
loff_t fl_start;
loff_t fl_end;
struct fasync_struct * fl_fasync; /* for lease break notifications */
unsigned long fl_break_time; /* for nonblocking lease breaks */
-@@ -1600,6 +1637,7 @@ struct inode_operations {
+@@ -1601,6 +1638,7 @@ struct inode_operations {
ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
ssize_t (*listxattr) (struct dentry *, char *, size_t);
int (*removexattr) (struct dentry *, const char *);
void (*truncate_range)(struct inode *, loff_t, loff_t);
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len);
-@@ -1618,6 +1656,7 @@ extern ssize_t vfs_readv(struct file *,
+@@ -1619,6 +1657,7 @@ extern ssize_t vfs_readv(struct file *,
unsigned long, loff_t *);
extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
unsigned long, loff_t *);
struct super_operations {
struct inode *(*alloc_inode)(struct super_block *sb);
-@@ -2438,6 +2477,7 @@ extern int dcache_dir_open(struct inode
+@@ -2439,6 +2478,7 @@ extern int dcache_dir_open(struct inode
extern int dcache_dir_close(struct inode *, struct file *);
extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
extern int dcache_readdir(struct file *, void *, filldir_t);
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.0.21/include/linux/gfs2_ondisk.h linux-3.0.21-vs2.3.2.3/include/linux/gfs2_ondisk.h
---- linux-3.0.21/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/gfs2_ondisk.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/gfs2_ondisk.h linux-3.0.25-vs2.3.2.3/include/linux/gfs2_ondisk.h
+--- linux-3.0.25/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/gfs2_ondisk.h 2011-06-10 22:11:24.000000000 +0200
@@ -211,6 +211,9 @@ enum {
gfs2fl_NoAtime = 7,
gfs2fl_Sync = 8,
#define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
#define GFS2_DIF_INHERIT_DIRECTIO 0x40000000
#define GFS2_DIF_INHERIT_JDATA 0x80000000
-diff -NurpP --minimal linux-3.0.21/include/linux/if_tun.h linux-3.0.21-vs2.3.2.3/include/linux/if_tun.h
---- linux-3.0.21/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/if_tun.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/if_tun.h linux-3.0.25-vs2.3.2.3/include/linux/if_tun.h
+--- linux-3.0.25/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/if_tun.h 2011-06-10 22:11:24.000000000 +0200
@@ -53,6 +53,7 @@
#define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
#define TUNGETVNETHDRSZ _IOR('T', 215, int)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-3.0.21/include/linux/init_task.h linux-3.0.21-vs2.3.2.3/include/linux/init_task.h
---- linux-3.0.21/include/linux/init_task.h 2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/init_task.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/init_task.h linux-3.0.25-vs2.3.2.3/include/linux/init_task.h
+--- linux-3.0.25/include/linux/init_task.h 2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/init_task.h 2011-06-10 22:11:24.000000000 +0200
@@ -193,6 +193,10 @@ extern struct cred init_cred;
INIT_FTRACE_GRAPH \
INIT_TRACE_RECURSION \
}
-diff -NurpP --minimal linux-3.0.21/include/linux/ipc.h linux-3.0.21-vs2.3.2.3/include/linux/ipc.h
---- linux-3.0.21/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/ipc.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/ipc.h linux-3.0.25-vs2.3.2.3/include/linux/ipc.h
+--- linux-3.0.25/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/ipc.h 2011-06-10 22:11:24.000000000 +0200
@@ -91,6 +91,7 @@ struct kern_ipc_perm
key_t key;
uid_t uid;
uid_t cuid;
gid_t cgid;
mode_t mode;
-diff -NurpP --minimal linux-3.0.21/include/linux/ipc_namespace.h linux-3.0.21-vs2.3.2.3/include/linux/ipc_namespace.h
---- linux-3.0.21/include/linux/ipc_namespace.h 2011-05-22 16:17:55.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/ipc_namespace.h 2011-06-13 14:09:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/ipc_namespace.h linux-3.0.25-vs2.3.2.3/include/linux/ipc_namespace.h
+--- linux-3.0.25/include/linux/ipc_namespace.h 2011-05-22 16:17:55.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/ipc_namespace.h 2011-06-13 14:09:44.000000000 +0200
@@ -94,7 +94,8 @@ static inline int mq_init_ns(struct ipc_
#if defined(CONFIG_IPC_NS)
}
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.0.21/include/linux/loop.h linux-3.0.21-vs2.3.2.3/include/linux/loop.h
---- linux-3.0.21/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/loop.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/loop.h linux-3.0.25-vs2.3.2.3/include/linux/loop.h
+--- linux-3.0.25/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/loop.h 2011-06-10 22:11:24.000000000 +0200
@@ -45,6 +45,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.0.21/include/linux/magic.h linux-3.0.21-vs2.3.2.3/include/linux/magic.h
---- linux-3.0.21/include/linux/magic.h 2011-05-22 16:17:55.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/magic.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/magic.h linux-3.0.25-vs2.3.2.3/include/linux/magic.h
+--- linux-3.0.25/include/linux/magic.h 2011-05-22 16:17:55.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/magic.h 2011-06-10 22:11:24.000000000 +0200
@@ -3,7 +3,7 @@
#define ADFS_SUPER_MAGIC 0xadf5
#define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */
#define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */
-diff -NurpP --minimal linux-3.0.21/include/linux/major.h linux-3.0.21-vs2.3.2.3/include/linux/major.h
---- linux-3.0.21/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/major.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/major.h linux-3.0.25-vs2.3.2.3/include/linux/major.h
+--- linux-3.0.25/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/major.h 2011-06-10 22:11:24.000000000 +0200
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-3.0.21/include/linux/memcontrol.h linux-3.0.21-vs2.3.2.3/include/linux/memcontrol.h
---- linux-3.0.21/include/linux/memcontrol.h 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/memcontrol.h 2012-01-26 08:39:53.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/include/linux/memcontrol.h linux-3.0.25-vs2.3.2.3/include/linux/memcontrol.h
+--- linux-3.0.25/include/linux/memcontrol.h 2012-03-19 21:16:55.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/memcontrol.h 2012-01-26 08:39:53.000000000 +0100
@@ -86,6 +86,13 @@ extern struct mem_cgroup *try_get_mem_cg
extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
extern struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm);
static inline
int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
{
-diff -NurpP --minimal linux-3.0.21/include/linux/mm_types.h linux-3.0.21-vs2.3.2.3/include/linux/mm_types.h
---- linux-3.0.21/include/linux/mm_types.h 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/mm_types.h 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/include/linux/mm_types.h linux-3.0.25-vs2.3.2.3/include/linux/mm_types.h
+--- linux-3.0.25/include/linux/mm_types.h 2012-03-19 21:16:55.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/mm_types.h 2011-11-15 17:37:07.000000000 +0100
@@ -282,6 +282,7 @@ struct mm_struct {
/* Architecture-specific MM context */
/* Swap token stuff */
/*
-diff -NurpP --minimal linux-3.0.21/include/linux/mmzone.h linux-3.0.21-vs2.3.2.3/include/linux/mmzone.h
---- linux-3.0.21/include/linux/mmzone.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/mmzone.h 2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/mmzone.h linux-3.0.25-vs2.3.2.3/include/linux/mmzone.h
+--- linux-3.0.25/include/linux/mmzone.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/mmzone.h 2011-07-01 11:35:35.000000000 +0200
@@ -654,6 +654,13 @@ typedef struct pglist_data {
__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
})
#include <linux/memory_hotplug.h>
extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.0.21/include/linux/mount.h linux-3.0.21-vs2.3.2.3/include/linux/mount.h
---- linux-3.0.21/include/linux/mount.h 2011-03-15 18:07:39.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/mount.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/mount.h linux-3.0.25-vs2.3.2.3/include/linux/mount.h
+--- linux-3.0.25/include/linux/mount.h 2011-03-15 18:07:39.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/mount.h 2011-06-10 22:11:24.000000000 +0200
@@ -52,6 +52,9 @@ struct mnt_pcp {
int mnt_writers;
};
};
struct file; /* forward dec */
-diff -NurpP --minimal linux-3.0.21/include/linux/net.h linux-3.0.21-vs2.3.2.3/include/linux/net.h
---- linux-3.0.21/include/linux/net.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/net.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/net.h linux-3.0.25-vs2.3.2.3/include/linux/net.h
+--- linux-3.0.25/include/linux/net.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/net.h 2011-06-10 22:11:24.000000000 +0200
@@ -72,6 +72,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.0.21/include/linux/netdevice.h linux-3.0.21-vs2.3.2.3/include/linux/netdevice.h
---- linux-3.0.21/include/linux/netdevice.h 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/netdevice.h 2011-09-17 19:22:49.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/netdevice.h linux-3.0.25-vs2.3.2.3/include/linux/netdevice.h
+--- linux-3.0.25/include/linux/netdevice.h 2012-03-19 21:16:55.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/netdevice.h 2011-09-17 19:22:49.000000000 +0200
@@ -1650,6 +1650,7 @@ extern void netdev_resync_ops(struct ne
extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
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.0.21/include/linux/nfs_mount.h linux-3.0.21-vs2.3.2.3/include/linux/nfs_mount.h
---- linux-3.0.21/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/nfs_mount.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/nfs_mount.h linux-3.0.25-vs2.3.2.3/include/linux/nfs_mount.h
+--- linux-3.0.25/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/nfs_mount.h 2011-06-10 22:11:24.000000000 +0200
@@ -63,7 +63,8 @@ struct nfs_mount_data {
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-3.0.21/include/linux/nsproxy.h linux-3.0.21-vs2.3.2.3/include/linux/nsproxy.h
---- linux-3.0.21/include/linux/nsproxy.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/nsproxy.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/nsproxy.h linux-3.0.25-vs2.3.2.3/include/linux/nsproxy.h
+--- linux-3.0.25/include/linux/nsproxy.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/nsproxy.h 2011-06-10 22:11:24.000000000 +0200
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
}
#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/pid.h linux-3.0.21-vs2.3.2.3/include/linux/pid.h
---- linux-3.0.21/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/pid.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/pid.h linux-3.0.25-vs2.3.2.3/include/linux/pid.h
+--- linux-3.0.25/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/pid.h 2011-06-10 22:11:24.000000000 +0200
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-3.0.21/include/linux/proc_fs.h linux-3.0.21-vs2.3.2.3/include/linux/proc_fs.h
---- linux-3.0.21/include/linux/proc_fs.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/proc_fs.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/proc_fs.h linux-3.0.25-vs2.3.2.3/include/linux/proc_fs.h
+--- linux-3.0.25/include/linux/proc_fs.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/proc_fs.h 2011-06-10 22:11:24.000000000 +0200
@@ -56,6 +56,7 @@ struct proc_dir_entry {
nlink_t nlink;
uid_t uid;
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-3.0.21/include/linux/quotaops.h linux-3.0.21-vs2.3.2.3/include/linux/quotaops.h
---- linux-3.0.21/include/linux/quotaops.h 2011-05-22 16:17:57.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/quotaops.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/quotaops.h linux-3.0.25-vs2.3.2.3/include/linux/quotaops.h
+--- linux-3.0.25/include/linux/quotaops.h 2011-05-22 16:17:57.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/quotaops.h 2011-06-10 22:11:24.000000000 +0200
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.0.21/include/linux/reboot.h linux-3.0.21-vs2.3.2.3/include/linux/reboot.h
---- linux-3.0.21/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/reboot.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/reboot.h linux-3.0.25-vs2.3.2.3/include/linux/reboot.h
+--- linux-3.0.25/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/reboot.h 2011-06-10 22:11:24.000000000 +0200
@@ -33,6 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
#ifdef __KERNEL__
-diff -NurpP --minimal linux-3.0.21/include/linux/reiserfs_fs.h linux-3.0.21-vs2.3.2.3/include/linux/reiserfs_fs.h
---- linux-3.0.21/include/linux/reiserfs_fs.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/reiserfs_fs.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/reiserfs_fs.h linux-3.0.25-vs2.3.2.3/include/linux/reiserfs_fs.h
+--- linux-3.0.25/include/linux/reiserfs_fs.h 2011-05-22 16:17:58.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/reiserfs_fs.h 2011-06-10 22:11:24.000000000 +0200
@@ -976,6 +976,11 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL FS_COMPR_FL
#define REISERFS_NOTAIL_FL FS_NOTAIL_FL
int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
-diff -NurpP --minimal linux-3.0.21/include/linux/reiserfs_fs_sb.h linux-3.0.21-vs2.3.2.3/include/linux/reiserfs_fs_sb.h
---- linux-3.0.21/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/reiserfs_fs_sb.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/reiserfs_fs_sb.h linux-3.0.25-vs2.3.2.3/include/linux/reiserfs_fs_sb.h
+--- linux-3.0.25/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/reiserfs_fs_sb.h 2011-06-10 22:11:24.000000000 +0200
@@ -476,6 +476,7 @@ enum reiserfs_mount_options {
REISERFS_EXPOSE_PRIVROOT,
REISERFS_BARRIER_NONE,
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-3.0.21/include/linux/sched.h linux-3.0.21-vs2.3.2.3/include/linux/sched.h
---- linux-3.0.21/include/linux/sched.h 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/sched.h 2011-10-18 13:51:13.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/sched.h linux-3.0.25-vs2.3.2.3/include/linux/sched.h
+--- linux-3.0.25/include/linux/sched.h 2012-03-19 21:16:55.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/sched.h 2011-10-18 13:51:13.000000000 +0200
@@ -1406,6 +1406,14 @@ struct task_struct {
#endif
seccomp_t seccomp;
}
-diff -NurpP --minimal linux-3.0.21/include/linux/shmem_fs.h linux-3.0.21-vs2.3.2.3/include/linux/shmem_fs.h
---- linux-3.0.21/include/linux/shmem_fs.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/shmem_fs.h 2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/shmem_fs.h linux-3.0.25-vs2.3.2.3/include/linux/shmem_fs.h
+--- linux-3.0.25/include/linux/shmem_fs.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/shmem_fs.h 2011-07-01 11:35:35.000000000 +0200
@@ -12,6 +12,9 @@
#define SHMEM_SYMLINK_INLINE_LEN (SHMEM_NR_DIRECT * sizeof(swp_entry_t))
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.0.21/include/linux/stat.h linux-3.0.21-vs2.3.2.3/include/linux/stat.h
---- linux-3.0.21/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/stat.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/stat.h linux-3.0.25-vs2.3.2.3/include/linux/stat.h
+--- linux-3.0.25/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/stat.h 2011-06-10 22:11:24.000000000 +0200
@@ -66,6 +66,7 @@ struct kstat {
unsigned int nlink;
uid_t uid;
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.0.21/include/linux/sunrpc/auth.h linux-3.0.21-vs2.3.2.3/include/linux/sunrpc/auth.h
---- linux-3.0.21/include/linux/sunrpc/auth.h 2011-03-15 18:07:39.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/sunrpc/auth.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/sunrpc/auth.h linux-3.0.25-vs2.3.2.3/include/linux/sunrpc/auth.h
+--- linux-3.0.25/include/linux/sunrpc/auth.h 2011-03-15 18:07:39.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/sunrpc/auth.h 2011-06-10 22:11:24.000000000 +0200
@@ -25,6 +25,7 @@
struct auth_cred {
uid_t uid;
struct group_info *group_info;
unsigned char machine_cred : 1;
};
-diff -NurpP --minimal linux-3.0.21/include/linux/sunrpc/clnt.h linux-3.0.21-vs2.3.2.3/include/linux/sunrpc/clnt.h
---- linux-3.0.21/include/linux/sunrpc/clnt.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/sunrpc/clnt.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/sunrpc/clnt.h linux-3.0.25-vs2.3.2.3/include/linux/sunrpc/clnt.h
+--- linux-3.0.25/include/linux/sunrpc/clnt.h 2011-05-22 16:17:58.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/sunrpc/clnt.h 2011-06-10 22:11:24.000000000 +0200
@@ -49,7 +49,8 @@ struct rpc_clnt {
unsigned int cl_softrtry : 1,/* soft timeouts */
cl_discrtry : 1,/* disconnect before retry */
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.0.21/include/linux/syscalls.h linux-3.0.21-vs2.3.2.3/include/linux/syscalls.h
---- linux-3.0.21/include/linux/syscalls.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/syscalls.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/syscalls.h linux-3.0.25-vs2.3.2.3/include/linux/syscalls.h
+--- linux-3.0.25/include/linux/syscalls.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/syscalls.h 2011-06-10 22:11:24.000000000 +0200
@@ -483,6 +483,8 @@ asmlinkage long sys_symlink(const char _
asmlinkage long sys_unlink(const char __user *pathname);
asmlinkage long sys_rename(const char __user *oldname,
asmlinkage long sys_chmod(const char __user *filename, mode_t mode);
asmlinkage long sys_fchmod(unsigned int fd, mode_t mode);
-diff -NurpP --minimal linux-3.0.21/include/linux/sysctl.h linux-3.0.21-vs2.3.2.3/include/linux/sysctl.h
---- linux-3.0.21/include/linux/sysctl.h 2011-03-15 18:07:40.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/sysctl.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/sysctl.h linux-3.0.25-vs2.3.2.3/include/linux/sysctl.h
+--- linux-3.0.25/include/linux/sysctl.h 2011-03-15 18:07:40.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/sysctl.h 2011-06-10 22:11:24.000000000 +0200
@@ -60,6 +60,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-3.0.21/include/linux/sysfs.h linux-3.0.21-vs2.3.2.3/include/linux/sysfs.h
---- linux-3.0.21/include/linux/sysfs.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/sysfs.h 2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/sysfs.h linux-3.0.25-vs2.3.2.3/include/linux/sysfs.h
+--- linux-3.0.25/include/linux/sysfs.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/sysfs.h 2011-06-22 12:39:15.000000000 +0200
@@ -19,6 +19,8 @@
#include <linux/kobject_ns.h>
#include <asm/atomic.h>
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-3.0.21/include/linux/time.h linux-3.0.21-vs2.3.2.3/include/linux/time.h
---- linux-3.0.21/include/linux/time.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/time.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/time.h linux-3.0.25-vs2.3.2.3/include/linux/time.h
+--- linux-3.0.25/include/linux/time.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/time.h 2011-06-10 22:11:24.000000000 +0200
@@ -256,6 +256,9 @@ static __always_inline void timespec_add
a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns);
a->tv_nsec = ns;
#endif /* __KERNEL__ */
#define NFDBITS __NFDBITS
-diff -NurpP --minimal linux-3.0.21/include/linux/types.h linux-3.0.21-vs2.3.2.3/include/linux/types.h
---- linux-3.0.21/include/linux/types.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/types.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/types.h linux-3.0.25-vs2.3.2.3/include/linux/types.h
+--- linux-3.0.25/include/linux/types.h 2011-05-22 16:17:58.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/types.h 2011-06-10 22:11:24.000000000 +0200
@@ -40,6 +40,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.0.21/include/linux/utsname.h linux-3.0.21-vs2.3.2.3/include/linux/utsname.h
---- linux-3.0.21/include/linux/utsname.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/linux/utsname.h 2011-06-13 14:36:48.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/utsname.h linux-3.0.25-vs2.3.2.3/include/linux/utsname.h
+--- linux-3.0.25/include/linux/utsname.h 2011-05-22 16:17:58.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/linux/utsname.h 2011-06-13 14:36:48.000000000 +0200
@@ -54,7 +54,8 @@ static inline void get_uts_ns(struct uts
}
}
#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vroot.h linux-3.0.21-vs2.3.2.3/include/linux/vroot.h
---- linux-3.0.21/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vroot.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vroot.h linux-3.0.25-vs2.3.2.3/include/linux/vroot.h
+--- linux-3.0.25/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vroot.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,51 @@
+
+/*
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_base.h linux-3.0.21-vs2.3.2.3/include/linux/vs_base.h
---- linux-3.0.21/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_base.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_base.h linux-3.0.25-vs2.3.2.3/include/linux/vs_base.h
+--- linux-3.0.25/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_base.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_context.h linux-3.0.21-vs2.3.2.3/include/linux/vs_context.h
---- linux-3.0.21/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_context.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_context.h linux-3.0.25-vs2.3.2.3/include/linux/vs_context.h
+--- linux-3.0.25/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_context.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_cowbl.h linux-3.0.21-vs2.3.2.3/include/linux/vs_cowbl.h
---- linux-3.0.21/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_cowbl.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_cowbl.h linux-3.0.25-vs2.3.2.3/include/linux/vs_cowbl.h
+--- linux-3.0.25/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_cowbl.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_cvirt.h linux-3.0.21-vs2.3.2.3/include/linux/vs_cvirt.h
---- linux-3.0.21/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_cvirt.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_cvirt.h linux-3.0.25-vs2.3.2.3/include/linux/vs_cvirt.h
+--- linux-3.0.25/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_cvirt.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_device.h linux-3.0.21-vs2.3.2.3/include/linux/vs_device.h
---- linux-3.0.21/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_device.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_device.h linux-3.0.25-vs2.3.2.3/include/linux/vs_device.h
+--- linux-3.0.25/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_device.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_dlimit.h linux-3.0.21-vs2.3.2.3/include/linux/vs_dlimit.h
---- linux-3.0.21/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_dlimit.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_dlimit.h linux-3.0.25-vs2.3.2.3/include/linux/vs_dlimit.h
+--- linux-3.0.25/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_dlimit.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_inet.h linux-3.0.21-vs2.3.2.3/include/linux/vs_inet.h
---- linux-3.0.21/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_inet.h 2011-08-18 17:01:00.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_inet.h linux-3.0.25-vs2.3.2.3/include/linux/vs_inet.h
+--- linux-3.0.25/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_inet.h 2011-08-18 17:01:00.000000000 +0200
@@ -0,0 +1,353 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_inet6.h linux-3.0.21-vs2.3.2.3/include/linux/vs_inet6.h
---- linux-3.0.21/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_inet6.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_inet6.h linux-3.0.25-vs2.3.2.3/include/linux/vs_inet6.h
+--- linux-3.0.25/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_inet6.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,246 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_limit.h linux-3.0.21-vs2.3.2.3/include/linux/vs_limit.h
---- linux-3.0.21/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_limit.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_limit.h linux-3.0.25-vs2.3.2.3/include/linux/vs_limit.h
+--- linux-3.0.25/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_limit.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_memory.h linux-3.0.21-vs2.3.2.3/include/linux/vs_memory.h
---- linux-3.0.21/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_memory.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_memory.h linux-3.0.25-vs2.3.2.3/include/linux/vs_memory.h
+--- linux-3.0.25/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_memory.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,58 @@
+#ifndef _VS_MEMORY_H
+#define _VS_MEMORY_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_network.h linux-3.0.21-vs2.3.2.3/include/linux/vs_network.h
---- linux-3.0.21/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_network.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_network.h linux-3.0.25-vs2.3.2.3/include/linux/vs_network.h
+--- linux-3.0.25/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_network.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_pid.h linux-3.0.21-vs2.3.2.3/include/linux/vs_pid.h
---- linux-3.0.21/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_pid.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_pid.h linux-3.0.25-vs2.3.2.3/include/linux/vs_pid.h
+--- linux-3.0.25/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_pid.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_sched.h linux-3.0.21-vs2.3.2.3/include/linux/vs_sched.h
---- linux-3.0.21/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_sched.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_sched.h linux-3.0.25-vs2.3.2.3/include/linux/vs_sched.h
+--- linux-3.0.25/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_sched.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_socket.h linux-3.0.21-vs2.3.2.3/include/linux/vs_socket.h
---- linux-3.0.21/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_socket.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_socket.h linux-3.0.25-vs2.3.2.3/include/linux/vs_socket.h
+--- linux-3.0.25/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_socket.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_tag.h linux-3.0.21-vs2.3.2.3/include/linux/vs_tag.h
---- linux-3.0.21/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_tag.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_tag.h linux-3.0.25-vs2.3.2.3/include/linux/vs_tag.h
+--- linux-3.0.25/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_tag.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vs_time.h linux-3.0.21-vs2.3.2.3/include/linux/vs_time.h
---- linux-3.0.21/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vs_time.h 2011-06-13 14:57:45.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vs_time.h linux-3.0.25-vs2.3.2.3/include/linux/vs_time.h
+--- linux-3.0.25/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vs_time.h 2011-06-13 14:57:45.000000000 +0200
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/Kbuild linux-3.0.21-vs2.3.2.3/include/linux/vserver/Kbuild
---- linux-3.0.21/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/Kbuild 2011-08-08 18:02:46.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/Kbuild linux-3.0.25-vs2.3.2.3/include/linux/vserver/Kbuild
+--- linux-3.0.25/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/Kbuild 2011-08-08 18:02:46.000000000 +0200
@@ -0,0 +1,8 @@
+
+header-y += context_cmd.h network_cmd.h space_cmd.h \
+
+header-y += switch.h network.h monitor.h inode.h device.h
+
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/base.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/base.h
---- linux-3.0.21/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/base.h 2011-08-01 18:26:07.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/base.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/base.h
+--- linux-3.0.25/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/base.h 2011-08-01 18:26:07.000000000 +0200
@@ -0,0 +1,178 @@
+#ifndef _VX_BASE_H
+#define _VX_BASE_H
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/cacct.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/cacct.h
---- linux-3.0.21/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/cacct.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/cacct.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/cacct.h
+--- linux-3.0.25/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/cacct.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef _VX_CACCT_H
+#define _VX_CACCT_H
+};
+
+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/cacct_cmd.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/cacct_cmd.h
---- linux-3.0.21/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/cacct_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/cacct_cmd.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/cacct_cmd.h
+--- linux-3.0.25/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/cacct_cmd.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,23 @@
+#ifndef _VX_CACCT_CMD_H
+#define _VX_CACCT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/cacct_def.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/cacct_def.h
---- linux-3.0.21/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/cacct_def.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/cacct_def.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/cacct_def.h
+--- linux-3.0.25/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/cacct_def.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,43 @@
+#ifndef _VX_CACCT_DEF_H
+#define _VX_CACCT_DEF_H
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/cacct_int.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/cacct_int.h
---- linux-3.0.21/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/cacct_int.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/cacct_int.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/cacct_int.h
+--- linux-3.0.25/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/cacct_int.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef _VX_CACCT_INT_H
+#define _VX_CACCT_INT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/check.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/check.h
---- linux-3.0.21/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/check.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/check.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/check.h
+--- linux-3.0.25/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/check.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,89 @@
+#ifndef _VS_CHECK_H
+#define _VS_CHECK_H
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/context.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/context.h
---- linux-3.0.21/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/context.h 2011-10-27 13:59:29.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/context.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/context.h
+--- linux-3.0.25/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/context.h 2011-10-27 13:59:29.000000000 +0200
@@ -0,0 +1,188 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/context_cmd.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/context_cmd.h
---- linux-3.0.21/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/context_cmd.h 2011-08-01 18:25:07.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/context_cmd.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/context_cmd.h
+--- linux-3.0.25/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/context_cmd.h 2011-08-01 18:25:07.000000000 +0200
@@ -0,0 +1,162 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/cvirt.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/cvirt.h
---- linux-3.0.21/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/cvirt.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/cvirt.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/cvirt.h
+--- linux-3.0.25/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/cvirt.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,20 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/cvirt_cmd.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/cvirt_cmd.h
---- linux-3.0.21/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/cvirt_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/cvirt_cmd.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/cvirt_cmd.h
+--- linux-3.0.25/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/cvirt_cmd.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_CVIRT_CMD_H
+#define _VX_CVIRT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/cvirt_def.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/cvirt_def.h
---- linux-3.0.21/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/cvirt_def.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/cvirt_def.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/cvirt_def.h
+--- linux-3.0.25/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/cvirt_def.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,80 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/debug.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/debug.h
---- linux-3.0.21/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/debug.h 2011-11-17 21:25:04.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/debug.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/debug.h
+--- linux-3.0.25/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/debug.h 2011-11-17 21:25:04.000000000 +0100
@@ -0,0 +1,145 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/debug_cmd.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/debug_cmd.h
---- linux-3.0.21/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/debug_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/debug_cmd.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/debug_cmd.h
+--- linux-3.0.25/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/debug_cmd.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,58 @@
+#ifndef _VX_DEBUG_CMD_H
+#define _VX_DEBUG_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/device.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/device.h
---- linux-3.0.21/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/device.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/device.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/device.h
+--- linux-3.0.25/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/device.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef _VX_DEVICE_H
+#define _VX_DEVICE_H
+#else /* _VX_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/device_cmd.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/device_cmd.h
---- linux-3.0.21/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/device_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/device_cmd.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/device_cmd.h
+--- linux-3.0.25/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/device_cmd.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,44 @@
+#ifndef _VX_DEVICE_CMD_H
+#define _VX_DEVICE_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/device_def.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/device_def.h
---- linux-3.0.21/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/device_def.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/device_def.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/device_def.h
+--- linux-3.0.25/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/device_def.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,17 @@
+#ifndef _VX_DEVICE_DEF_H
+#define _VX_DEVICE_DEF_H
+};
+
+#endif /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/dlimit.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/dlimit.h
---- linux-3.0.21/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/dlimit.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/dlimit.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/dlimit.h
+--- linux-3.0.25/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/dlimit.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,54 @@
+#ifndef _VX_DLIMIT_H
+#define _VX_DLIMIT_H
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/dlimit_cmd.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/dlimit_cmd.h
---- linux-3.0.21/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/dlimit_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/dlimit_cmd.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/dlimit_cmd.h
+--- linux-3.0.25/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/dlimit_cmd.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,109 @@
+#ifndef _VX_DLIMIT_CMD_H
+#define _VX_DLIMIT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/global.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/global.h
---- linux-3.0.21/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/global.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/global.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/global.h
+--- linux-3.0.25/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/global.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,19 @@
+#ifndef _VX_GLOBAL_H
+#define _VX_GLOBAL_H
+
+
+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/history.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/history.h
---- linux-3.0.21/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/history.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/history.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/history.h
+--- linux-3.0.25/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/history.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,197 @@
+#ifndef _VX_HISTORY_H
+#define _VX_HISTORY_H
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/inode.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/inode.h
---- linux-3.0.21/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/inode.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/inode.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/inode.h
+--- linux-3.0.25/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/inode.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,39 @@
+#ifndef _VX_INODE_H
+#define _VX_INODE_H
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/inode_cmd.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/inode_cmd.h
---- linux-3.0.21/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/inode_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/inode_cmd.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/inode_cmd.h
+--- linux-3.0.25/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/inode_cmd.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,59 @@
+#ifndef _VX_INODE_CMD_H
+#define _VX_INODE_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/limit.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/limit.h
---- linux-3.0.21/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/limit.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/limit.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/limit.h
+--- linux-3.0.25/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/limit.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,71 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/limit_cmd.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/limit_cmd.h
---- linux-3.0.21/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/limit_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/limit_cmd.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/limit_cmd.h
+--- linux-3.0.25/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/limit_cmd.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,71 @@
+#ifndef _VX_LIMIT_CMD_H
+#define _VX_LIMIT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/limit_def.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/limit_def.h
---- linux-3.0.21/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/limit_def.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/limit_def.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/limit_def.h
+--- linux-3.0.25/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/limit_def.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,47 @@
+#ifndef _VX_LIMIT_DEF_H
+#define _VX_LIMIT_DEF_H
+#endif
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/limit_int.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/limit_int.h
---- linux-3.0.21/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/limit_int.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/limit_int.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/limit_int.h
+--- linux-3.0.25/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/limit_int.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,198 @@
+#ifndef _VX_LIMIT_INT_H
+#define _VX_LIMIT_INT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/monitor.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/monitor.h
---- linux-3.0.21/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/monitor.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/monitor.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/monitor.h
+--- linux-3.0.25/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/monitor.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,96 @@
+#ifndef _VX_MONITOR_H
+#define _VX_MONITOR_H
+
+
+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/network.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/network.h
---- linux-3.0.21/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/network.h 2011-08-18 16:30:48.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/network.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/network.h
+--- linux-3.0.25/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/network.h 2011-08-18 16:30:48.000000000 +0200
@@ -0,0 +1,148 @@
+#ifndef _VX_NETWORK_H
+#define _VX_NETWORK_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/network_cmd.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/network_cmd.h
---- linux-3.0.21/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/network_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/network_cmd.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/network_cmd.h
+--- linux-3.0.25/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/network_cmd.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,164 @@
+#ifndef _VX_NETWORK_CMD_H
+#define _VX_NETWORK_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/percpu.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/percpu.h
---- linux-3.0.21/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/percpu.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/percpu.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/percpu.h
+--- linux-3.0.25/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/percpu.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,14 @@
+#ifndef _VX_PERCPU_H
+#define _VX_PERCPU_H
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VX_PERCPU_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/pid.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/pid.h
---- linux-3.0.21/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/pid.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/pid.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/pid.h
+--- linux-3.0.25/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/pid.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
+}
+
+#endif
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/sched.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/sched.h
---- linux-3.0.21/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/sched.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/sched.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/sched.h
+--- linux-3.0.25/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/sched.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,23 @@
+#ifndef _VX_SCHED_H
+#define _VX_SCHED_H
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/sched_cmd.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/sched_cmd.h
---- linux-3.0.21/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/sched_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/sched_cmd.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/sched_cmd.h
+--- linux-3.0.25/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/sched_cmd.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef _VX_SCHED_CMD_H
+#define _VX_SCHED_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/sched_def.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/sched_def.h
---- linux-3.0.21/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/sched_def.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/sched_def.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/sched_def.h
+--- linux-3.0.25/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/sched_def.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,38 @@
+#ifndef _VX_SCHED_DEF_H
+#define _VX_SCHED_DEF_H
+#endif
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/signal.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/signal.h
---- linux-3.0.21/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/signal.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/signal.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/signal.h
+--- linux-3.0.25/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/signal.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,14 @@
+#ifndef _VX_SIGNAL_H
+#define _VX_SIGNAL_H
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/signal_cmd.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/signal_cmd.h
---- linux-3.0.21/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/signal_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/signal_cmd.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/signal_cmd.h
+--- linux-3.0.25/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/signal_cmd.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,43 @@
+#ifndef _VX_SIGNAL_CMD_H
+#define _VX_SIGNAL_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/space.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/space.h
---- linux-3.0.21/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/space.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/space.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/space.h
+--- linux-3.0.25/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/space.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,12 @@
+#ifndef _VX_SPACE_H
+#define _VX_SPACE_H
+#else /* _VX_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_SPACE_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/space_cmd.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/space_cmd.h
---- linux-3.0.21/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/space_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/space_cmd.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/space_cmd.h
+--- linux-3.0.25/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/space_cmd.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,38 @@
+#ifndef _VX_SPACE_CMD_H
+#define _VX_SPACE_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/switch.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/switch.h
---- linux-3.0.21/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/switch.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/switch.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/switch.h
+--- linux-3.0.25/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/switch.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,98 @@
+#ifndef _VX_SWITCH_H
+#define _VX_SWITCH_H
+
+#endif /* _VX_SWITCH_H */
+
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/tag.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/tag.h
---- linux-3.0.21/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/tag.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/tag.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/tag.h
+--- linux-3.0.25/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/tag.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,143 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.0.21/include/linux/vserver/tag_cmd.h linux-3.0.21-vs2.3.2.3/include/linux/vserver/tag_cmd.h
---- linux-3.0.21/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/linux/vserver/tag_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/linux/vserver/tag_cmd.h linux-3.0.25-vs2.3.2.3/include/linux/vserver/tag_cmd.h
+--- linux-3.0.25/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/linux/vserver/tag_cmd.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,22 @@
+#ifndef _VX_TAG_CMD_H
+#define _VX_TAG_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-3.0.21/include/net/addrconf.h linux-3.0.21-vs2.3.2.3/include/net/addrconf.h
---- linux-3.0.21/include/net/addrconf.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/net/addrconf.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/net/addrconf.h linux-3.0.25-vs2.3.2.3/include/net/addrconf.h
+--- linux-3.0.25/include/net/addrconf.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/net/addrconf.h 2011-06-10 22:11:24.000000000 +0200
@@ -80,7 +80,8 @@ extern int ipv6_dev_get_saddr(struct n
struct net_device *dev,
const struct in6_addr *daddr,
extern int ipv6_get_lladdr(struct net_device *dev,
struct in6_addr *addr,
unsigned char banned_flags);
-diff -NurpP --minimal linux-3.0.21/include/net/af_unix.h linux-3.0.21-vs2.3.2.3/include/net/af_unix.h
---- linux-3.0.21/include/net/af_unix.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/net/af_unix.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/net/af_unix.h linux-3.0.25-vs2.3.2.3/include/net/af_unix.h
+--- linux-3.0.25/include/net/af_unix.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/net/af_unix.h 2011-06-10 22:11:24.000000000 +0200
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
#include <net/sock.h>
extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.0.21/include/net/inet_timewait_sock.h linux-3.0.21-vs2.3.2.3/include/net/inet_timewait_sock.h
---- linux-3.0.21/include/net/inet_timewait_sock.h 2011-03-15 18:07:40.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/include/net/inet_timewait_sock.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/net/inet_timewait_sock.h linux-3.0.25-vs2.3.2.3/include/net/inet_timewait_sock.h
+--- linux-3.0.25/include/net/inet_timewait_sock.h 2011-03-15 18:07:40.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/net/inet_timewait_sock.h 2011-06-10 22:11:24.000000000 +0200
@@ -113,6 +113,10 @@ struct inet_timewait_sock {
#define tw_net __tw_common.skc_net
#define tw_daddr __tw_common.skc_daddr
int tw_timeout;
volatile unsigned char tw_substate;
unsigned char tw_rcv_wscale;
-diff -NurpP --minimal linux-3.0.21/include/net/ip6_route.h linux-3.0.21-vs2.3.2.3/include/net/ip6_route.h
---- linux-3.0.21/include/net/ip6_route.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/net/ip6_route.h 2011-06-16 14:16:51.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/net/ip6_route.h linux-3.0.25-vs2.3.2.3/include/net/ip6_route.h
+--- linux-3.0.25/include/net/ip6_route.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/net/ip6_route.h 2011-06-16 14:16:51.000000000 +0200
@@ -86,7 +86,8 @@ extern int ip6_route_get_saddr(struct
struct rt6_info *rt,
const struct in6_addr *daddr,
extern struct rt6_info *rt6_lookup(struct net *net,
const struct in6_addr *daddr,
-diff -NurpP --minimal linux-3.0.21/include/net/route.h linux-3.0.21-vs2.3.2.3/include/net/route.h
---- linux-3.0.21/include/net/route.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/net/route.h 2011-07-27 19:42:59.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/net/route.h linux-3.0.25-vs2.3.2.3/include/net/route.h
+--- linux-3.0.25/include/net/route.h 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/include/net/route.h 2012-03-01 21:51:50.000000000 +0100
@@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->dst);
}
rt = __ip_route_output_key(net, fl4);
if (IS_ERR(rt))
return rt;
-diff -NurpP --minimal linux-3.0.21/include/net/sock.h linux-3.0.21-vs2.3.2.3/include/net/sock.h
---- linux-3.0.21/include/net/sock.h 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/include/net/sock.h 2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/include/net/sock.h linux-3.0.25-vs2.3.2.3/include/net/sock.h
+--- linux-3.0.25/include/net/sock.h 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/include/net/sock.h 2011-07-01 11:35:35.000000000 +0200
@@ -149,6 +149,10 @@ struct sock_common {
#ifdef CONFIG_NET_NS
struct net *skc_net;
socket_lock_t sk_lock;
struct sk_buff_head sk_receive_queue;
/*
-diff -NurpP --minimal linux-3.0.21/init/Kconfig linux-3.0.21-vs2.3.2.3/init/Kconfig
---- linux-3.0.21/init/Kconfig 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/init/Kconfig 2011-08-08 18:08:57.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/init/Kconfig linux-3.0.25-vs2.3.2.3/init/Kconfig
+--- linux-3.0.25/init/Kconfig 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/init/Kconfig 2011-08-08 18:08:57.000000000 +0200
@@ -574,6 +574,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
menuconfig CGROUPS
boolean "Control Group support"
default y
help
This allows containers, i.e. vservers, to use user namespaces
-diff -NurpP --minimal linux-3.0.21/init/main.c linux-3.0.21-vs2.3.2.3/init/main.c
---- linux-3.0.21/init/main.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/init/main.c 2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/init/main.c linux-3.0.25-vs2.3.2.3/init/main.c
+--- linux-3.0.25/init/main.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/init/main.c 2011-06-22 12:39:15.000000000 +0200
@@ -68,6 +68,7 @@
#include <linux/shmem_fs.h>
#include <linux/slab.h>
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-3.0.21/ipc/mqueue.c linux-3.0.21-vs2.3.2.3/ipc/mqueue.c
---- linux-3.0.21/ipc/mqueue.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/ipc/mqueue.c 2011-10-18 14:03:46.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/ipc/mqueue.c linux-3.0.25-vs2.3.2.3/ipc/mqueue.c
+--- linux-3.0.25/ipc/mqueue.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/ipc/mqueue.c 2011-10-18 14:03:46.000000000 +0200
@@ -33,6 +33,8 @@
#include <linux/pid.h>
#include <linux/ipc_namespace.h>
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-3.0.21/ipc/msg.c linux-3.0.21-vs2.3.2.3/ipc/msg.c
---- linux-3.0.21/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/ipc/msg.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/ipc/msg.c linux-3.0.25-vs2.3.2.3/ipc/msg.c
+--- linux-3.0.25/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/ipc/msg.c 2011-06-10 22:11:24.000000000 +0200
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.0.21/ipc/namespace.c linux-3.0.21-vs2.3.2.3/ipc/namespace.c
---- linux-3.0.21/ipc/namespace.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/ipc/namespace.c 2011-06-13 14:09:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/ipc/namespace.c linux-3.0.25-vs2.3.2.3/ipc/namespace.c
+--- linux-3.0.25/ipc/namespace.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/ipc/namespace.c 2011-06-13 14:09:44.000000000 +0200
@@ -13,11 +13,12 @@
#include <linux/mount.h>
#include <linux/user_namespace.h>
}
/*
-diff -NurpP --minimal linux-3.0.21/ipc/sem.c linux-3.0.21-vs2.3.2.3/ipc/sem.c
---- linux-3.0.21/ipc/sem.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/ipc/sem.c 2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/ipc/sem.c linux-3.0.25-vs2.3.2.3/ipc/sem.c
+--- linux-3.0.25/ipc/sem.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/ipc/sem.c 2011-08-08 23:04:47.000000000 +0200
@@ -86,6 +86,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
security_sem_free(sma);
ipc_rcu_putref(sma);
}
-diff -NurpP --minimal linux-3.0.21/ipc/shm.c linux-3.0.21-vs2.3.2.3/ipc/shm.c
---- linux-3.0.21/ipc/shm.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/ipc/shm.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/ipc/shm.c linux-3.0.25-vs2.3.2.3/ipc/shm.c
+--- linux-3.0.25/ipc/shm.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/ipc/shm.c 2011-06-10 22:11:24.000000000 +0200
@@ -39,6 +39,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
return error;
no_id:
-diff -NurpP --minimal linux-3.0.21/kernel/Makefile linux-3.0.21-vs2.3.2.3/kernel/Makefile
---- linux-3.0.21/kernel/Makefile 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/Makefile 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/Makefile linux-3.0.25-vs2.3.2.3/kernel/Makefile
+--- linux-3.0.25/kernel/Makefile 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/Makefile 2011-06-10 22:11:24.000000000 +0200
@@ -24,6 +24,7 @@ CFLAGS_REMOVE_sched_clock.o = -pg
CFLAGS_REMOVE_irq_work.o = -pg
endif
obj-$(CONFIG_FREEZER) += freezer.o
obj-$(CONFIG_PROFILING) += profile.o
obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
-diff -NurpP --minimal linux-3.0.21/kernel/capability.c linux-3.0.21-vs2.3.2.3/kernel/capability.c
---- linux-3.0.21/kernel/capability.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/capability.c 2011-10-27 13:59:20.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/capability.c linux-3.0.25-vs2.3.2.3/kernel/capability.c
+--- linux-3.0.25/kernel/capability.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/capability.c 2011-10-27 13:59:20.000000000 +0200
@@ -15,6 +15,7 @@
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
/**
* capable - Determine if the current task has a superior capability in effect
* @cap: The capability to be tested for
-diff -NurpP --minimal linux-3.0.21/kernel/compat.c linux-3.0.21-vs2.3.2.3/kernel/compat.c
---- linux-3.0.21/kernel/compat.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/compat.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/compat.c linux-3.0.25-vs2.3.2.3/kernel/compat.c
+--- linux-3.0.25/kernel/compat.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/compat.c 2011-06-10 22:11:24.000000000 +0200
@@ -970,7 +970,7 @@ asmlinkage long compat_sys_stime(compat_
if (err)
return err;
return 0;
}
-diff -NurpP --minimal linux-3.0.21/kernel/cred.c linux-3.0.21-vs2.3.2.3/kernel/cred.c
---- linux-3.0.21/kernel/cred.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/cred.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/cred.c linux-3.0.25-vs2.3.2.3/kernel/cred.c
+--- linux-3.0.25/kernel/cred.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/cred.c 2011-06-10 22:11:24.000000000 +0200
@@ -61,31 +61,6 @@ struct cred init_cred = {
#endif
};
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-3.0.21/kernel/exit.c linux-3.0.21-vs2.3.2.3/kernel/exit.c
---- linux-3.0.21/kernel/exit.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/exit.c 2012-01-10 09:19:13.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/kernel/exit.c linux-3.0.25-vs2.3.2.3/kernel/exit.c
+--- linux-3.0.25/kernel/exit.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/exit.c 2012-01-10 09:19:13.000000000 +0100
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-3.0.21/kernel/fork.c linux-3.0.21-vs2.3.2.3/kernel/fork.c
---- linux-3.0.21/kernel/fork.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/fork.c 2011-06-10 22:21:02.000000000 +0200
-@@ -67,6 +67,10 @@
+diff -NurpP --minimal linux-3.0.25/kernel/fork.c linux-3.0.25-vs2.3.2.3/kernel/fork.c
+--- linux-3.0.25/kernel/fork.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/fork.c 2012-03-01 21:52:38.000000000 +0100
+@@ -68,6 +68,10 @@
#include <linux/oom.h>
#include <linux/khugepaged.h>
#include <linux/signalfd.h>
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
-@@ -167,6 +171,8 @@ void free_task(struct task_struct *tsk)
+@@ -168,6 +172,8 @@ void free_task(struct task_struct *tsk)
account_kernel_stack(tsk->stack, -1);
free_thread_info(tsk->stack);
rt_mutex_debug_task_free(tsk);
ftrace_graph_exit_task(tsk);
free_task_struct(tsk);
}
-@@ -505,6 +511,7 @@ static struct mm_struct * mm_init(struct
+@@ -506,6 +512,7 @@ static struct mm_struct * mm_init(struct
if (likely(!mm_alloc_pgd(mm))) {
mm->def_flags = 0;
mmu_notifier_mm_init(mm);
return mm;
}
-@@ -542,6 +549,7 @@ void __mmdrop(struct mm_struct *mm)
+@@ -543,6 +550,7 @@ void __mmdrop(struct mm_struct *mm)
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
VM_BUG_ON(mm->pmd_huge_pte);
#endif
free_mm(mm);
}
EXPORT_SYMBOL_GPL(__mmdrop);
-@@ -729,6 +737,7 @@ struct mm_struct *dup_mm(struct task_str
+@@ -730,6 +738,7 @@ struct mm_struct *dup_mm(struct task_str
goto fail_nomem;
memcpy(mm, oldmm, sizeof(*mm));
mm_init_cpumask(mm);
/* Initializing for Swap token stuff */
-@@ -772,6 +781,7 @@ fail_nocontext:
+@@ -773,6 +782,7 @@ fail_nocontext:
* If init_new_context() failed, we cannot use mmput() to free the mm
* because it calls destroy_context()
*/
mm_free_pgd(mm);
free_mm(mm);
return NULL;
-@@ -1057,6 +1067,8 @@ static struct task_struct *copy_process(
+@@ -1060,6 +1070,8 @@ static struct task_struct *copy_process(
int retval;
struct task_struct *p;
int cgroup_callbacks_done = 0;
if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
return ERR_PTR(-EINVAL);
-@@ -1103,7 +1115,12 @@ static struct task_struct *copy_process(
+@@ -1106,7 +1118,12 @@ static struct task_struct *copy_process(
DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
if (atomic_read(&p->real_cred->user->processes) >=
task_rlimit(p, RLIMIT_NPROC)) {
if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
-@@ -1360,6 +1377,18 @@ static struct task_struct *copy_process(
+@@ -1363,6 +1380,18 @@ static struct task_struct *copy_process(
total_forks++;
spin_unlock(¤t->sighand->siglock);
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
cgroup_post_fork(p);
-diff -NurpP --minimal linux-3.0.21/kernel/kthread.c linux-3.0.21-vs2.3.2.3/kernel/kthread.c
---- linux-3.0.21/kernel/kthread.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/kthread.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/kthread.c linux-3.0.25-vs2.3.2.3/kernel/kthread.c
+--- linux-3.0.25/kernel/kthread.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/kthread.c 2011-06-10 22:11:24.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/mutex.h>
#include <linux/slab.h>
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-3.0.21/kernel/nsproxy.c linux-3.0.21-vs2.3.2.3/kernel/nsproxy.c
---- linux-3.0.21/kernel/nsproxy.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/nsproxy.c 2011-06-13 14:09:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/nsproxy.c linux-3.0.25-vs2.3.2.3/kernel/nsproxy.c
+--- linux-3.0.25/kernel/nsproxy.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/nsproxy.c 2011-06-13 14:09:44.000000000 +0200
@@ -20,6 +20,8 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current,
-diff -NurpP --minimal linux-3.0.21/kernel/pid.c linux-3.0.21-vs2.3.2.3/kernel/pid.c
---- linux-3.0.21/kernel/pid.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/pid.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/pid.c linux-3.0.25-vs2.3.2.3/kernel/pid.c
+--- linux-3.0.25/kernel/pid.c 2011-05-22 16:17:59.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/pid.c 2011-06-10 22:11:24.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/pid_namespace.h>
#include <linux/init_task.h>
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, current->nsproxy->pid_ns);
-diff -NurpP --minimal linux-3.0.21/kernel/pid_namespace.c linux-3.0.21-vs2.3.2.3/kernel/pid_namespace.c
---- linux-3.0.21/kernel/pid_namespace.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/pid_namespace.c 2011-06-10 22:17:45.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/pid_namespace.c linux-3.0.25-vs2.3.2.3/kernel/pid_namespace.c
+--- linux-3.0.25/kernel/pid_namespace.c 2011-05-22 16:17:59.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/pid_namespace.c 2011-06-10 22:17:45.000000000 +0200
@@ -15,6 +15,7 @@
#include <linux/acct.h>
#include <linux/slab.h>
kmem_cache_free(pid_ns_cachep, ns);
}
-diff -NurpP --minimal linux-3.0.21/kernel/posix-timers.c linux-3.0.21-vs2.3.2.3/kernel/posix-timers.c
---- linux-3.0.21/kernel/posix-timers.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/posix-timers.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/posix-timers.c linux-3.0.25-vs2.3.2.3/kernel/posix-timers.c
+--- linux-3.0.25/kernel/posix-timers.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/posix-timers.c 2011-06-10 22:11:24.000000000 +0200
@@ -47,6 +47,7 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
/* If we failed to send the signal the timer stops. */
return ret > 0;
}
-diff -NurpP --minimal linux-3.0.21/kernel/printk.c linux-3.0.21-vs2.3.2.3/kernel/printk.c
---- linux-3.0.21/kernel/printk.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/printk.c 2012-02-07 02:05:58.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/kernel/printk.c linux-3.0.25-vs2.3.2.3/kernel/printk.c
+--- linux-3.0.25/kernel/printk.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/printk.c 2012-02-07 02:05:58.000000000 +0100
@@ -41,6 +41,7 @@
#include <linux/cpu.h>
#include <linux/notifier.h>
count = len;
if (count > log_buf_len)
count = log_buf_len;
-diff -NurpP --minimal linux-3.0.21/kernel/ptrace.c linux-3.0.21-vs2.3.2.3/kernel/ptrace.c
---- linux-3.0.21/kernel/ptrace.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/ptrace.c 2011-11-21 16:29:59.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/kernel/ptrace.c linux-3.0.25-vs2.3.2.3/kernel/ptrace.c
+--- linux-3.0.25/kernel/ptrace.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/ptrace.c 2011-11-21 16:29:59.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
return security_ptrace_access_check(task, mode);
}
-diff -NurpP --minimal linux-3.0.21/kernel/sched.c linux-3.0.21-vs2.3.2.3/kernel/sched.c
---- linux-3.0.21/kernel/sched.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/sched.c 2011-10-18 13:51:13.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/sched.c linux-3.0.25-vs2.3.2.3/kernel/sched.c
+--- linux-3.0.25/kernel/sched.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/sched.c 2011-10-18 13:51:13.000000000 +0200
@@ -71,6 +71,8 @@
#include <linux/ctype.h>
#include <linux/ftrace.h>
retval = security_task_setnice(current, nice);
if (retval)
-diff -NurpP --minimal linux-3.0.21/kernel/sched_fair.c linux-3.0.21-vs2.3.2.3/kernel/sched_fair.c
---- linux-3.0.21/kernel/sched_fair.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/sched_fair.c 2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/sched_fair.c linux-3.0.25-vs2.3.2.3/kernel/sched_fair.c
+--- linux-3.0.25/kernel/sched_fair.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/sched_fair.c 2011-07-22 11:20:39.000000000 +0200
@@ -998,6 +998,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
__enqueue_entity(cfs_rq, se);
se->on_rq = 1;
update_cfs_load(cfs_rq, 0);
account_entity_dequeue(cfs_rq, se);
-diff -NurpP --minimal linux-3.0.21/kernel/signal.c linux-3.0.21-vs2.3.2.3/kernel/signal.c
---- linux-3.0.21/kernel/signal.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/signal.c 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/kernel/signal.c linux-3.0.25-vs2.3.2.3/kernel/signal.c
+--- linux-3.0.25/kernel/signal.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/signal.c 2011-11-15 17:37:07.000000000 +0100
@@ -28,6 +28,8 @@
#include <linux/freezer.h>
#include <linux/pid_namespace.h>
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-3.0.21/kernel/softirq.c linux-3.0.21-vs2.3.2.3/kernel/softirq.c
---- linux-3.0.21/kernel/softirq.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/softirq.c 2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/softirq.c linux-3.0.25-vs2.3.2.3/kernel/softirq.c
+--- linux-3.0.25/kernel/softirq.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/softirq.c 2011-07-22 11:20:39.000000000 +0200
@@ -24,6 +24,7 @@
#include <linux/ftrace.h>
#include <linux/smp.h>
#define CREATE_TRACE_POINTS
#include <trace/events/irq.h>
-diff -NurpP --minimal linux-3.0.21/kernel/sys.c linux-3.0.21-vs2.3.2.3/kernel/sys.c
---- linux-3.0.21/kernel/sys.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/sys.c 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/kernel/sys.c linux-3.0.25-vs2.3.2.3/kernel/sys.c
+--- linux-3.0.25/kernel/sys.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/sys.c 2011-11-15 17:37:07.000000000 +0100
@@ -45,6 +45,7 @@
#include <linux/syscalls.h>
#include <linux/kprobes.h>
return 0;
return -EPERM;
-diff -NurpP --minimal linux-3.0.21/kernel/sysctl.c linux-3.0.21-vs2.3.2.3/kernel/sysctl.c
---- linux-3.0.21/kernel/sysctl.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/sysctl.c 2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/sysctl.c linux-3.0.25-vs2.3.2.3/kernel/sysctl.c
+--- linux-3.0.25/kernel/sysctl.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/sysctl.c 2011-06-15 02:40:14.000000000 +0200
@@ -75,6 +75,7 @@
#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
#include <linux/lockdep.h>
#ifdef CONFIG_CHR_DEV_SG
{
.procname = "sg-big-buff",
-diff -NurpP --minimal linux-3.0.21/kernel/sysctl_binary.c linux-3.0.21-vs2.3.2.3/kernel/sysctl_binary.c
---- linux-3.0.21/kernel/sysctl_binary.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/sysctl_binary.c 2012-01-10 09:19:13.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/kernel/sysctl_binary.c linux-3.0.25-vs2.3.2.3/kernel/sysctl_binary.c
+--- linux-3.0.25/kernel/sysctl_binary.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/sysctl_binary.c 2012-01-10 09:19:13.000000000 +0100
@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
{ CTL_INT, KERN_PANIC, "panic" },
{ CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
{ CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
-diff -NurpP --minimal linux-3.0.21/kernel/time/timekeeping.c linux-3.0.21-vs2.3.2.3/kernel/time/timekeeping.c
---- linux-3.0.21/kernel/time/timekeeping.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/time/timekeeping.c 2011-12-19 15:55:53.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/kernel/time/timekeeping.c linux-3.0.25-vs2.3.2.3/kernel/time/timekeeping.c
+--- linux-3.0.25/kernel/time/timekeeping.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/time/timekeeping.c 2011-12-19 15:55:53.000000000 +0100
@@ -233,6 +233,7 @@ void getnstimeofday(struct timespec *ts)
} while (read_seqretry(&xtime_lock, seq));
}
EXPORT_SYMBOL(getnstimeofday);
-diff -NurpP --minimal linux-3.0.21/kernel/time.c linux-3.0.21-vs2.3.2.3/kernel/time.c
---- linux-3.0.21/kernel/time.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/time.c 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/kernel/time.c linux-3.0.25-vs2.3.2.3/kernel/time.c
+--- linux-3.0.25/kernel/time.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/time.c 2011-11-15 17:37:07.000000000 +0100
@@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
if (err)
return err;
}
return 0;
}
-diff -NurpP --minimal linux-3.0.21/kernel/timer.c linux-3.0.21-vs2.3.2.3/kernel/timer.c
---- linux-3.0.21/kernel/timer.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/timer.c 2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/timer.c linux-3.0.25-vs2.3.2.3/kernel/timer.c
+--- linux-3.0.25/kernel/timer.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/timer.c 2011-06-15 02:40:14.000000000 +0200
@@ -40,6 +40,10 @@
#include <linux/irq_work.h>
#include <linux/sched.h>
SYSCALL_DEFINE0(getuid)
{
/* Only we change this so SMP safe */
-diff -NurpP --minimal linux-3.0.21/kernel/user_namespace.c linux-3.0.21-vs2.3.2.3/kernel/user_namespace.c
---- linux-3.0.21/kernel/user_namespace.c 2011-03-15 18:07:42.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/user_namespace.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/user_namespace.c linux-3.0.25-vs2.3.2.3/kernel/user_namespace.c
+--- linux-3.0.25/kernel/user_namespace.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/user_namespace.c 2011-06-10 22:11:24.000000000 +0200
@@ -11,6 +11,7 @@
#include <linux/user_namespace.h>
#include <linux/highuid.h>
INIT_WORK(&ns->destroyer, free_user_ns_work);
schedule_work(&ns->destroyer);
}
-diff -NurpP --minimal linux-3.0.21/kernel/utsname.c linux-3.0.21-vs2.3.2.3/kernel/utsname.c
---- linux-3.0.21/kernel/utsname.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/kernel/utsname.c 2011-06-13 14:09:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/utsname.c linux-3.0.25-vs2.3.2.3/kernel/utsname.c
+--- linux-3.0.25/kernel/utsname.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/kernel/utsname.c 2011-06-13 14:09:44.000000000 +0200
@@ -16,14 +16,17 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
kfree(ns);
}
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/Kconfig linux-3.0.21-vs2.3.2.3/kernel/vserver/Kconfig
---- linux-3.0.21/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/Kconfig 2011-08-08 18:06:22.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/Kconfig linux-3.0.25-vs2.3.2.3/kernel/vserver/Kconfig
+--- linux-3.0.25/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/Kconfig 2011-08-08 18:06:22.000000000 +0200
@@ -0,0 +1,232 @@
+#
+# Linux VServer configuration
+ bool
+ default n
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/Makefile linux-3.0.21-vs2.3.2.3/kernel/vserver/Makefile
---- linux-3.0.21/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/Makefile 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/Makefile linux-3.0.25-vs2.3.2.3/kernel/vserver/Makefile
+--- linux-3.0.25/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/Makefile 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,18 @@
+#
+# Makefile for the Linux vserver routines.
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/cacct.c linux-3.0.21-vs2.3.2.3/kernel/vserver/cacct.c
---- linux-3.0.21/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/cacct.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/cacct.c linux-3.0.25-vs2.3.2.3/kernel/vserver/cacct.c
+--- linux-3.0.25/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/cacct.c 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/cacct_init.h linux-3.0.21-vs2.3.2.3/kernel/vserver/cacct_init.h
---- linux-3.0.21/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/cacct_init.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/cacct_init.h linux-3.0.25-vs2.3.2.3/kernel/vserver/cacct_init.h
+--- linux-3.0.25/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/cacct_init.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,25 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/cacct_proc.h linux-3.0.21-vs2.3.2.3/kernel/vserver/cacct_proc.h
---- linux-3.0.21/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/cacct_proc.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/cacct_proc.h linux-3.0.25-vs2.3.2.3/kernel/vserver/cacct_proc.h
+--- linux-3.0.25/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/cacct_proc.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/context.c linux-3.0.21-vs2.3.2.3/kernel/vserver/context.c
---- linux-3.0.21/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/context.c 2011-08-01 18:28:12.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/context.c linux-3.0.25-vs2.3.2.3/kernel/vserver/context.c
+--- linux-3.0.25/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/context.c 2011-08-01 18:28:12.000000000 +0200
@@ -0,0 +1,1107 @@
+/*
+ * linux/kernel/vserver/context.c
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/cvirt.c linux-3.0.21-vs2.3.2.3/kernel/vserver/cvirt.c
---- linux-3.0.21/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/cvirt.c 2011-06-13 14:57:26.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/cvirt.c linux-3.0.25-vs2.3.2.3/kernel/vserver/cvirt.c
+--- linux-3.0.25/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/cvirt.c 2011-06-13 14:57:26.000000000 +0200
@@ -0,0 +1,303 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+
+#endif
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/cvirt_init.h linux-3.0.21-vs2.3.2.3/kernel/vserver/cvirt_init.h
---- linux-3.0.21/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/cvirt_init.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/cvirt_init.h linux-3.0.25-vs2.3.2.3/kernel/vserver/cvirt_init.h
+--- linux-3.0.25/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/cvirt_init.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,70 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/cvirt_proc.h linux-3.0.21-vs2.3.2.3/kernel/vserver/cvirt_proc.h
---- linux-3.0.21/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/cvirt_proc.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/cvirt_proc.h linux-3.0.25-vs2.3.2.3/kernel/vserver/cvirt_proc.h
+--- linux-3.0.25/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/cvirt_proc.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,135 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/debug.c linux-3.0.21-vs2.3.2.3/kernel/vserver/debug.c
---- linux-3.0.21/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/debug.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/debug.c linux-3.0.25-vs2.3.2.3/kernel/vserver/debug.c
+--- linux-3.0.25/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/debug.c 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/device.c linux-3.0.21-vs2.3.2.3/kernel/vserver/device.c
---- linux-3.0.21/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/device.c 2011-06-10 23:20:56.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/device.c linux-3.0.25-vs2.3.2.3/kernel/vserver/device.c
+--- linux-3.0.25/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/device.c 2011-06-10 23:20:56.000000000 +0200
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/dlimit.c linux-3.0.21-vs2.3.2.3/kernel/vserver/dlimit.c
---- linux-3.0.21/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/dlimit.c 2011-06-10 23:20:56.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/dlimit.c linux-3.0.25-vs2.3.2.3/kernel/vserver/dlimit.c
+--- linux-3.0.25/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/dlimit.c 2011-06-10 23:20:56.000000000 +0200
@@ -0,0 +1,531 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/helper.c linux-3.0.21-vs2.3.2.3/kernel/vserver/helper.c
---- linux-3.0.21/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/helper.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/helper.c linux-3.0.25-vs2.3.2.3/kernel/vserver/helper.c
+--- linux-3.0.25/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/helper.c 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,223 @@
+/*
+ * linux/kernel/vserver/helper.c
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/history.c linux-3.0.21-vs2.3.2.3/kernel/vserver/history.c
---- linux-3.0.21/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/history.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/history.c linux-3.0.25-vs2.3.2.3/kernel/vserver/history.c
+--- linux-3.0.25/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/history.c 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/inet.c linux-3.0.21-vs2.3.2.3/kernel/vserver/inet.c
---- linux-3.0.21/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/inet.c 2011-08-30 20:14:33.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/inet.c linux-3.0.25-vs2.3.2.3/kernel/vserver/inet.c
+--- linux-3.0.25/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/inet.c 2011-08-30 20:14:33.000000000 +0200
@@ -0,0 +1,225 @@
+
+#include <linux/in.h>
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/init.c linux-3.0.21-vs2.3.2.3/kernel/vserver/init.c
---- linux-3.0.21/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/init.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/init.c linux-3.0.25-vs2.3.2.3/kernel/vserver/init.c
+--- linux-3.0.25/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/init.c 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/inode.c linux-3.0.21-vs2.3.2.3/kernel/vserver/inode.c
---- linux-3.0.21/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/inode.c 2012-01-24 01:46:36.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/inode.c linux-3.0.25-vs2.3.2.3/kernel/vserver/inode.c
+--- linux-3.0.25/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/inode.c 2012-01-24 01:46:36.000000000 +0100
@@ -0,0 +1,437 @@
+/*
+ * linux/kernel/vserver/inode.c
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/limit.c linux-3.0.21-vs2.3.2.3/kernel/vserver/limit.c
---- linux-3.0.21/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/limit.c 2011-10-11 20:48:08.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/limit.c linux-3.0.25-vs2.3.2.3/kernel/vserver/limit.c
+--- linux-3.0.25/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/limit.c 2011-10-11 20:48:08.000000000 +0200
@@ -0,0 +1,360 @@
+/*
+ * linux/kernel/vserver/limit.c
+ return points;
+}
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/limit_init.h linux-3.0.21-vs2.3.2.3/kernel/vserver/limit_init.h
---- linux-3.0.21/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/limit_init.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/limit_init.h linux-3.0.25-vs2.3.2.3/kernel/vserver/limit_init.h
+--- linux-3.0.25/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/limit_init.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,31 @@
+
+
+ }
+}
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/limit_proc.h linux-3.0.21-vs2.3.2.3/kernel/vserver/limit_proc.h
---- linux-3.0.21/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/limit_proc.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/limit_proc.h linux-3.0.25-vs2.3.2.3/kernel/vserver/limit_proc.h
+--- linux-3.0.25/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/limit_proc.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/network.c linux-3.0.21-vs2.3.2.3/kernel/vserver/network.c
---- linux-3.0.21/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/network.c 2011-06-10 23:20:56.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/network.c linux-3.0.25-vs2.3.2.3/kernel/vserver/network.c
+--- linux-3.0.25/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/network.c 2011-06-10 23:20:56.000000000 +0200
@@ -0,0 +1,912 @@
+/*
+ * linux/kernel/vserver/network.c
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/proc.c linux-3.0.21-vs2.3.2.3/kernel/vserver/proc.c
---- linux-3.0.21/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/proc.c 2011-08-01 19:57:21.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/proc.c linux-3.0.25-vs2.3.2.3/kernel/vserver/proc.c
+--- linux-3.0.25/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/proc.c 2011-08-01 19:57:21.000000000 +0200
@@ -0,0 +1,1103 @@
+/*
+ * linux/kernel/vserver/proc.c
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/sched.c linux-3.0.21-vs2.3.2.3/kernel/vserver/sched.c
---- linux-3.0.21/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/sched.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/sched.c linux-3.0.25-vs2.3.2.3/kernel/vserver/sched.c
+--- linux-3.0.25/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/sched.c 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,82 @@
+/*
+ * linux/kernel/vserver/sched.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/sched_init.h linux-3.0.21-vs2.3.2.3/kernel/vserver/sched_init.h
---- linux-3.0.21/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/sched_init.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/sched_init.h linux-3.0.25-vs2.3.2.3/kernel/vserver/sched_init.h
+--- linux-3.0.25/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/sched_init.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,27 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+{
+ return;
+}
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/sched_proc.h linux-3.0.21-vs2.3.2.3/kernel/vserver/sched_proc.h
---- linux-3.0.21/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/sched_proc.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/sched_proc.h linux-3.0.25-vs2.3.2.3/kernel/vserver/sched_proc.h
+--- linux-3.0.25/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/sched_proc.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,32 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/signal.c linux-3.0.21-vs2.3.2.3/kernel/vserver/signal.c
---- linux-3.0.21/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/signal.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/signal.c linux-3.0.25-vs2.3.2.3/kernel/vserver/signal.c
+--- linux-3.0.25/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/signal.c 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
+ return ret;
+}
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/space.c linux-3.0.21-vs2.3.2.3/kernel/vserver/space.c
---- linux-3.0.21/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/space.c 2011-07-20 02:11:49.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/space.c linux-3.0.25-vs2.3.2.3/kernel/vserver/space.c
+--- linux-3.0.25/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/space.c 2011-07-20 02:11:49.000000000 +0200
@@ -0,0 +1,435 @@
+/*
+ * linux/kernel/vserver/space.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/switch.c linux-3.0.21-vs2.3.2.3/kernel/vserver/switch.c
---- linux-3.0.21/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/switch.c 2011-08-01 18:28:26.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/switch.c linux-3.0.25-vs2.3.2.3/kernel/vserver/switch.c
+--- linux-3.0.25/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/switch.c 2011-08-01 18:28:26.000000000 +0200
@@ -0,0 +1,556 @@
+/*
+ * linux/kernel/vserver/switch.c
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/sysctl.c linux-3.0.21-vs2.3.2.3/kernel/vserver/sysctl.c
---- linux-3.0.21/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/sysctl.c 2011-10-27 15:18:40.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/sysctl.c linux-3.0.25-vs2.3.2.3/kernel/vserver/sysctl.c
+--- linux-3.0.25/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/sysctl.c 2011-10-27 15:18:40.000000000 +0200
@@ -0,0 +1,247 @@
+/*
+ * kernel/vserver/sysctl.c
+EXPORT_SYMBOL_GPL(vs_debug_perm);
+EXPORT_SYMBOL_GPL(vs_debug_misc);
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/tag.c linux-3.0.21-vs2.3.2.3/kernel/vserver/tag.c
---- linux-3.0.21/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/tag.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/tag.c linux-3.0.25-vs2.3.2.3/kernel/vserver/tag.c
+--- linux-3.0.25/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/tag.c 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
+}
+
+
-diff -NurpP --minimal linux-3.0.21/kernel/vserver/vci_config.h linux-3.0.21-vs2.3.2.3/kernel/vserver/vci_config.h
---- linux-3.0.21/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/kernel/vserver/vci_config.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/kernel/vserver/vci_config.h linux-3.0.25-vs2.3.2.3/kernel/vserver/vci_config.h
+--- linux-3.0.25/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/kernel/vserver/vci_config.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,76 @@
+
+/* interface version */
+ 0;
+}
+
-diff -NurpP --minimal linux-3.0.21/mm/filemap_xip.c linux-3.0.21-vs2.3.2.3/mm/filemap_xip.c
---- linux-3.0.21/mm/filemap_xip.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/mm/filemap_xip.c 2012-02-15 05:20:43.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/mm/filemap_xip.c linux-3.0.25-vs2.3.2.3/mm/filemap_xip.c
+--- linux-3.0.25/mm/filemap_xip.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/mm/filemap_xip.c 2012-02-15 05:20:43.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/seqlock.h>
#include <linux/mutex.h>
#include <asm/tlbflush.h>
#include <asm/io.h>
-diff -NurpP --minimal linux-3.0.21/mm/fremap.c linux-3.0.21-vs2.3.2.3/mm/fremap.c
---- linux-3.0.21/mm/fremap.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/mm/fremap.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/mm/fremap.c linux-3.0.25-vs2.3.2.3/mm/fremap.c
+--- linux-3.0.25/mm/fremap.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/mm/fremap.c 2011-06-10 22:11:24.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/module.h>
#include <linux/syscalls.h>
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
-diff -NurpP --minimal linux-3.0.21/mm/hugetlb.c linux-3.0.21-vs2.3.2.3/mm/hugetlb.c
---- linux-3.0.21/mm/hugetlb.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/mm/hugetlb.c 2012-01-10 09:19:13.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/mm/hugetlb.c linux-3.0.25-vs2.3.2.3/mm/hugetlb.c
+--- linux-3.0.25/mm/hugetlb.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/mm/hugetlb.c 2012-01-10 09:19:13.000000000 +0100
@@ -28,6 +28,7 @@
#include <linux/hugetlb.h>
#include "internal.h"
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-3.0.21/mm/memcontrol.c linux-3.0.21-vs2.3.2.3/mm/memcontrol.c
---- linux-3.0.21/mm/memcontrol.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/mm/memcontrol.c 2012-01-26 08:39:53.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/mm/memcontrol.c linux-3.0.25-vs2.3.2.3/mm/memcontrol.c
+--- linux-3.0.25/mm/memcontrol.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/mm/memcontrol.c 2012-03-15 13:32:35.000000000 +0100
@@ -741,6 +741,31 @@ struct mem_cgroup *mem_cgroup_from_task(
struct mem_cgroup, css);
}
struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
{
struct mem_cgroup *mem = NULL;
-diff -NurpP --minimal linux-3.0.21/mm/memory.c linux-3.0.21-vs2.3.2.3/mm/memory.c
---- linux-3.0.21/mm/memory.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/mm/memory.c 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/mm/memory.c linux-3.0.25-vs2.3.2.3/mm/memory.c
+--- linux-3.0.25/mm/memory.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/mm/memory.c 2011-11-15 17:37:07.000000000 +0100
@@ -3388,6 +3388,7 @@ int handle_pte_fault(struct mm_struct *m
{
pte_t entry;
}
/*
-diff -NurpP --minimal linux-3.0.21/mm/mremap.c linux-3.0.21-vs2.3.2.3/mm/mremap.c
---- linux-3.0.21/mm/mremap.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/mm/mremap.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/mm/mremap.c linux-3.0.25-vs2.3.2.3/mm/mremap.c
+--- linux-3.0.25/mm/mremap.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/mm/mremap.c 2011-06-10 22:11:24.000000000 +0200
@@ -19,6 +19,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
-diff -NurpP --minimal linux-3.0.21/mm/oom_kill.c linux-3.0.21-vs2.3.2.3/mm/oom_kill.c
---- linux-3.0.21/mm/oom_kill.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/mm/oom_kill.c 2012-01-10 09:19:13.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/mm/oom_kill.c linux-3.0.25-vs2.3.2.3/mm/oom_kill.c
+--- linux-3.0.25/mm/oom_kill.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/mm/oom_kill.c 2012-01-10 09:19:13.000000000 +0100
@@ -32,6 +32,9 @@
#include <linux/mempolicy.h>
#include <linux/security.h>
}
if (oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-3.0.21/mm/page_alloc.c linux-3.0.21-vs2.3.2.3/mm/page_alloc.c
---- linux-3.0.21/mm/page_alloc.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/mm/page_alloc.c 2012-01-26 08:39:53.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/mm/page_alloc.c linux-3.0.25-vs2.3.2.3/mm/page_alloc.c
+--- linux-3.0.25/mm/page_alloc.c 2012-03-19 21:16:56.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/mm/page_alloc.c 2012-01-26 08:39:53.000000000 +0100
@@ -57,6 +57,8 @@
#include <linux/ftrace_event.h>
#include <linux/memcontrol.h>
}
#endif
-diff -NurpP --minimal linux-3.0.21/mm/pgtable-generic.c linux-3.0.21-vs2.3.2.3/mm/pgtable-generic.c
---- linux-3.0.21/mm/pgtable-generic.c 2011-03-15 18:07:42.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/mm/pgtable-generic.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/mm/pgtable-generic.c linux-3.0.25-vs2.3.2.3/mm/pgtable-generic.c
+--- linux-3.0.25/mm/pgtable-generic.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/mm/pgtable-generic.c 2011-06-10 22:11:24.000000000 +0200
@@ -6,6 +6,8 @@
* Copyright (C) 2010 Linus Torvalds
*/
#include <linux/pagemap.h>
#include <asm/tlb.h>
#include <asm-generic/pgtable.h>
-diff -NurpP --minimal linux-3.0.21/mm/rmap.c linux-3.0.21-vs2.3.2.3/mm/rmap.c
---- linux-3.0.21/mm/rmap.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/mm/rmap.c 2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/mm/rmap.c linux-3.0.25-vs2.3.2.3/mm/rmap.c
+--- linux-3.0.25/mm/rmap.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/mm/rmap.c 2011-07-01 11:35:35.000000000 +0200
@@ -57,6 +57,7 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0.21/mm/shmem.c linux-3.0.21-vs2.3.2.3/mm/shmem.c
---- linux-3.0.21/mm/shmem.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/mm/shmem.c 2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/mm/shmem.c linux-3.0.25-vs2.3.2.3/mm/shmem.c
+--- linux-3.0.25/mm/shmem.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/mm/shmem.c 2011-07-01 11:35:35.000000000 +0200
@@ -1850,7 +1850,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_XATTR
-diff -NurpP --minimal linux-3.0.21/mm/slab.c linux-3.0.21-vs2.3.2.3/mm/slab.c
---- linux-3.0.21/mm/slab.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/mm/slab.c 2011-06-15 02:41:23.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/mm/slab.c linux-3.0.25-vs2.3.2.3/mm/slab.c
+--- linux-3.0.25/mm/slab.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/mm/slab.c 2011-06-15 02:41:23.000000000 +0200
@@ -411,6 +411,8 @@ static void kmem_list3_init(struct kmem_
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
kmemcheck_slab_free(cachep, objp, obj_size(cachep));
-diff -NurpP --minimal linux-3.0.21/mm/slab_vs.h linux-3.0.21-vs2.3.2.3/mm/slab_vs.h
---- linux-3.0.21/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/mm/slab_vs.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/mm/slab_vs.h linux-3.0.25-vs2.3.2.3/mm/slab_vs.h
+--- linux-3.0.25/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/mm/slab_vs.h 2011-06-10 22:11:24.000000000 +0200
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
+ atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-3.0.21/mm/swapfile.c linux-3.0.21-vs2.3.2.3/mm/swapfile.c
---- linux-3.0.21/mm/swapfile.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/mm/swapfile.c 2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/mm/swapfile.c linux-3.0.25-vs2.3.2.3/mm/swapfile.c
+--- linux-3.0.25/mm/swapfile.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/mm/swapfile.c 2011-07-01 11:35:35.000000000 +0200
@@ -37,6 +37,8 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
}
/*
-diff -NurpP --minimal linux-3.0.21/net/bridge/br_multicast.c linux-3.0.21-vs2.3.2.3/net/bridge/br_multicast.c
---- linux-3.0.21/net/bridge/br_multicast.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/bridge/br_multicast.c 2011-10-18 13:51:13.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/bridge/br_multicast.c linux-3.0.25-vs2.3.2.3/net/bridge/br_multicast.c
+--- linux-3.0.25/net/bridge/br_multicast.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/bridge/br_multicast.c 2012-03-23 14:55:24.000000000 +0100
@@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_
ip6h->hop_limit = 1;
ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
kfree_skb(skb);
return NULL;
}
-diff -NurpP --minimal linux-3.0.21/net/core/dev.c linux-3.0.21-vs2.3.2.3/net/core/dev.c
---- linux-3.0.21/net/core/dev.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/core/dev.c 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/net/core/dev.c linux-3.0.25-vs2.3.2.3/net/core/dev.c
+--- linux-3.0.25/net/core/dev.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/core/dev.c 2012-03-01 21:51:50.000000000 +0100
@@ -127,6 +127,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
/* avoid cases where sscanf is not exact inverse of printf */
snprintf(buf, IFNAMSIZ, name, i);
-@@ -3937,6 +3956,8 @@ static int dev_ifconf(struct net *net, c
+@@ -3943,6 +3962,8 @@ static int dev_ifconf(struct net *net, c
total = 0;
for_each_netdev(net, dev) {
for (i = 0; i < NPROTO; i++) {
if (gifconf_list[i]) {
int done;
-@@ -4011,6 +4032,10 @@ static void dev_seq_printf_stats(struct
+@@ -4017,6 +4038,10 @@ static void dev_seq_printf_stats(struct
struct rtnl_link_stats64 temp;
const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
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.0.21/net/core/rtnetlink.c linux-3.0.21-vs2.3.2.3/net/core/rtnetlink.c
---- linux-3.0.21/net/core/rtnetlink.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/core/rtnetlink.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/core/rtnetlink.c linux-3.0.25-vs2.3.2.3/net/core/rtnetlink.c
+--- linux-3.0.25/net/core/rtnetlink.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/core/rtnetlink.c 2011-06-10 22:11:24.000000000 +0200
@@ -1015,6 +1015,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
if (idx < s_idx)
skb = nlmsg_new(if_nlmsg_size(dev), GFP_KERNEL);
if (skb == NULL)
goto errout;
-diff -NurpP --minimal linux-3.0.21/net/core/sock.c linux-3.0.21-vs2.3.2.3/net/core/sock.c
---- linux-3.0.21/net/core/sock.c 2012-02-15 01:04:25.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/core/sock.c 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/net/core/sock.c linux-3.0.25-vs2.3.2.3/net/core/sock.c
+--- linux-3.0.25/net/core/sock.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/core/sock.c 2011-11-15 17:37:07.000000000 +0100
@@ -127,6 +127,10 @@
#include <net/cls_cgroup.h>
/*
* Before updating sk_refcnt, we must commit prior changes to memory
* (Documentation/RCU/rculist_nulls.txt for details)
-diff -NurpP --minimal linux-3.0.21/net/ipv4/af_inet.c linux-3.0.21-vs2.3.2.3/net/ipv4/af_inet.c
---- linux-3.0.21/net/ipv4/af_inet.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/af_inet.c 2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv4/af_inet.c linux-3.0.25-vs2.3.2.3/net/ipv4/af_inet.c
+--- linux-3.0.25/net/ipv4/af_inet.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/af_inet.c 2011-07-19 00:44:39.000000000 +0200
@@ -117,6 +117,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
sin->sin_port = inet->inet_sport;
sin->sin_addr.s_addr = addr;
}
-diff -NurpP --minimal linux-3.0.21/net/ipv4/arp.c linux-3.0.21-vs2.3.2.3/net/ipv4/arp.c
---- linux-3.0.21/net/ipv4/arp.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/arp.c 2012-02-15 05:20:43.000000000 +0100
-@@ -1371,6 +1371,7 @@ static void arp_format_neigh_entry(struc
+diff -NurpP --minimal linux-3.0.25/net/ipv4/arp.c linux-3.0.25-vs2.3.2.3/net/ipv4/arp.c
+--- linux-3.0.25/net/ipv4/arp.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/arp.c 2012-03-01 21:51:50.000000000 +0100
+@@ -1372,6 +1372,7 @@ static void arp_format_neigh_entry(struc
struct net_device *dev = n->dev;
int hatype = dev->type;
read_lock(&n->lock);
/* Convert hardware address to XX:XX:XX:XX ... form. */
#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
-@@ -1402,6 +1403,7 @@ static void arp_format_pneigh_entry(stru
+@@ -1403,6 +1404,7 @@ static void arp_format_pneigh_entry(stru
int hatype = dev ? dev->type : 0;
char tbuf[16];
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.0.21/net/ipv4/devinet.c linux-3.0.21-vs2.3.2.3/net/ipv4/devinet.c
---- linux-3.0.21/net/ipv4/devinet.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/devinet.c 2012-01-10 09:19:13.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/net/ipv4/devinet.c linux-3.0.25-vs2.3.2.3/net/ipv4/devinet.c
+--- linux-3.0.25/net/ipv4/devinet.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/devinet.c 2012-01-10 09:19:13.000000000 +0100
@@ -518,6 +518,7 @@ struct in_device *inetdev_by_index(struc
}
EXPORT_SYMBOL(inetdev_by_index);
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-3.0.21/net/ipv4/fib_trie.c linux-3.0.21-vs2.3.2.3/net/ipv4/fib_trie.c
---- linux-3.0.21/net/ipv4/fib_trie.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/fib_trie.c 2011-08-29 04:56:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv4/fib_trie.c linux-3.0.25-vs2.3.2.3/net/ipv4/fib_trie.c
+--- linux-3.0.25/net/ipv4/fib_trie.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/fib_trie.c 2011-08-29 04:56:47.000000000 +0200
@@ -2554,6 +2554,7 @@ static int fib_route_seq_show(struct seq
|| fa->fa_type == RTN_MULTICAST)
continue;
if (fi)
seq_printf(seq,
"%s\t%08X\t%08X\t%04X\t%d\t%u\t"
-diff -NurpP --minimal linux-3.0.21/net/ipv4/inet_connection_sock.c linux-3.0.21-vs2.3.2.3/net/ipv4/inet_connection_sock.c
---- linux-3.0.21/net/ipv4/inet_connection_sock.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/inet_connection_sock.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv4/inet_connection_sock.c linux-3.0.25-vs2.3.2.3/net/ipv4/inet_connection_sock.c
+--- linux-3.0.25/net/ipv4/inet_connection_sock.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/inet_connection_sock.c 2011-06-10 22:11:24.000000000 +0200
@@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low,
}
EXPORT_SYMBOL(inet_get_local_port_range);
break;
}
}
-diff -NurpP --minimal linux-3.0.21/net/ipv4/inet_diag.c linux-3.0.21-vs2.3.2.3/net/ipv4/inet_diag.c
---- linux-3.0.21/net/ipv4/inet_diag.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/inet_diag.c 2011-06-22 12:39:16.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv4/inet_diag.c linux-3.0.25-vs2.3.2.3/net/ipv4/inet_diag.c
+--- linux-3.0.25/net/ipv4/inet_diag.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/inet_diag.c 2011-06-22 12:39:16.000000000 +0200
@@ -33,6 +33,8 @@
#include <linux/stddef.h>
if (num < s_num)
goto next_dying;
if (r->id.idiag_sport != tw->tw_sport &&
-diff -NurpP --minimal linux-3.0.21/net/ipv4/inet_hashtables.c linux-3.0.21-vs2.3.2.3/net/ipv4/inet_hashtables.c
---- linux-3.0.21/net/ipv4/inet_hashtables.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/inet_hashtables.c 2011-08-29 03:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv4/inet_hashtables.c linux-3.0.25-vs2.3.2.3/net/ipv4/inet_hashtables.c
+--- linux-3.0.25/net/ipv4/inet_hashtables.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/inet_hashtables.c 2011-08-29 03:45:56.000000000 +0200
@@ -22,6 +22,7 @@
#include <net/inet_connection_sock.h>
#include <net/inet_hashtables.h>
/*
* if the nulls value we got at the end of this lookup is
* not the expected one, we must restart lookup.
-diff -NurpP --minimal linux-3.0.21/net/ipv4/netfilter/nf_nat_helper.c linux-3.0.21-vs2.3.2.3/net/ipv4/netfilter/nf_nat_helper.c
---- linux-3.0.21/net/ipv4/netfilter/nf_nat_helper.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/netfilter/nf_nat_helper.c 2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv4/netfilter/nf_nat_helper.c linux-3.0.25-vs2.3.2.3/net/ipv4/netfilter/nf_nat_helper.c
+--- linux-3.0.25/net/ipv4/netfilter/nf_nat_helper.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/netfilter/nf_nat_helper.c 2011-06-15 02:40:14.000000000 +0200
@@ -20,6 +20,7 @@
#include <net/route.h>
#include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_helper.h>
#include <net/netfilter/nf_conntrack_ecache.h>
-diff -NurpP --minimal linux-3.0.21/net/ipv4/netfilter.c linux-3.0.21-vs2.3.2.3/net/ipv4/netfilter.c
---- linux-3.0.21/net/ipv4/netfilter.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/netfilter.c 2011-10-18 13:51:13.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv4/netfilter.c linux-3.0.25-vs2.3.2.3/net/ipv4/netfilter.c
+--- linux-3.0.25/net/ipv4/netfilter.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/netfilter.c 2011-10-18 13:51:13.000000000 +0200
@@ -5,7 +5,7 @@
#include <linux/ip.h>
#include <linux/skbuff.h>
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-3.0.21/net/ipv4/raw.c linux-3.0.21-vs2.3.2.3/net/ipv4/raw.c
---- linux-3.0.21/net/ipv4/raw.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/raw.c 2011-07-27 20:26:04.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv4/raw.c linux-3.0.25-vs2.3.2.3/net/ipv4/raw.c
+--- linux-3.0.25/net/ipv4/raw.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/raw.c 2011-07-27 20:26:04.000000000 +0200
@@ -117,7 +117,7 @@ static struct sock *__raw_v4_lookup(stru
if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
sk = sk_head(&state->h->ht[state->bucket]);
-diff -NurpP --minimal linux-3.0.21/net/ipv4/route.c linux-3.0.21-vs2.3.2.3/net/ipv4/route.c
---- linux-3.0.21/net/ipv4/route.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/route.c 2012-02-15 05:20:43.000000000 +0100
-@@ -2625,7 +2625,7 @@ static struct rtable *ip_route_output_sl
+diff -NurpP --minimal linux-3.0.25/net/ipv4/route.c linux-3.0.25-vs2.3.2.3/net/ipv4/route.c
+--- linux-3.0.25/net/ipv4/route.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/route.c 2012-03-01 21:51:50.000000000 +0100
+@@ -2658,7 +2658,7 @@ static struct rtable *ip_route_output_sl
if (fl4->flowi4_oif) {
rth = ERR_PTR(-ENODEV);
if (dev_out == NULL)
goto out;
-diff -NurpP --minimal linux-3.0.21/net/ipv4/tcp.c linux-3.0.21-vs2.3.2.3/net/ipv4/tcp.c
---- linux-3.0.21/net/ipv4/tcp.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/tcp.c 2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv4/tcp.c linux-3.0.25-vs2.3.2.3/net/ipv4/tcp.c
+--- linux-3.0.25/net/ipv4/tcp.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/tcp.c 2011-07-19 00:44:39.000000000 +0200
@@ -266,6 +266,7 @@
#include <linux/crypto.h>
#include <linux/time.h>
#include <net/icmp.h>
#include <net/tcp.h>
-diff -NurpP --minimal linux-3.0.21/net/ipv4/tcp_ipv4.c linux-3.0.21-vs2.3.2.3/net/ipv4/tcp_ipv4.c
---- linux-3.0.21/net/ipv4/tcp_ipv4.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/tcp_ipv4.c 2012-02-07 02:05:58.000000000 +0100
-@@ -2006,6 +2006,12 @@ static void *listening_get_next(struct s
+diff -NurpP --minimal linux-3.0.25/net/ipv4/tcp_ipv4.c linux-3.0.25-vs2.3.2.3/net/ipv4/tcp_ipv4.c
+--- linux-3.0.25/net/ipv4/tcp_ipv4.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/tcp_ipv4.c 2012-03-01 21:51:50.000000000 +0100
+@@ -2011,6 +2011,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
while (req) {
if (req->rsk_ops->family == st->family) {
cur = req;
goto out;
-@@ -2030,6 +2036,10 @@ get_req:
+@@ -2035,6 +2041,10 @@ get_req:
}
get_sk:
sk_nulls_for_each_from(sk, node) {
if (!net_eq(sock_net(sk), net))
continue;
if (sk->sk_family == st->family) {
-@@ -2106,6 +2116,11 @@ static void *established_get_first(struc
+@@ -2111,6 +2121,11 @@ static void *established_get_first(struc
spin_lock_bh(lock);
sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
if (sk->sk_family != st->family ||
!net_eq(sock_net(sk), net)) {
continue;
-@@ -2116,6 +2131,11 @@ static void *established_get_first(struc
+@@ -2121,6 +2136,11 @@ static void *established_get_first(struc
st->state = TCP_SEQ_STATE_TIME_WAIT;
inet_twsk_for_each(tw, node,
&tcp_hashinfo.ehash[st->bucket].twchain) {
if (tw->tw_family != st->family ||
!net_eq(twsk_net(tw), net)) {
continue;
-@@ -2145,7 +2165,9 @@ static void *established_get_next(struct
+@@ -2150,7 +2170,9 @@ static void *established_get_next(struct
tw = cur;
tw = tw_next(tw);
get_tw:
tw = tw_next(tw);
}
if (tw) {
-@@ -2169,6 +2191,11 @@ get_tw:
+@@ -2174,6 +2196,11 @@ get_tw:
sk = sk_nulls_next(sk);
sk_nulls_for_each_from(sk, node) {
if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
goto found;
}
-@@ -2378,9 +2405,9 @@ static void get_openreq4(struct sock *sk
+@@ -2383,9 +2410,9 @@ static void get_openreq4(struct sock *sk
seq_printf(f, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n",
i,
ntohs(ireq->rmt_port),
TCP_SYN_RECV,
0, 0, /* could print option size, but that is af dependent. */
-@@ -2402,8 +2429,8 @@ static void get_tcp4_sock(struct sock *s
+@@ -2407,8 +2434,8 @@ static void get_tcp4_sock(struct sock *s
struct tcp_sock *tp = tcp_sk(sk);
const struct inet_connection_sock *icsk = inet_csk(sk);
struct inet_sock *inet = inet_sk(sk);
__u16 destp = ntohs(inet->inet_dport);
__u16 srcp = ntohs(inet->inet_sport);
int rx_queue;
-@@ -2460,8 +2487,8 @@ static void get_timewait4_sock(struct in
+@@ -2465,8 +2492,8 @@ static void get_timewait4_sock(struct in
if (ttd < 0)
ttd = 0;
destp = ntohs(tw->tw_dport);
srcp = ntohs(tw->tw_sport);
-diff -NurpP --minimal linux-3.0.21/net/ipv4/tcp_minisocks.c linux-3.0.21-vs2.3.2.3/net/ipv4/tcp_minisocks.c
---- linux-3.0.21/net/ipv4/tcp_minisocks.c 2011-03-15 18:07:45.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/tcp_minisocks.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv4/tcp_minisocks.c linux-3.0.25-vs2.3.2.3/net/ipv4/tcp_minisocks.c
+--- linux-3.0.25/net/ipv4/tcp_minisocks.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/tcp_minisocks.c 2011-06-10 22:11:24.000000000 +0200
@@ -23,6 +23,9 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-3.0.21/net/ipv4/udp.c linux-3.0.21-vs2.3.2.3/net/ipv4/udp.c
---- linux-3.0.21/net/ipv4/udp.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/ipv4/udp.c 2011-07-27 20:26:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv4/udp.c linux-3.0.25-vs2.3.2.3/net/ipv4/udp.c
+--- linux-3.0.25/net/ipv4/udp.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/ipv4/udp.c 2011-07-27 20:26:14.000000000 +0200
@@ -296,14 +296,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
if (!sk) {
if (state->bucket <= state->udp_table->mask)
-diff -NurpP --minimal linux-3.0.21/net/ipv6/Kconfig linux-3.0.21-vs2.3.2.3/net/ipv6/Kconfig
---- linux-3.0.21/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/ipv6/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv6/Kconfig linux-3.0.25-vs2.3.2.3/net/ipv6/Kconfig
+--- linux-3.0.25/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/ipv6/Kconfig 2011-06-10 22:11:24.000000000 +0200
@@ -4,8 +4,8 @@
# IPv6 as module will cause a CRASH if you try to unload it
---help---
This is complemental support for the IP version 6.
You will still be able to do traditional IPv4 networking as well.
-diff -NurpP --minimal linux-3.0.21/net/ipv6/addrconf.c linux-3.0.21-vs2.3.2.3/net/ipv6/addrconf.c
---- linux-3.0.21/net/ipv6/addrconf.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv6/addrconf.c 2012-02-15 05:20:43.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/net/ipv6/addrconf.c linux-3.0.25-vs2.3.2.3/net/ipv6/addrconf.c
+--- linux-3.0.25/net/ipv6/addrconf.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv6/addrconf.c 2012-03-23 14:54:00.000000000 +0100
@@ -87,6 +87,8 @@
#include <linux/proc_fs.h>
/* Set to 3 to get tracing... */
#define ACONF_DEBUG 2
-@@ -1108,7 +1110,7 @@ out:
+@@ -1112,7 +1114,7 @@ out:
int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
const struct in6_addr *daddr, unsigned int prefs,
{
struct ipv6_saddr_score scores[2],
*score = &scores[0], *hiscore = &scores[1];
-@@ -1180,6 +1182,8 @@ int ipv6_dev_get_saddr(struct net *net,
+@@ -1184,6 +1186,8 @@ int ipv6_dev_get_saddr(struct net *net,
dev->name);
continue;
}
score->rule = -1;
bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
-@@ -3048,7 +3052,10 @@ static void if6_seq_stop(struct seq_file
+@@ -3052,7 +3056,10 @@ static void if6_seq_stop(struct seq_file
static int if6_seq_show(struct seq_file *seq, void *v)
{
struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
&ifp->addr,
ifp->idev->dev->ifindex,
ifp->prefix_len,
-@@ -3554,6 +3561,11 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3558,6 +3565,11 @@ static int in6_dump_addrs(struct inet6_d
struct ifacaddr6 *ifaca;
int err = 1;
int ip_idx = *p_ip_idx;
read_lock_bh(&idev->lock);
switch (type) {
-@@ -3564,6 +3576,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3568,6 +3580,8 @@ static int in6_dump_addrs(struct inet6_d
list_for_each_entry(ifa, &idev->addr_list, if_list) {
if (++ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifaddr(skb, ifa,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -3580,6 +3594,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3584,6 +3598,8 @@ static int in6_dump_addrs(struct inet6_d
ifmca = ifmca->next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifmcaddr(skb, ifmca,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -3595,6 +3611,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3599,6 +3615,8 @@ static int in6_dump_addrs(struct inet6_d
ifaca = ifaca->aca_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifacaddr(skb, ifaca,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -3980,6 +3998,11 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -3984,6 +4002,11 @@ static int inet6_dump_ifinfo(struct sk_b
struct inet6_dev *idev;
struct hlist_head *head;
struct hlist_node *node;
s_h = cb->args[0];
s_idx = cb->args[1];
-@@ -3991,6 +4014,8 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -3995,6 +4018,8 @@ static int inet6_dump_ifinfo(struct sk_b
hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
if (idx < s_idx)
goto cont;
idev = __in6_dev_get(dev);
if (!idev)
goto cont;
-diff -NurpP --minimal linux-3.0.21/net/ipv6/af_inet6.c linux-3.0.21-vs2.3.2.3/net/ipv6/af_inet6.c
---- linux-3.0.21/net/ipv6/af_inet6.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv6/af_inet6.c 2011-08-29 03:45:10.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv6/af_inet6.c linux-3.0.25-vs2.3.2.3/net/ipv6/af_inet6.c
+--- linux-3.0.25/net/ipv6/af_inet6.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv6/af_inet6.c 2011-08-29 03:45:10.000000000 +0200
@@ -42,6 +42,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
if (ipv6_addr_any(&np->rcv_saddr))
ipv6_addr_copy(&sin->sin6_addr, &np->saddr);
else
-diff -NurpP --minimal linux-3.0.21/net/ipv6/datagram.c linux-3.0.21-vs2.3.2.3/net/ipv6/datagram.c
---- linux-3.0.21/net/ipv6/datagram.c 2011-05-22 16:18:00.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/ipv6/datagram.c 2011-09-17 19:24:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv6/datagram.c linux-3.0.25-vs2.3.2.3/net/ipv6/datagram.c
+--- linux-3.0.25/net/ipv6/datagram.c 2011-05-22 16:18:00.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/ipv6/datagram.c 2011-09-17 19:24:15.000000000 +0200
@@ -639,7 +639,7 @@ int datagram_send_ctl(struct net *net,
rcu_read_lock();
if (!dev) {
rcu_read_unlock();
return -ENODEV;
-diff -NurpP --minimal linux-3.0.21/net/ipv6/fib6_rules.c linux-3.0.21-vs2.3.2.3/net/ipv6/fib6_rules.c
---- linux-3.0.21/net/ipv6/fib6_rules.c 2011-05-22 16:18:00.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/ipv6/fib6_rules.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv6/fib6_rules.c linux-3.0.25-vs2.3.2.3/net/ipv6/fib6_rules.c
+--- linux-3.0.25/net/ipv6/fib6_rules.c 2011-05-22 16:18:00.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/ipv6/fib6_rules.c 2011-06-10 22:11:24.000000000 +0200
@@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r
ip6_dst_idev(&rt->dst)->dev,
&flp6->daddr,
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
-diff -NurpP --minimal linux-3.0.21/net/ipv6/inet6_hashtables.c linux-3.0.21-vs2.3.2.3/net/ipv6/inet6_hashtables.c
---- linux-3.0.21/net/ipv6/inet6_hashtables.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv6/inet6_hashtables.c 2011-08-29 03:45:10.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv6/inet6_hashtables.c linux-3.0.25-vs2.3.2.3/net/ipv6/inet6_hashtables.c
+--- linux-3.0.25/net/ipv6/inet6_hashtables.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv6/inet6_hashtables.c 2011-08-29 03:45:10.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/module.h>
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-3.0.21/net/ipv6/ip6_output.c linux-3.0.21-vs2.3.2.3/net/ipv6/ip6_output.c
---- linux-3.0.21/net/ipv6/ip6_output.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv6/ip6_output.c 2012-02-15 05:20:43.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/net/ipv6/ip6_output.c linux-3.0.25-vs2.3.2.3/net/ipv6/ip6_output.c
+--- linux-3.0.25/net/ipv6/ip6_output.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv6/ip6_output.c 2012-02-15 05:20:43.000000000 +0100
@@ -979,7 +979,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,
if (err)
goto out_err_release;
}
-diff -NurpP --minimal linux-3.0.21/net/ipv6/ndisc.c linux-3.0.21-vs2.3.2.3/net/ipv6/ndisc.c
---- linux-3.0.21/net/ipv6/ndisc.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv6/ndisc.c 2012-02-15 05:20:43.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/net/ipv6/ndisc.c linux-3.0.25-vs2.3.2.3/net/ipv6/ndisc.c
+--- linux-3.0.25/net/ipv6/ndisc.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv6/ndisc.c 2012-02-15 05:20:43.000000000 +0100
@@ -597,7 +597,7 @@ static void ndisc_send_na(struct net_dev
} else {
if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
return;
src_addr = &tmpaddr;
}
-diff -NurpP --minimal linux-3.0.21/net/ipv6/raw.c linux-3.0.21-vs2.3.2.3/net/ipv6/raw.c
---- linux-3.0.21/net/ipv6/raw.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/ipv6/raw.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv6/raw.c linux-3.0.25-vs2.3.2.3/net/ipv6/raw.c
+--- linux-3.0.25/net/ipv6/raw.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/ipv6/raw.c 2011-06-10 22:11:24.000000000 +0200
@@ -30,6 +30,7 @@
#include <linux/icmpv6.h>
#include <linux/netfilter.h>
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-diff -NurpP --minimal linux-3.0.21/net/ipv6/route.c linux-3.0.21-vs2.3.2.3/net/ipv6/route.c
---- linux-3.0.21/net/ipv6/route.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv6/route.c 2012-02-15 05:20:43.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/net/ipv6/route.c linux-3.0.25-vs2.3.2.3/net/ipv6/route.c
+--- linux-3.0.25/net/ipv6/route.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv6/route.c 2012-02-15 05:20:43.000000000 +0100
@@ -54,6 +54,7 @@
#include <net/xfrm.h>
#include <net/netevent.h>
seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
#ifdef CONFIG_IPV6_SUBTREES
-diff -NurpP --minimal linux-3.0.21/net/ipv6/tcp_ipv6.c linux-3.0.21-vs2.3.2.3/net/ipv6/tcp_ipv6.c
---- linux-3.0.21/net/ipv6/tcp_ipv6.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv6/tcp_ipv6.c 2012-02-07 02:05:58.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/net/ipv6/tcp_ipv6.c linux-3.0.25-vs2.3.2.3/net/ipv6/tcp_ipv6.c
+--- linux-3.0.25/net/ipv6/tcp_ipv6.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv6/tcp_ipv6.c 2012-02-07 02:05:58.000000000 +0100
@@ -70,6 +70,7 @@
#include <linux/crypto.h>
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-3.0.21/net/ipv6/udp.c linux-3.0.21-vs2.3.2.3/net/ipv6/udp.c
---- linux-3.0.21/net/ipv6/udp.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/ipv6/udp.c 2011-10-18 13:51:13.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv6/udp.c linux-3.0.25-vs2.3.2.3/net/ipv6/udp.c
+--- linux-3.0.25/net/ipv6/udp.c 2012-03-19 21:16:57.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/ipv6/udp.c 2011-10-18 13:51:13.000000000 +0200
@@ -45,41 +45,67 @@
#include <net/tcp_states.h>
#include <net/ip6_checksum.h>
}
if (!ipv6_addr_any(&np->daddr)) {
if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-3.0.21/net/ipv6/xfrm6_policy.c linux-3.0.21-vs2.3.2.3/net/ipv6/xfrm6_policy.c
---- linux-3.0.21/net/ipv6/xfrm6_policy.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/ipv6/xfrm6_policy.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/ipv6/xfrm6_policy.c linux-3.0.25-vs2.3.2.3/net/ipv6/xfrm6_policy.c
+--- linux-3.0.25/net/ipv6/xfrm6_policy.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/ipv6/xfrm6_policy.c 2011-06-10 22:11:24.000000000 +0200
@@ -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,
dst_release(dst);
return 0;
}
-diff -NurpP --minimal linux-3.0.21/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.21-vs2.3.2.3/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.0.21/net/netfilter/ipvs/ip_vs_xmit.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/netfilter/ipvs/ip_vs_xmit.c 2011-07-22 15:27:52.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.25-vs2.3.2.3/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.0.25/net/netfilter/ipvs/ip_vs_xmit.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/netfilter/ipvs/ip_vs_xmit.c 2011-07-22 15:27:52.000000000 +0200
@@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net,
return dst;
if (ipv6_addr_any(&fl6.saddr) &&
goto out_err;
if (do_xfrm) {
dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
-diff -NurpP --minimal linux-3.0.21/net/netlink/af_netlink.c linux-3.0.21-vs2.3.2.3/net/netlink/af_netlink.c
---- linux-3.0.21/net/netlink/af_netlink.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/netlink/af_netlink.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/netlink/af_netlink.c linux-3.0.25-vs2.3.2.3/net/netlink/af_netlink.c
+--- linux-3.0.25/net/netlink/af_netlink.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/netlink/af_netlink.c 2011-06-10 22:11:24.000000000 +0200
@@ -55,6 +55,9 @@
#include <linux/types.h>
#include <linux/audit.h>
s = sk_next(s);
if (s) {
iter->link = i;
-diff -NurpP --minimal linux-3.0.21/net/socket.c linux-3.0.21-vs2.3.2.3/net/socket.c
---- linux-3.0.21/net/socket.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/socket.c 2011-10-18 13:51:13.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/socket.c linux-3.0.25-vs2.3.2.3/net/socket.c
+--- linux-3.0.25/net/socket.c 2012-03-19 21:16:58.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/socket.c 2011-10-18 13:51:13.000000000 +0200
@@ -98,6 +98,10 @@
#include <net/sock.h>
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-3.0.21/net/sunrpc/auth.c linux-3.0.21-vs2.3.2.3/net/sunrpc/auth.c
---- linux-3.0.21/net/sunrpc/auth.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/sunrpc/auth.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/sunrpc/auth.c linux-3.0.25-vs2.3.2.3/net/sunrpc/auth.c
+--- linux-3.0.25/net/sunrpc/auth.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/sunrpc/auth.c 2011-06-10 22:11:24.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/hash.h>
#include <linux/sunrpc/clnt.h>
};
dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-3.0.21/net/sunrpc/auth_unix.c linux-3.0.21-vs2.3.2.3/net/sunrpc/auth_unix.c
---- linux-3.0.21/net/sunrpc/auth_unix.c 2012-02-15 01:04:26.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/net/sunrpc/auth_unix.c 2011-11-15 17:37:07.000000000 +0100
+diff -NurpP --minimal linux-3.0.25/net/sunrpc/auth_unix.c linux-3.0.25-vs2.3.2.3/net/sunrpc/auth_unix.c
+--- linux-3.0.25/net/sunrpc/auth_unix.c 2012-03-19 21:16:58.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/net/sunrpc/auth_unix.c 2011-11-15 17:37:07.000000000 +0100
@@ -12,12 +12,14 @@
#include <linux/module.h>
#include <linux/sunrpc/clnt.h>
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
*p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-3.0.21/net/sunrpc/clnt.c linux-3.0.21-vs2.3.2.3/net/sunrpc/clnt.c
---- linux-3.0.21/net/sunrpc/clnt.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/sunrpc/clnt.c 2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/sunrpc/clnt.c linux-3.0.25-vs2.3.2.3/net/sunrpc/clnt.c
+--- linux-3.0.25/net/sunrpc/clnt.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/sunrpc/clnt.c 2011-07-01 11:35:35.000000000 +0200
@@ -31,6 +31,7 @@
#include <linux/in.h>
#include <linux/in6.h>
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-3.0.21/net/unix/af_unix.c linux-3.0.21-vs2.3.2.3/net/unix/af_unix.c
---- linux-3.0.21/net/unix/af_unix.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/net/unix/af_unix.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/net/unix/af_unix.c linux-3.0.25-vs2.3.2.3/net/unix/af_unix.c
+--- linux-3.0.25/net/unix/af_unix.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/net/unix/af_unix.c 2011-06-10 22:11:24.000000000 +0200
@@ -114,6 +114,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
sk = next_unix_socket(&iter->i, sk);
return sk;
}
-diff -NurpP --minimal linux-3.0.21/scripts/checksyscalls.sh linux-3.0.21-vs2.3.2.3/scripts/checksyscalls.sh
---- linux-3.0.21/scripts/checksyscalls.sh 2011-03-15 18:07:46.000000000 +0100
-+++ linux-3.0.21-vs2.3.2.3/scripts/checksyscalls.sh 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/scripts/checksyscalls.sh linux-3.0.25-vs2.3.2.3/scripts/checksyscalls.sh
+--- linux-3.0.25/scripts/checksyscalls.sh 2011-03-15 18:07:46.000000000 +0100
++++ linux-3.0.25-vs2.3.2.3/scripts/checksyscalls.sh 2011-06-10 22:11:24.000000000 +0200
@@ -193,7 +193,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
EOF
}
-diff -NurpP --minimal linux-3.0.21/security/commoncap.c linux-3.0.21-vs2.3.2.3/security/commoncap.c
---- linux-3.0.21/security/commoncap.c 2011-07-22 11:18:14.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/security/commoncap.c 2011-08-30 15:42:43.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/security/commoncap.c linux-3.0.25-vs2.3.2.3/security/commoncap.c
+--- linux-3.0.25/security/commoncap.c 2011-07-22 11:18:14.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/security/commoncap.c 2011-08-30 15:42:43.000000000 +0200
@@ -62,6 +62,7 @@ int cap_netlink_recv(struct sk_buff *skb
return -EPERM;
return 0;
return -EPERM;
return 0;
}
-diff -NurpP --minimal linux-3.0.21/security/selinux/hooks.c linux-3.0.21-vs2.3.2.3/security/selinux/hooks.c
---- linux-3.0.21/security/selinux/hooks.c 2011-07-22 11:18:14.000000000 +0200
-+++ linux-3.0.21-vs2.3.2.3/security/selinux/hooks.c 2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.25/security/selinux/hooks.c linux-3.0.25-vs2.3.2.3/security/selinux/hooks.c
+--- linux-3.0.25/security/selinux/hooks.c 2011-07-22 11:18:14.000000000 +0200
++++ linux-3.0.25-vs2.3.2.3/security/selinux/hooks.c 2011-06-15 02:40:14.000000000 +0200
@@ -67,7 +67,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
projects / packages / kernel.git / commitdiff