diff options
| author | Arkadiusz Miśkiewicz | 2010-10-21 19:39:04 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | ba86f8330235190d99f8f1908a6c94ace86fadad (patch) | |
| tree | 7584c2f9b2184b4408291c352979e805a34cdd06 | |
| parent | 179e13f5eb50153f8b7410ce808b2b5ed5c8bddf (diff) | |
| download | kernel-ba86f8330235190d99f8f1908a6c94ace86fadad.zip kernel-ba86f8330235190d99f8f1908a6c94ace86fadad.tar.gz | |
- patch-2.6.36-vs2.3.0.36.36.diff
Changed files:
kernel-vserver-2.3.patch -> 1.49
kernel.spec -> 1.844
| -rw-r--r-- | kernel-vserver-2.3.patch | 2332 | ||||
| -rw-r--r-- | kernel.spec | 2 |
2 files changed, 928 insertions, 1406 deletions
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index d8d58c0..c95eb4d 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-2.6.36/arch/alpha/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/alpha/Kconfig +diff -NurpP --minimal linux-2.6.36/arch/alpha/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/alpha/Kconfig --- linux-2.6.36/arch/alpha/Kconfig 2010-10-21 13:06:45.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/alpha/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/alpha/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -677,6 +677,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -10,9 +10,9 @@ diff -NurpP --minimal linux-2.6.36/arch/alpha/Kconfig linux-2.6.36-vs2.3.0.36.33 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/entry.S linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/entry.S +diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/entry.S linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/entry.S --- linux-2.6.36/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/entry.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/entry.S 2010-10-21 13:09:36.000000000 +0200 @@ -860,24 +860,15 @@ sys_getxgid: .globl sys_getxpid .ent sys_getxpid @@ -45,9 +45,9 @@ diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/entry.S linux-2.6.36-vs2.3. ret .end sys_getxpid -diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/ptrace.c --- linux-2.6.36/arch/alpha/kernel/ptrace.c 2010-07-07 18:30:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 @@ -13,6 +13,7 @@ #include <linux/user.h> #include <linux/security.h> @@ -56,9 +56,9 @@ diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/ptrace.c linux-2.6.36-vs2.3 #include <asm/uaccess.h> #include <asm/pgtable.h> -diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/systbls.S linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/systbls.S +diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/systbls.S linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/systbls.S --- linux-2.6.36/arch/alpha/kernel/systbls.S 2010-10-21 13:06:46.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/systbls.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/systbls.S 2010-10-21 13:09:36.000000000 +0200 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -68,9 +68,9 @@ diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/systbls.S linux-2.6.36-vs2. .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ -diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/traps.c +diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/traps.c --- linux-2.6.36/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 @@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); @@ -81,9 +81,9 @@ diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/traps.c linux-2.6.36-vs2.3. dik_show_regs(regs, r9_15); add_taint(TAINT_DIE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-2.6.36/arch/arm/include/asm/tlb.h linux-2.6.36-vs2.3.0.36.33/arch/arm/include/asm/tlb.h +diff -NurpP --minimal linux-2.6.36/arch/arm/include/asm/tlb.h linux-2.6.36-vs2.3.0.36.36/arch/arm/include/asm/tlb.h --- linux-2.6.36/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/arm/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/arm/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200 @@ -27,6 +27,7 @@ #else /* !CONFIG_MMU */ @@ -92,9 +92,9 @@ diff -NurpP --minimal linux-2.6.36/arch/arm/include/asm/tlb.h linux-2.6.36-vs2.3 #include <asm/pgalloc.h> /* -diff -NurpP --minimal linux-2.6.36/arch/arm/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/arm/Kconfig +diff -NurpP --minimal linux-2.6.36/arch/arm/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/arm/Kconfig --- linux-2.6.36/arch/arm/Kconfig 2010-10-21 13:06:46.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/arm/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/arm/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -1803,6 +1803,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -104,9 +104,9 @@ diff -NurpP --minimal linux-2.6.36/arch/arm/Kconfig linux-2.6.36-vs2.3.0.36.33/a source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/calls.S linux-2.6.36-vs2.3.0.36.33/arch/arm/kernel/calls.S +diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/calls.S linux-2.6.36-vs2.3.0.36.36/arch/arm/kernel/calls.S --- linux-2.6.36/arch/arm/kernel/calls.S 2010-10-21 13:06:46.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/arm/kernel/calls.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/arm/kernel/calls.S 2010-10-21 13:09:36.000000000 +0200 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -116,9 +116,9 @@ diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/calls.S linux-2.6.36-vs2.3.0. CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/process.c linux-2.6.36-vs2.3.0.36.33/arch/arm/kernel/process.c +diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/process.c linux-2.6.36-vs2.3.0.36.36/arch/arm/kernel/process.c --- linux-2.6.36/arch/arm/kernel/process.c 2010-10-21 13:06:46.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/arm/kernel/process.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/arm/kernel/process.c 2010-10-21 13:09:36.000000000 +0200 @@ -295,7 +295,8 @@ void __show_regs(struct pt_regs *regs) void show_regs(struct pt_regs * regs) { @@ -129,9 +129,9 @@ diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/process.c linux-2.6.36-vs2.3. __show_regs(regs); __backtrace(); } -diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/arm/kernel/traps.c +diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/arm/kernel/traps.c --- linux-2.6.36/arch/arm/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/arm/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/arm/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 @@ -244,8 +244,8 @@ static int __die(const char *str, int er print_modules(); @@ -143,9 +143,9 @@ diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/traps.c linux-2.6.36-vs2.3.0. if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-2.6.36/arch/cris/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/cris/Kconfig +diff -NurpP --minimal linux-2.6.36/arch/cris/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/cris/Kconfig --- linux-2.6.36/arch/cris/Kconfig 2010-10-21 13:06:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/cris/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/cris/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -694,6 +694,8 @@ source "drivers/staging/Kconfig" source "arch/cris/Kconfig.debug" @@ -155,9 +155,9 @@ diff -NurpP --minimal linux-2.6.36/arch/cris/Kconfig linux-2.6.36-vs2.3.0.36.33/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36/arch/frv/kernel/kernel_thread.S linux-2.6.36-vs2.3.0.36.33/arch/frv/kernel/kernel_thread.S +diff -NurpP --minimal linux-2.6.36/arch/frv/kernel/kernel_thread.S linux-2.6.36-vs2.3.0.36.36/arch/frv/kernel/kernel_thread.S --- linux-2.6.36/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/arch/frv/kernel/kernel_thread.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/frv/kernel/kernel_thread.S 2010-10-21 13:09:36.000000000 +0200 @@ -37,7 +37,7 @@ kernel_thread: # start by forking the current process, but with shared VM @@ -167,9 +167,9 @@ diff -NurpP --minimal linux-2.6.36/arch/frv/kernel/kernel_thread.S linux-2.6.36- sethi.p #0xe4e4,gr9 ; second syscall arg [newsp] setlo #0xe4e4,gr9 setlos.p #0,gr10 ; third syscall arg [parent_tidptr] -diff -NurpP --minimal linux-2.6.36/arch/h8300/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/h8300/Kconfig +diff -NurpP --minimal linux-2.6.36/arch/h8300/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/h8300/Kconfig --- linux-2.6.36/arch/h8300/Kconfig 2010-10-21 13:06:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/h8300/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/h8300/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -226,6 +226,8 @@ source "fs/Kconfig" source "arch/h8300/Kconfig.debug" @@ -179,9 +179,9 @@ diff -NurpP --minimal linux-2.6.36/arch/h8300/Kconfig linux-2.6.36-vs2.3.0.36.33 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36/arch/ia64/include/asm/tlb.h linux-2.6.36-vs2.3.0.36.33/arch/ia64/include/asm/tlb.h +diff -NurpP --minimal linux-2.6.36/arch/ia64/include/asm/tlb.h linux-2.6.36-vs2.3.0.36.36/arch/ia64/include/asm/tlb.h --- linux-2.6.36/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200 @@ -40,6 +40,7 @@ #include <linux/mm.h> #include <linux/pagemap.h> @@ -190,9 +190,9 @@ diff -NurpP --minimal linux-2.6.36/arch/ia64/include/asm/tlb.h linux-2.6.36-vs2. #include <asm/pgalloc.h> #include <asm/processor.h> -diff -NurpP --minimal linux-2.6.36/arch/ia64/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/ia64/Kconfig +diff -NurpP --minimal linux-2.6.36/arch/ia64/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/ia64/Kconfig --- linux-2.6.36/arch/ia64/Kconfig 2010-10-21 13:06:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -671,6 +671,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -202,9 +202,9 @@ diff -NurpP --minimal linux-2.6.36/arch/ia64/Kconfig linux-2.6.36-vs2.3.0.36.33/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/entry.S linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/entry.S +diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/entry.S linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/entry.S --- linux-2.6.36/arch/ia64/kernel/entry.S 2010-10-21 13:06:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/entry.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/entry.S 2010-10-21 13:09:36.000000000 +0200 @@ -1714,7 +1714,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr @@ -214,9 +214,9 @@ diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/entry.S linux-2.6.36-vs2.3.0 data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/perfmon.c linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/perfmon.c +diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/perfmon.c linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/perfmon.c --- linux-2.6.36/arch/ia64/kernel/perfmon.c 2010-10-21 13:06:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/perfmon.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/perfmon.c 2010-10-21 13:09:36.000000000 +0200 @@ -42,6 +42,7 @@ #include <linux/completion.h> #include <linux/tracehook.h> @@ -225,9 +225,9 @@ diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/perfmon.c linux-2.6.36-vs2.3 #include <asm/errno.h> #include <asm/intrinsics.h> -diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/process.c linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/process.c +diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/process.c linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/process.c --- linux-2.6.36/arch/ia64/kernel/process.c 2010-10-21 13:06:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/process.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/process.c 2010-10-21 13:09:36.000000000 +0200 @@ -113,8 +113,8 @@ show_regs (struct pt_regs *regs) unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; @@ -239,9 +239,9 @@ diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/process.c linux-2.6.36-vs2.3 printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n", regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(), init_utsname()->release); -diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/ptrace.c --- linux-2.6.36/arch/ia64/kernel/ptrace.c 2010-08-02 16:52:04.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 @@ -21,6 +21,7 @@ #include <linux/regset.h> #include <linux/elf.h> @@ -250,9 +250,9 @@ diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/ptrace.c linux-2.6.36-vs2.3. #include <asm/pgtable.h> #include <asm/processor.h> -diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/traps.c +diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/traps.c --- linux-2.6.36/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 @@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re put_cpu(); @@ -277,9 +277,9 @@ diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/traps.c linux-2.6.36-vs2.3.0 } } } -diff -NurpP --minimal linux-2.6.36/arch/ia64/mm/fault.c linux-2.6.36-vs2.3.0.36.33/arch/ia64/mm/fault.c +diff -NurpP --minimal linux-2.6.36/arch/ia64/mm/fault.c linux-2.6.36-vs2.3.0.36.36/arch/ia64/mm/fault.c --- linux-2.6.36/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/mm/fault.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/mm/fault.c 2010-10-21 13:09:36.000000000 +0200 @@ -10,6 +10,7 @@ #include <linux/interrupt.h> #include <linux/kprobes.h> @@ -288,9 +288,9 @@ diff -NurpP --minimal linux-2.6.36/arch/ia64/mm/fault.c linux-2.6.36-vs2.3.0.36. #include <asm/pgtable.h> #include <asm/processor.h> -diff -NurpP --minimal linux-2.6.36/arch/m32r/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/m32r/kernel/traps.c +diff -NurpP --minimal linux-2.6.36/arch/m32r/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/m32r/kernel/traps.c --- linux-2.6.36/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/arch/m32r/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/m32r/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 @@ -196,8 +196,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); @@ -303,9 +303,9 @@ diff -NurpP --minimal linux-2.6.36/arch/m32r/kernel/traps.c linux-2.6.36-vs2.3.0 /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-2.6.36/arch/m68k/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/m68k/Kconfig +diff -NurpP --minimal linux-2.6.36/arch/m68k/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/m68k/Kconfig --- linux-2.6.36/arch/m68k/Kconfig 2010-10-21 13:06:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/m68k/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/m68k/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -616,6 +616,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -315,9 +315,9 @@ diff -NurpP --minimal linux-2.6.36/arch/m68k/Kconfig linux-2.6.36-vs2.3.0.36.33/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36/arch/m68k/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.33/arch/m68k/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.36/arch/m68k/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.36/arch/m68k/kernel/ptrace.c --- linux-2.6.36/arch/m68k/kernel/ptrace.c 2010-07-07 18:31:02.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/m68k/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/m68k/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 @@ -18,6 +18,7 @@ #include <linux/ptrace.h> #include <linux/user.h> @@ -335,9 +335,9 @@ diff -NurpP --minimal linux-2.6.36/arch/m68k/kernel/ptrace.c linux-2.6.36-vs2.3. return ret; out_eio: -diff -NurpP --minimal linux-2.6.36/arch/m68k/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/m68k/kernel/traps.c +diff -NurpP --minimal linux-2.6.36/arch/m68k/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/m68k/kernel/traps.c --- linux-2.6.36/arch/m68k/kernel/traps.c 2010-08-02 16:52:04.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/m68k/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/m68k/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 @@ -906,8 +906,8 @@ void show_registers(struct pt_regs *regs printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", regs->d4, regs->d5, regs->a0, regs->a1); @@ -349,9 +349,9 @@ diff -NurpP --minimal linux-2.6.36/arch/m68k/kernel/traps.c linux-2.6.36-vs2.3.0 addr = (unsigned long)&fp->un; printk("Frame format=%X ", regs->format); switch (regs->format) { -diff -NurpP --minimal linux-2.6.36/arch/m68knommu/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/m68knommu/Kconfig +diff -NurpP --minimal linux-2.6.36/arch/m68knommu/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/m68knommu/Kconfig --- linux-2.6.36/arch/m68knommu/Kconfig 2010-10-21 13:06:53.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/m68knommu/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/m68knommu/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -730,6 +730,8 @@ source "fs/Kconfig" source "arch/m68knommu/Kconfig.debug" @@ -361,9 +361,9 @@ diff -NurpP --minimal linux-2.6.36/arch/m68knommu/Kconfig linux-2.6.36-vs2.3.0.3 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36/arch/m68knommu/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/m68knommu/kernel/traps.c +diff -NurpP --minimal linux-2.6.36/arch/m68knommu/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/m68knommu/kernel/traps.c --- linux-2.6.36/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/m68knommu/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/m68knommu/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 @@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_ printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", fp->d4, fp->d5, fp->a0, fp->a1); @@ -376,9 +376,9 @@ diff -NurpP --minimal linux-2.6.36/arch/m68knommu/kernel/traps.c linux-2.6.36-vs show_stack(NULL, (unsigned long *)(fp + 1)); add_taint(TAINT_DIE); do_exit(SIGSEGV); -diff -NurpP --minimal linux-2.6.36/arch/mips/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/mips/Kconfig +diff -NurpP --minimal linux-2.6.36/arch/mips/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/mips/Kconfig --- linux-2.6.36/arch/mips/Kconfig 2010-10-21 13:06:53.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/mips/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/mips/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -2298,6 +2298,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -388,9 +388,9 @@ diff -NurpP --minimal linux-2.6.36/arch/mips/Kconfig linux-2.6.36-vs2.3.0.36.33/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/ptrace.c --- linux-2.6.36/arch/mips/kernel/ptrace.c 2010-10-21 13:06:54.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 @@ -25,6 +25,7 @@ #include <linux/security.h> #include <linux/audit.h> @@ -409,9 +409,9 @@ diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/ptrace.c linux-2.6.36-vs2.3. switch (request) { /* when I and D space are separate, these will need to be fixed. */ case PTRACE_PEEKTEXT: /* read word at location addr. */ -diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall32-o32.S linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall32-o32.S +diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall32-o32.S linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall32-o32.S --- linux-2.6.36/arch/mips/kernel/scall32-o32.S 2010-10-21 13:06:54.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall32-o32.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall32-o32.S 2010-10-21 13:09:36.000000000 +0200 @@ -524,7 +524,7 @@ einval: li v0, -ENOSYS sys sys_mq_timedreceive 5 sys sys_mq_notify 2 /* 4275 */ @@ -421,9 +421,9 @@ diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall32-o32.S linux-2.6.36-v sys sys_waitid 5 sys sys_ni_syscall 0 /* available, was setaltroot */ sys sys_add_key 5 /* 4280 */ -diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-64.S linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall64-64.S +diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-64.S linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall64-64.S --- linux-2.6.36/arch/mips/kernel/scall64-64.S 2010-10-21 13:06:54.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall64-64.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall64-64.S 2010-10-21 13:09:36.000000000 +0200 @@ -363,7 +363,7 @@ sys_call_table: PTR sys_mq_timedreceive PTR sys_mq_notify @@ -433,9 +433,9 @@ diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-64.S linux-2.6.36-vs PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-n32.S linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall64-n32.S +diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-n32.S linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall64-n32.S --- linux-2.6.36/arch/mips/kernel/scall64-n32.S 2010-10-21 13:06:54.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall64-n32.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall64-n32.S 2010-10-21 13:09:36.000000000 +0200 @@ -362,7 +362,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify @@ -445,9 +445,9 @@ diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-n32.S linux-2.6.36-v PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-o32.S linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall64-o32.S +diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-o32.S linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall64-o32.S --- linux-2.6.36/arch/mips/kernel/scall64-o32.S 2010-10-21 13:06:54.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall64-o32.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall64-o32.S 2010-10-21 13:09:36.000000000 +0200 @@ -481,7 +481,7 @@ sys_call_table: PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ @@ -457,9 +457,9 @@ diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-o32.S linux-2.6.36-v PTR sys_32_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/traps.c +diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/traps.c --- linux-2.6.36/arch/mips/kernel/traps.c 2010-10-21 13:06:54.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 @@ -341,9 +341,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); @@ -474,9 +474,9 @@ diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/traps.c linux-2.6.36-vs2.3.0 if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-2.6.36/arch/parisc/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/parisc/Kconfig +diff -NurpP --minimal linux-2.6.36/arch/parisc/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/parisc/Kconfig --- linux-2.6.36/arch/parisc/Kconfig 2010-10-21 13:06:55.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/parisc/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/parisc/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -295,6 +295,8 @@ source "fs/Kconfig" source "arch/parisc/Kconfig.debug" @@ -486,9 +486,9 @@ diff -NurpP --minimal linux-2.6.36/arch/parisc/Kconfig linux-2.6.36-vs2.3.0.36.3 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36/arch/parisc/kernel/syscall_table.S linux-2.6.36-vs2.3.0.36.33/arch/parisc/kernel/syscall_table.S +diff -NurpP --minimal linux-2.6.36/arch/parisc/kernel/syscall_table.S linux-2.6.36-vs2.3.0.36.36/arch/parisc/kernel/syscall_table.S --- linux-2.6.36/arch/parisc/kernel/syscall_table.S 2010-07-07 18:31:04.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/parisc/kernel/syscall_table.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/parisc/kernel/syscall_table.S 2010-10-21 13:09:36.000000000 +0200 @@ -361,7 +361,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) @@ -498,9 +498,9 @@ diff -NurpP --minimal linux-2.6.36/arch/parisc/kernel/syscall_table.S linux-2.6. ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-2.6.36/arch/parisc/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/parisc/kernel/traps.c +diff -NurpP --minimal linux-2.6.36/arch/parisc/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/parisc/kernel/traps.c --- linux-2.6.36/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/parisc/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/parisc/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 @@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_ if (err == 0) return; /* STFU */ @@ -524,9 +524,9 @@ diff -NurpP --minimal linux-2.6.36/arch/parisc/kernel/traps.c linux-2.6.36-vs2.3 /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-2.6.36/arch/parisc/mm/fault.c linux-2.6.36-vs2.3.0.36.33/arch/parisc/mm/fault.c +diff -NurpP --minimal linux-2.6.36/arch/parisc/mm/fault.c linux-2.6.36-vs2.3.0.36.36/arch/parisc/mm/fault.c --- linux-2.6.36/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/parisc/mm/fault.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/parisc/mm/fault.c 2010-10-21 13:09:36.000000000 +0200 @@ -237,8 +237,9 @@ bad_area: #ifdef PRINT_USER_FAULTS @@ -539,9 +539,9 @@ diff -NurpP --minimal linux-2.6.36/arch/parisc/mm/fault.c linux-2.6.36-vs2.3.0.3 if (vma) { printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", vma->vm_start, vma->vm_end); -diff -NurpP --minimal linux-2.6.36/arch/powerpc/include/asm/unistd.h linux-2.6.36-vs2.3.0.36.33/arch/powerpc/include/asm/unistd.h +diff -NurpP --minimal linux-2.6.36/arch/powerpc/include/asm/unistd.h linux-2.6.36-vs2.3.0.36.36/arch/powerpc/include/asm/unistd.h --- linux-2.6.36/arch/powerpc/include/asm/unistd.h 2010-10-21 13:06:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/powerpc/include/asm/unistd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/powerpc/include/asm/unistd.h 2010-10-21 13:09:36.000000000 +0200 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -551,9 +551,9 @@ diff -NurpP --minimal linux-2.6.36/arch/powerpc/include/asm/unistd.h linux-2.6.3 #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-2.6.36/arch/powerpc/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/powerpc/Kconfig +diff -NurpP --minimal linux-2.6.36/arch/powerpc/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/powerpc/Kconfig --- linux-2.6.36/arch/powerpc/Kconfig 2010-10-21 13:06:55.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/powerpc/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/powerpc/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -974,6 +974,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -563,9 +563,9 @@ diff -NurpP --minimal linux-2.6.36/arch/powerpc/Kconfig linux-2.6.36-vs2.3.0.36. source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/process.c linux-2.6.36-vs2.3.0.36.33/arch/powerpc/kernel/process.c +diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/process.c linux-2.6.36-vs2.3.0.36.36/arch/powerpc/kernel/process.c --- linux-2.6.36/arch/powerpc/kernel/process.c 2010-10-21 13:06:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/powerpc/kernel/process.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/powerpc/kernel/process.c 2010-10-21 13:09:36.000000000 +0200 @@ -634,8 +634,9 @@ void show_regs(struct pt_regs * regs) #else printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr); @@ -578,9 +578,9 @@ diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/process.c linux-2.6.36-vs #ifdef CONFIG_SMP printk(" CPU: %d", raw_smp_processor_id()); -diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/powerpc/kernel/traps.c +diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/powerpc/kernel/traps.c --- linux-2.6.36/arch/powerpc/kernel/traps.c 2010-10-21 13:06:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/powerpc/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/powerpc/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 @@ -1048,8 +1048,9 @@ void nonrecoverable_exception(struct pt_ void trace_syscall(struct pt_regs *regs) @@ -593,9 +593,9 @@ diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/traps.c linux-2.6.36-vs2. regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/vdso.c linux-2.6.36-vs2.3.0.36.33/arch/powerpc/kernel/vdso.c +diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/vdso.c linux-2.6.36-vs2.3.0.36.36/arch/powerpc/kernel/vdso.c --- linux-2.6.36/arch/powerpc/kernel/vdso.c 2010-08-02 16:52:07.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/powerpc/kernel/vdso.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/powerpc/kernel/vdso.c 2010-10-21 13:09:36.000000000 +0200 @@ -23,6 +23,7 @@ #include <linux/security.h> #include <linux/bootmem.h> @@ -604,9 +604,9 @@ diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/vdso.c linux-2.6.36-vs2.3 #include <asm/pgtable.h> #include <asm/system.h> -diff -NurpP --minimal linux-2.6.36/arch/s390/include/asm/tlb.h linux-2.6.36-vs2.3.0.36.33/arch/s390/include/asm/tlb.h +diff -NurpP --minimal linux-2.6.36/arch/s390/include/asm/tlb.h linux-2.6.36-vs2.3.0.36.36/arch/s390/include/asm/tlb.h --- linux-2.6.36/arch/s390/include/asm/tlb.h 2010-10-21 13:06:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/s390/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/s390/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200 @@ -23,6 +23,8 @@ #include <linux/mm.h> @@ -616,9 +616,9 @@ diff -NurpP --minimal linux-2.6.36/arch/s390/include/asm/tlb.h linux-2.6.36-vs2. #include <asm/processor.h> #include <asm/pgalloc.h> #include <asm/smp.h> -diff -NurpP --minimal linux-2.6.36/arch/s390/include/asm/unistd.h linux-2.6.36-vs2.3.0.36.33/arch/s390/include/asm/unistd.h +diff -NurpP --minimal linux-2.6.36/arch/s390/include/asm/unistd.h linux-2.6.36-vs2.3.0.36.36/arch/s390/include/asm/unistd.h --- linux-2.6.36/arch/s390/include/asm/unistd.h 2010-10-21 13:06:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/s390/include/asm/unistd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/s390/include/asm/unistd.h 2010-10-21 13:09:36.000000000 +0200 @@ -202,7 +202,7 @@ #define __NR_clock_gettime (__NR_timer_create+6) #define __NR_clock_getres (__NR_timer_create+7) @@ -628,9 +628,9 @@ diff -NurpP --minimal linux-2.6.36/arch/s390/include/asm/unistd.h linux-2.6.36-v #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-2.6.36/arch/s390/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/s390/Kconfig +diff -NurpP --minimal linux-2.6.36/arch/s390/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/s390/Kconfig --- linux-2.6.36/arch/s390/Kconfig 2010-10-21 13:06:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/s390/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/s390/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -620,6 +620,8 @@ source "fs/Kconfig" source "arch/s390/Kconfig.debug" @@ -640,9 +640,9 @@ diff -NurpP --minimal linux-2.6.36/arch/s390/Kconfig linux-2.6.36-vs2.3.0.36.33/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36/arch/s390/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.33/arch/s390/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.36/arch/s390/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.36/arch/s390/kernel/ptrace.c --- linux-2.6.36/arch/s390/kernel/ptrace.c 2010-08-02 16:52:09.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/s390/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/s390/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 @@ -36,6 +36,7 @@ #include <linux/regset.h> #include <linux/tracehook.h> @@ -651,9 +651,9 @@ diff -NurpP --minimal linux-2.6.36/arch/s390/kernel/ptrace.c linux-2.6.36-vs2.3. #include <trace/syscall.h> #include <asm/compat.h> #include <asm/segment.h> -diff -NurpP --minimal linux-2.6.36/arch/s390/kernel/syscalls.S linux-2.6.36-vs2.3.0.36.33/arch/s390/kernel/syscalls.S +diff -NurpP --minimal linux-2.6.36/arch/s390/kernel/syscalls.S linux-2.6.36-vs2.3.0.36.36/arch/s390/kernel/syscalls.S --- linux-2.6.36/arch/s390/kernel/syscalls.S 2010-10-21 13:06:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/s390/kernel/syscalls.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/s390/kernel/syscalls.S 2010-10-21 13:09:36.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) @@ -663,9 +663,9 @@ diff -NurpP --minimal linux-2.6.36/arch/s390/kernel/syscalls.S linux-2.6.36-vs2. SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper) SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper) SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper) -diff -NurpP --minimal linux-2.6.36/arch/sh/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/sh/Kconfig +diff -NurpP --minimal linux-2.6.36/arch/sh/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/sh/Kconfig --- linux-2.6.36/arch/sh/Kconfig 2010-10-21 13:06:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/sh/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/sh/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -878,6 +878,8 @@ source "fs/Kconfig" source "arch/sh/Kconfig.debug" @@ -675,9 +675,9 @@ diff -NurpP --minimal linux-2.6.36/arch/sh/Kconfig linux-2.6.36-vs2.3.0.36.33/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36/arch/sh/kernel/irq.c linux-2.6.36-vs2.3.0.36.33/arch/sh/kernel/irq.c +diff -NurpP --minimal linux-2.6.36/arch/sh/kernel/irq.c linux-2.6.36-vs2.3.0.36.36/arch/sh/kernel/irq.c --- linux-2.6.36/arch/sh/kernel/irq.c 2010-08-02 16:52:10.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/sh/kernel/irq.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/sh/kernel/irq.c 2010-10-21 13:09:36.000000000 +0200 @@ -13,6 +13,7 @@ #include <linux/seq_file.h> #include <linux/ftrace.h> @@ -686,9 +686,9 @@ diff -NurpP --minimal linux-2.6.36/arch/sh/kernel/irq.c linux-2.6.36-vs2.3.0.36. #include <asm/processor.h> #include <asm/machvec.h> #include <asm/uaccess.h> -diff -NurpP --minimal linux-2.6.36/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.36-vs2.3.0.36.33/arch/sh/kernel/vsyscall/vsyscall.c +diff -NurpP --minimal linux-2.6.36/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.36-vs2.3.0.36.36/arch/sh/kernel/vsyscall/vsyscall.c --- linux-2.6.36/arch/sh/kernel/vsyscall/vsyscall.c 2010-07-07 18:31:10.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/sh/kernel/vsyscall/vsyscall.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/sh/kernel/vsyscall/vsyscall.c 2010-10-21 13:09:36.000000000 +0200 @@ -18,6 +18,7 @@ #include <linux/elf.h> #include <linux/sched.h> @@ -697,9 +697,9 @@ diff -NurpP --minimal linux-2.6.36/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6. /* * Should the kernel map a VDSO page into processes and pass its -diff -NurpP --minimal linux-2.6.36/arch/sparc/include/asm/tlb_64.h linux-2.6.36-vs2.3.0.36.33/arch/sparc/include/asm/tlb_64.h +diff -NurpP --minimal linux-2.6.36/arch/sparc/include/asm/tlb_64.h linux-2.6.36-vs2.3.0.36.36/arch/sparc/include/asm/tlb_64.h --- linux-2.6.36/arch/sparc/include/asm/tlb_64.h 2009-09-10 15:25:45.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/sparc/include/asm/tlb_64.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/sparc/include/asm/tlb_64.h 2010-10-21 13:09:36.000000000 +0200 @@ -3,6 +3,7 @@ #include <linux/swap.h> @@ -708,9 +708,9 @@ diff -NurpP --minimal linux-2.6.36/arch/sparc/include/asm/tlb_64.h linux-2.6.36- #include <asm/pgalloc.h> #include <asm/tlbflush.h> #include <asm/mmu_context.h> -diff -NurpP --minimal linux-2.6.36/arch/sparc/include/asm/unistd.h linux-2.6.36-vs2.3.0.36.33/arch/sparc/include/asm/unistd.h +diff -NurpP --minimal linux-2.6.36/arch/sparc/include/asm/unistd.h linux-2.6.36-vs2.3.0.36.36/arch/sparc/include/asm/unistd.h --- linux-2.6.36/arch/sparc/include/asm/unistd.h 2010-10-21 13:06:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/sparc/include/asm/unistd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/sparc/include/asm/unistd.h 2010-10-21 13:09:36.000000000 +0200 @@ -335,7 +335,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -720,9 +720,9 @@ diff -NurpP --minimal linux-2.6.36/arch/sparc/include/asm/unistd.h linux-2.6.36- #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-2.6.36/arch/sparc/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/sparc/Kconfig +diff -NurpP --minimal linux-2.6.36/arch/sparc/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/sparc/Kconfig --- linux-2.6.36/arch/sparc/Kconfig 2010-10-21 13:06:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/sparc/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/sparc/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -565,6 +565,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -732,9 +732,9 @@ diff -NurpP --minimal linux-2.6.36/arch/sparc/Kconfig linux-2.6.36-vs2.3.0.36.33 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36/arch/sparc/kernel/systbls_32.S linux-2.6.36-vs2.3.0.36.33/arch/sparc/kernel/systbls_32.S +diff -NurpP --minimal linux-2.6.36/arch/sparc/kernel/systbls_32.S linux-2.6.36-vs2.3.0.36.36/arch/sparc/kernel/systbls_32.S --- linux-2.6.36/arch/sparc/kernel/systbls_32.S 2010-10-21 13:06:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/sparc/kernel/systbls_32.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/sparc/kernel/systbls_32.S 2010-10-21 13:09:36.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 @@ -744,9 +744,9 @@ diff -NurpP --minimal linux-2.6.36/arch/sparc/kernel/systbls_32.S linux-2.6.36-v /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat -diff -NurpP --minimal linux-2.6.36/arch/sparc/kernel/systbls_64.S linux-2.6.36-vs2.3.0.36.33/arch/sparc/kernel/systbls_64.S +diff -NurpP --minimal linux-2.6.36/arch/sparc/kernel/systbls_64.S linux-2.6.36-vs2.3.0.36.36/arch/sparc/kernel/systbls_64.S --- linux-2.6.36/arch/sparc/kernel/systbls_64.S 2010-10-21 13:06:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/sparc/kernel/systbls_64.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/sparc/kernel/systbls_64.S 2010-10-21 13:09:36.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 @@ -765,9 +765,9 @@ diff -NurpP --minimal linux-2.6.36/arch/sparc/kernel/systbls_64.S linux-2.6.36-v /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat -diff -NurpP --minimal linux-2.6.36/arch/um/include/asm/tlb.h linux-2.6.36-vs2.3.0.36.33/arch/um/include/asm/tlb.h +diff -NurpP --minimal linux-2.6.36/arch/um/include/asm/tlb.h linux-2.6.36-vs2.3.0.36.36/arch/um/include/asm/tlb.h --- linux-2.6.36/arch/um/include/asm/tlb.h 2009-09-10 15:25:46.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/um/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/um/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200 @@ -3,6 +3,7 @@ #include <linux/pagemap.h> @@ -776,14 +776,14 @@ diff -NurpP --minimal linux-2.6.36/arch/um/include/asm/tlb.h linux-2.6.36-vs2.3. #include <asm/percpu.h> #include <asm/pgalloc.h> #include <asm/tlbflush.h> -diff -NurpP --minimal linux-2.6.36/arch/um/include/shared/kern_constants.h linux-2.6.36-vs2.3.0.36.33/arch/um/include/shared/kern_constants.h +diff -NurpP --minimal linux-2.6.36/arch/um/include/shared/kern_constants.h linux-2.6.36-vs2.3.0.36.36/arch/um/include/shared/kern_constants.h --- linux-2.6.36/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/arch/um/include/shared/kern_constants.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/um/include/shared/kern_constants.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../include/generated/asm-offsets.h" -diff -NurpP --minimal linux-2.6.36/arch/um/include/shared/user_constants.h linux-2.6.36-vs2.3.0.36.33/arch/um/include/shared/user_constants.h +diff -NurpP --minimal linux-2.6.36/arch/um/include/shared/user_constants.h linux-2.6.36-vs2.3.0.36.36/arch/um/include/shared/user_constants.h --- linux-2.6.36/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/arch/um/include/shared/user_constants.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/um/include/shared/user_constants.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,40 @@ +/* + * DO NOT MODIFY. @@ -825,9 +825,9 @@ diff -NurpP --minimal linux-2.6.36/arch/um/include/shared/user_constants.h linux +#define UM_PROT_WRITE 2 /* PROT_WRITE # */ +#define UM_PROT_EXEC 4 /* PROT_EXEC # */ + -diff -NurpP --minimal linux-2.6.36/arch/um/Kconfig.rest linux-2.6.36-vs2.3.0.36.33/arch/um/Kconfig.rest +diff -NurpP --minimal linux-2.6.36/arch/um/Kconfig.rest linux-2.6.36-vs2.3.0.36.36/arch/um/Kconfig.rest --- linux-2.6.36/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/um/Kconfig.rest 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/um/Kconfig.rest 2010-10-21 13:09:36.000000000 +0200 @@ -18,6 +18,8 @@ source "drivers/connector/Kconfig" source "fs/Kconfig" @@ -837,9 +837,9 @@ diff -NurpP --minimal linux-2.6.36/arch/um/Kconfig.rest linux-2.6.36-vs2.3.0.36. source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36/arch/x86/ia32/ia32entry.S linux-2.6.36-vs2.3.0.36.33/arch/x86/ia32/ia32entry.S +diff -NurpP --minimal linux-2.6.36/arch/x86/ia32/ia32entry.S linux-2.6.36-vs2.3.0.36.36/arch/x86/ia32/ia32entry.S --- linux-2.6.36/arch/x86/ia32/ia32entry.S 2010-10-21 13:06:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/x86/ia32/ia32entry.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/x86/ia32/ia32entry.S 2010-10-21 13:09:36.000000000 +0200 @@ -783,7 +783,7 @@ ia32_sys_call_table: .quad sys_tgkill /* 270 */ .quad compat_sys_utimes @@ -849,9 +849,9 @@ diff -NurpP --minimal linux-2.6.36/arch/x86/ia32/ia32entry.S linux-2.6.36-vs2.3. .quad sys_mbind .quad compat_sys_get_mempolicy /* 275 */ .quad sys_set_mempolicy -diff -NurpP --minimal linux-2.6.36/arch/x86/include/asm/unistd_64.h linux-2.6.36-vs2.3.0.36.33/arch/x86/include/asm/unistd_64.h +diff -NurpP --minimal linux-2.6.36/arch/x86/include/asm/unistd_64.h linux-2.6.36-vs2.3.0.36.36/arch/x86/include/asm/unistd_64.h --- linux-2.6.36/arch/x86/include/asm/unistd_64.h 2010-10-21 13:06:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/x86/include/asm/unistd_64.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/x86/include/asm/unistd_64.h 2010-10-21 13:09:36.000000000 +0200 @@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill) #define __NR_utimes 235 __SYSCALL(__NR_utimes, sys_utimes) @@ -861,9 +861,9 @@ diff -NurpP --minimal linux-2.6.36/arch/x86/include/asm/unistd_64.h linux-2.6.36 #define __NR_mbind 237 __SYSCALL(__NR_mbind, sys_mbind) #define __NR_set_mempolicy 238 -diff -NurpP --minimal linux-2.6.36/arch/x86/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/x86/Kconfig +diff -NurpP --minimal linux-2.6.36/arch/x86/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/x86/Kconfig --- linux-2.6.36/arch/x86/Kconfig 2010-10-21 13:06:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/x86/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/x86/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -2135,6 +2135,8 @@ source "fs/Kconfig" source "arch/x86/Kconfig.debug" @@ -873,9 +873,9 @@ diff -NurpP --minimal linux-2.6.36/arch/x86/Kconfig linux-2.6.36-vs2.3.0.36.33/a source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36/arch/x86/kernel/syscall_table_32.S linux-2.6.36-vs2.3.0.36.33/arch/x86/kernel/syscall_table_32.S +diff -NurpP --minimal linux-2.6.36/arch/x86/kernel/syscall_table_32.S linux-2.6.36-vs2.3.0.36.36/arch/x86/kernel/syscall_table_32.S --- linux-2.6.36/arch/x86/kernel/syscall_table_32.S 2010-10-21 13:07:00.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/arch/x86/kernel/syscall_table_32.S 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/arch/x86/kernel/syscall_table_32.S 2010-10-21 13:09:36.000000000 +0200 @@ -272,7 +272,7 @@ ENTRY(sys_call_table) .long sys_tgkill /* 270 */ .long sys_utimes @@ -885,9 +885,9 @@ diff -NurpP --minimal linux-2.6.36/arch/x86/kernel/syscall_table_32.S linux-2.6. .long sys_mbind .long sys_get_mempolicy .long sys_set_mempolicy -diff -NurpP --minimal linux-2.6.36/Documentation/vserver/debug.txt linux-2.6.36-vs2.3.0.36.33/Documentation/vserver/debug.txt +diff -NurpP --minimal linux-2.6.36/Documentation/vserver/debug.txt linux-2.6.36-vs2.3.0.36.36/Documentation/vserver/debug.txt --- linux-2.6.36/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/Documentation/vserver/debug.txt 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/Documentation/vserver/debug.txt 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -1043,9 +1043,9 @@ diff -NurpP --minimal linux-2.6.36/Documentation/vserver/debug.txt linux-2.6.36- + 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-2.6.36/drivers/block/Kconfig linux-2.6.36-vs2.3.0.36.33/drivers/block/Kconfig +diff -NurpP --minimal linux-2.6.36/drivers/block/Kconfig linux-2.6.36-vs2.3.0.36.36/drivers/block/Kconfig --- linux-2.6.36/drivers/block/Kconfig 2010-08-02 16:52:14.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/block/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/block/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP source "drivers/block/drbd/Kconfig" @@ -1060,9 +1060,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/block/Kconfig linux-2.6.36-vs2.3.0.36 config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-2.6.36/drivers/block/loop.c linux-2.6.36-vs2.3.0.36.33/drivers/block/loop.c +diff -NurpP --minimal linux-2.6.36/drivers/block/loop.c linux-2.6.36-vs2.3.0.36.36/drivers/block/loop.c --- linux-2.6.36/drivers/block/loop.c 2010-10-21 13:07:02.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/block/loop.c 2010-10-21 13:11:25.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/block/loop.c 2010-10-21 13:11:25.000000000 +0200 @@ -74,6 +74,7 @@ #include <linux/highmem.h> #include <linux/kthread.h> @@ -1116,9 +1116,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/block/loop.c linux-2.6.36-vs2.3.0.36. lock_kernel(); mutex_lock(&lo->lo_ctl_mutex); lo->lo_refcnt++; -diff -NurpP --minimal linux-2.6.36/drivers/block/Makefile linux-2.6.36-vs2.3.0.36.33/drivers/block/Makefile +diff -NurpP --minimal linux-2.6.36/drivers/block/Makefile linux-2.6.36-vs2.3.0.36.36/drivers/block/Makefile --- linux-2.6.36/drivers/block/Makefile 2010-02-25 11:51:36.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/block/Makefile 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/block/Makefile 2010-10-21 13:09:36.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 @@ -1127,9 +1127,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/block/Makefile linux-2.6.36-vs2.3.0.3 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_BLK_DEV_DRBD) += drbd/ -diff -NurpP --minimal linux-2.6.36/drivers/block/vroot.c linux-2.6.36-vs2.3.0.36.33/drivers/block/vroot.c +diff -NurpP --minimal linux-2.6.36/drivers/block/vroot.c linux-2.6.36-vs2.3.0.36.36/drivers/block/vroot.c --- linux-2.6.36/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/block/vroot.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/block/vroot.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,282 @@ +/* + * linux/drivers/block/vroot.c @@ -1413,9 +1413,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/block/vroot.c linux-2.6.36-vs2.3.0.36 + +#endif + -diff -NurpP --minimal linux-2.6.36/drivers/char/sysrq.c linux-2.6.36-vs2.3.0.36.33/drivers/char/sysrq.c +diff -NurpP --minimal linux-2.6.36/drivers/char/sysrq.c linux-2.6.36-vs2.3.0.36.36/drivers/char/sysrq.c --- linux-2.6.36/drivers/char/sysrq.c 2010-10-21 13:07:02.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/char/sysrq.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/char/sysrq.c 2010-10-21 13:09:36.000000000 +0200 @@ -41,6 +41,7 @@ #include <linux/oom.h> #include <linux/slab.h> @@ -1467,9 +1467,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/char/sysrq.c linux-2.6.36-vs2.3.0.36. else retval = -1; return retval; -diff -NurpP --minimal linux-2.6.36/drivers/char/tty_io.c linux-2.6.36-vs2.3.0.36.33/drivers/char/tty_io.c +diff -NurpP --minimal linux-2.6.36/drivers/char/tty_io.c linux-2.6.36-vs2.3.0.36.36/drivers/char/tty_io.c --- linux-2.6.36/drivers/char/tty_io.c 2010-10-21 13:07:02.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/char/tty_io.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/char/tty_io.c 2010-10-21 13:09:36.000000000 +0200 @@ -106,6 +106,7 @@ #include <linux/kmod.h> @@ -1496,9 +1496,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/char/tty_io.c linux-2.6.36-vs2.3.0.36 if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/r100_reg_safe.h linux-2.6.36-vs2.3.0.36.33/drivers/gpu/drm/radeon/r100_reg_safe.h +diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/r100_reg_safe.h linux-2.6.36-vs2.3.0.36.36/drivers/gpu/drm/radeon/r100_reg_safe.h --- linux-2.6.36/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/gpu/drm/radeon/r100_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/gpu/drm/radeon/r100_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,28 @@ +static const unsigned r100_reg_safe_bm[102] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -1528,9 +1528,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/r100_reg_safe.h linux- + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFEF, +}; -diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/r200_reg_safe.h linux-2.6.36-vs2.3.0.36.33/drivers/gpu/drm/radeon/r200_reg_safe.h +diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/r200_reg_safe.h linux-2.6.36-vs2.3.0.36.36/drivers/gpu/drm/radeon/r200_reg_safe.h --- linux-2.6.36/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/gpu/drm/radeon/r200_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/gpu/drm/radeon/r200_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,28 @@ +static const unsigned r200_reg_safe_bm[102] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -1560,9 +1560,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/r200_reg_safe.h linux- + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFE3F, 0xFFFFFFEF, +}; -diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/r300_reg_safe.h linux-2.6.36-vs2.3.0.36.33/drivers/gpu/drm/radeon/r300_reg_safe.h +diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/r300_reg_safe.h linux-2.6.36-vs2.3.0.36.36/drivers/gpu/drm/radeon/r300_reg_safe.h --- linux-2.6.36/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/gpu/drm/radeon/r300_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/gpu/drm/radeon/r300_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,42 @@ +static const unsigned r300_reg_safe_bm[159] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -1606,9 +1606,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/r300_reg_safe.h linux- + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0003FC01, 0xFFFFFCF8, 0xFF800B19, +}; -diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/r420_reg_safe.h linux-2.6.36-vs2.3.0.36.33/drivers/gpu/drm/radeon/r420_reg_safe.h +diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/r420_reg_safe.h linux-2.6.36-vs2.3.0.36.36/drivers/gpu/drm/radeon/r420_reg_safe.h --- linux-2.6.36/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/gpu/drm/radeon/r420_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/gpu/drm/radeon/r420_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,42 @@ +static const unsigned r420_reg_safe_bm[159] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -1652,9 +1652,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/r420_reg_safe.h linux- + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0003FC01, 0xFFFFFCF8, 0xFF800B19, +}; -diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-2.6.36-vs2.3.0.36.33/drivers/gpu/drm/radeon/rn50_reg_safe.h +diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-2.6.36-vs2.3.0.36.36/drivers/gpu/drm/radeon/rn50_reg_safe.h --- linux-2.6.36/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/gpu/drm/radeon/rn50_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/gpu/drm/radeon/rn50_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,28 @@ +static const unsigned rn50_reg_safe_bm[102] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -1684,9 +1684,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/rn50_reg_safe.h linux- + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, +}; -diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-2.6.36-vs2.3.0.36.33/drivers/gpu/drm/radeon/rs600_reg_safe.h +diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-2.6.36-vs2.3.0.36.36/drivers/gpu/drm/radeon/rs600_reg_safe.h --- linux-2.6.36/drivers/gpu/drm/radeon/rs600_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/gpu/drm/radeon/rs600_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/gpu/drm/radeon/rs600_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,57 @@ +static const unsigned rs600_reg_safe_bm[219] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -1745,9 +1745,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/rs600_reg_safe.h linux + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, +}; -diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-2.6.36-vs2.3.0.36.33/drivers/gpu/drm/radeon/rv515_reg_safe.h +diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-2.6.36-vs2.3.0.36.36/drivers/gpu/drm/radeon/rv515_reg_safe.h --- linux-2.6.36/drivers/gpu/drm/radeon/rv515_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/gpu/drm/radeon/rv515_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/gpu/drm/radeon/rv515_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,57 @@ +static const unsigned rv515_reg_safe_bm[219] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -1806,9 +1806,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/gpu/drm/radeon/rv515_reg_safe.h linux + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, +}; -diff -NurpP --minimal linux-2.6.36/drivers/infiniband/core/addr.c linux-2.6.36-vs2.3.0.36.33/drivers/infiniband/core/addr.c +diff -NurpP --minimal linux-2.6.36/drivers/infiniband/core/addr.c linux-2.6.36-vs2.3.0.36.36/drivers/infiniband/core/addr.c --- linux-2.6.36/drivers/infiniband/core/addr.c 2010-10-21 13:07:05.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/infiniband/core/addr.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/infiniband/core/addr.c 2010-10-21 13:09:36.000000000 +0200 @@ -252,7 +252,7 @@ static int addr6_resolve(struct sockaddr if (ipv6_addr_any(&fl.fl6_src)) { @@ -1818,9 +1818,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/infiniband/core/addr.c linux-2.6.36-v if (ret) goto put; -diff -NurpP --minimal linux-2.6.36/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.36-vs2.3.0.36.33/drivers/infiniband/hw/ipath/ipath_user_pages.c +diff -NurpP --minimal linux-2.6.36/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.36-vs2.3.0.36.36/drivers/infiniband/hw/ipath/ipath_user_pages.c --- linux-2.6.36/drivers/infiniband/hw/ipath/ipath_user_pages.c 2010-07-07 18:31:19.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/infiniband/hw/ipath/ipath_user_pages.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/infiniband/hw/ipath/ipath_user_pages.c 2010-10-21 13:09:36.000000000 +0200 @@ -35,6 +35,7 @@ #include <linux/device.h> #include <linux/slab.h> @@ -1829,9 +1829,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/infiniband/hw/ipath/ipath_user_pages. #include "ipath_kernel.h" -diff -NurpP --minimal linux-2.6.36/drivers/md/dm.c linux-2.6.36-vs2.3.0.36.33/drivers/md/dm.c +diff -NurpP --minimal linux-2.6.36/drivers/md/dm.c linux-2.6.36-vs2.3.0.36.36/drivers/md/dm.c --- linux-2.6.36/drivers/md/dm.c 2010-10-21 13:07:07.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/md/dm.c 2010-10-21 15:19:30.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/md/dm.c 2010-10-21 15:19:30.000000000 +0200 @@ -21,6 +21,7 @@ #include <linux/idr.h> #include <linux/hdreg.h> @@ -1906,9 +1906,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/md/dm.c linux-2.6.36-vs2.3.0.36.33/dr md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad_queue; -diff -NurpP --minimal linux-2.6.36/drivers/md/dm.h linux-2.6.36-vs2.3.0.36.33/drivers/md/dm.h +diff -NurpP --minimal linux-2.6.36/drivers/md/dm.h linux-2.6.36-vs2.3.0.36.36/drivers/md/dm.h --- linux-2.6.36/drivers/md/dm.h 2010-10-21 13:07:07.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/md/dm.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/md/dm.h 2010-10-21 13:09:36.000000000 +0200 @@ -41,6 +41,8 @@ struct dm_dev_internal { struct dm_table; struct dm_md_mempools; @@ -1918,9 +1918,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/md/dm.h linux-2.6.36-vs2.3.0.36.33/dr /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-2.6.36/drivers/md/dm-ioctl.c linux-2.6.36-vs2.3.0.36.33/drivers/md/dm-ioctl.c +diff -NurpP --minimal linux-2.6.36/drivers/md/dm-ioctl.c linux-2.6.36-vs2.3.0.36.36/drivers/md/dm-ioctl.c --- linux-2.6.36/drivers/md/dm-ioctl.c 2010-10-21 13:07:07.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/md/dm-ioctl.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/md/dm-ioctl.c 2010-10-21 13:09:36.000000000 +0200 @@ -16,6 +16,7 @@ #include <linux/dm-ioctl.h> #include <linux/hdreg.h> @@ -2002,9 +2002,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/md/dm-ioctl.c linux-2.6.36-vs2.3.0.36 return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-2.6.36/drivers/net/tun.c linux-2.6.36-vs2.3.0.36.33/drivers/net/tun.c +diff -NurpP --minimal linux-2.6.36/drivers/net/tun.c linux-2.6.36-vs2.3.0.36.36/drivers/net/tun.c --- linux-2.6.36/drivers/net/tun.c 2010-10-21 13:07:15.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/drivers/net/tun.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/drivers/net/tun.c 2010-10-21 13:09:36.000000000 +0200 @@ -62,6 +62,7 @@ #include <linux/nsproxy.h> #include <linux/virtio_net.h> @@ -2074,9 +2074,9 @@ diff -NurpP --minimal linux-2.6.36/drivers/net/tun.c linux-2.6.36-vs2.3.0.36.33/ case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-2.6.36/fs/attr.c linux-2.6.36-vs2.3.0.36.33/fs/attr.c +diff -NurpP --minimal linux-2.6.36/fs/attr.c linux-2.6.36-vs2.3.0.36.36/fs/attr.c --- linux-2.6.36/fs/attr.c 2010-10-21 13:07:47.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/attr.c 2010-10-21 14:04:40.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/attr.c 2010-10-21 14:04:40.000000000 +0200 @@ -13,6 +13,9 @@ #include <linux/fsnotify.h> #include <linux/fcntl.h> @@ -2117,9 +2117,9 @@ diff -NurpP --minimal linux-2.6.36/fs/attr.c linux-2.6.36-vs2.3.0.36.33/fs/attr. if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-2.6.36/fs/binfmt_aout.c linux-2.6.36-vs2.3.0.36.33/fs/binfmt_aout.c +diff -NurpP --minimal linux-2.6.36/fs/binfmt_aout.c linux-2.6.36-vs2.3.0.36.36/fs/binfmt_aout.c --- linux-2.6.36/fs/binfmt_aout.c 2010-10-21 13:07:47.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/binfmt_aout.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/binfmt_aout.c 2010-10-21 13:09:36.000000000 +0200 @@ -25,6 +25,7 @@ #include <linux/init.h> #include <linux/coredump.h> @@ -2128,9 +2128,9 @@ diff -NurpP --minimal linux-2.6.36/fs/binfmt_aout.c linux-2.6.36-vs2.3.0.36.33/f #include <asm/system.h> #include <asm/uaccess.h> -diff -NurpP --minimal linux-2.6.36/fs/binfmt_elf.c linux-2.6.36-vs2.3.0.36.33/fs/binfmt_elf.c +diff -NurpP --minimal linux-2.6.36/fs/binfmt_elf.c linux-2.6.36-vs2.3.0.36.36/fs/binfmt_elf.c --- linux-2.6.36/fs/binfmt_elf.c 2010-07-07 18:31:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/binfmt_elf.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/binfmt_elf.c 2010-10-21 13:09:36.000000000 +0200 @@ -32,6 +32,7 @@ #include <linux/elf.h> #include <linux/utsname.h> @@ -2139,9 +2139,9 @@ diff -NurpP --minimal linux-2.6.36/fs/binfmt_elf.c linux-2.6.36-vs2.3.0.36.33/fs #include <asm/uaccess.h> #include <asm/param.h> #include <asm/page.h> -diff -NurpP --minimal linux-2.6.36/fs/binfmt_flat.c linux-2.6.36-vs2.3.0.36.33/fs/binfmt_flat.c +diff -NurpP --minimal linux-2.6.36/fs/binfmt_flat.c linux-2.6.36-vs2.3.0.36.36/fs/binfmt_flat.c --- linux-2.6.36/fs/binfmt_flat.c 2010-08-02 16:52:47.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/binfmt_flat.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/binfmt_flat.c 2010-10-21 13:09:36.000000000 +0200 @@ -35,6 +35,7 @@ #include <linux/init.h> #include <linux/flat.h> @@ -2150,9 +2150,9 @@ diff -NurpP --minimal linux-2.6.36/fs/binfmt_flat.c linux-2.6.36-vs2.3.0.36.33/f #include <asm/byteorder.h> #include <asm/system.h> -diff -NurpP --minimal linux-2.6.36/fs/binfmt_som.c linux-2.6.36-vs2.3.0.36.33/fs/binfmt_som.c +diff -NurpP --minimal linux-2.6.36/fs/binfmt_som.c linux-2.6.36-vs2.3.0.36.36/fs/binfmt_som.c --- linux-2.6.36/fs/binfmt_som.c 2010-02-25 11:52:04.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/fs/binfmt_som.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/binfmt_som.c 2010-10-21 13:09:36.000000000 +0200 @@ -28,6 +28,7 @@ #include <linux/shm.h> #include <linux/personality.h> @@ -2161,9 +2161,9 @@ diff -NurpP --minimal linux-2.6.36/fs/binfmt_som.c linux-2.6.36-vs2.3.0.36.33/fs #include <asm/uaccess.h> #include <asm/pgtable.h> -diff -NurpP --minimal linux-2.6.36/fs/block_dev.c linux-2.6.36-vs2.3.0.36.33/fs/block_dev.c +diff -NurpP --minimal linux-2.6.36/fs/block_dev.c linux-2.6.36-vs2.3.0.36.36/fs/block_dev.c --- linux-2.6.36/fs/block_dev.c 2010-10-21 13:07:47.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/block_dev.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/block_dev.c 2010-10-21 13:09:36.000000000 +0200 @@ -26,6 +26,7 @@ #include <linux/namei.h> #include <linux/log2.h> @@ -2201,9 +2201,9 @@ diff -NurpP --minimal linux-2.6.36/fs/block_dev.c linux-2.6.36-vs2.3.0.36.33/fs/ if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-2.6.36/fs/btrfs/ctree.h linux-2.6.36-vs2.3.0.36.33/fs/btrfs/ctree.h +diff -NurpP --minimal linux-2.6.36/fs/btrfs/ctree.h linux-2.6.36-vs2.3.0.36.36/fs/btrfs/ctree.h --- linux-2.6.36/fs/btrfs/ctree.h 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/btrfs/ctree.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/btrfs/ctree.h 2010-10-21 13:09:36.000000000 +0200 @@ -551,11 +551,14 @@ struct btrfs_inode_item { /* modification sequence number for NFS */ __le64 sequence; @@ -2256,9 +2256,9 @@ diff -NurpP --minimal linux-2.6.36/fs/btrfs/ctree.h linux-2.6.36-vs2.3.0.36.33/f /* file.c */ int btrfs_sync_file(struct file *file, int datasync); -diff -NurpP --minimal linux-2.6.36/fs/btrfs/disk-io.c linux-2.6.36-vs2.3.0.36.33/fs/btrfs/disk-io.c +diff -NurpP --minimal linux-2.6.36/fs/btrfs/disk-io.c linux-2.6.36-vs2.3.0.36.36/fs/btrfs/disk-io.c --- linux-2.6.36/fs/btrfs/disk-io.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/btrfs/disk-io.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/btrfs/disk-io.c 2010-10-21 13:09:36.000000000 +0200 @@ -1707,6 +1707,9 @@ struct btrfs_root *open_ctree(struct sup goto fail_iput; } @@ -2269,9 +2269,9 @@ diff -NurpP --minimal linux-2.6.36/fs/btrfs/disk-io.c linux-2.6.36-vs2.3.0.36.33 features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-2.6.36/fs/btrfs/inode.c linux-2.6.36-vs2.3.0.36.33/fs/btrfs/inode.c +diff -NurpP --minimal linux-2.6.36/fs/btrfs/inode.c linux-2.6.36-vs2.3.0.36.36/fs/btrfs/inode.c --- linux-2.6.36/fs/btrfs/inode.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/btrfs/inode.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/btrfs/inode.c 2010-10-21 13:09:36.000000000 +0200 @@ -37,6 +37,8 @@ #include <linux/posix_acl.h> #include <linux/falloc.h> @@ -2340,9 +2340,9 @@ diff -NurpP --minimal linux-2.6.36/fs/btrfs/inode.c linux-2.6.36-vs2.3.0.36.33/f }; static const struct inode_operations btrfs_special_inode_operations = { .getattr = btrfs_getattr, -diff -NurpP --minimal linux-2.6.36/fs/btrfs/ioctl.c linux-2.6.36-vs2.3.0.36.33/fs/btrfs/ioctl.c +diff -NurpP --minimal linux-2.6.36/fs/btrfs/ioctl.c linux-2.6.36-vs2.3.0.36.36/fs/btrfs/ioctl.c --- linux-2.6.36/fs/btrfs/ioctl.c 2010-08-02 16:52:47.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/btrfs/ioctl.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/btrfs/ioctl.c 2010-10-21 13:09:36.000000000 +0200 @@ -68,10 +68,13 @@ static unsigned int btrfs_flags_to_ioctl { unsigned int iflags = 0; @@ -2524,9 +2524,9 @@ diff -NurpP --minimal linux-2.6.36/fs/btrfs/ioctl.c linux-2.6.36-vs2.3.0.36.33/f if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-2.6.36/fs/btrfs/super.c linux-2.6.36-vs2.3.0.36.33/fs/btrfs/super.c +diff -NurpP --minimal linux-2.6.36/fs/btrfs/super.c linux-2.6.36-vs2.3.0.36.36/fs/btrfs/super.c --- linux-2.6.36/fs/btrfs/super.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/btrfs/super.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/btrfs/super.c 2010-10-21 13:09:36.000000000 +0200 @@ -68,7 +68,7 @@ enum { Opt_nodatacow, Opt_max_inline, Opt_alloc_start, Opt_nobarrier, Opt_ssd, Opt_nossd, Opt_ssd_spread, Opt_thread_pool, Opt_noacl, Opt_compress, @@ -2582,9 +2582,9 @@ diff -NurpP --minimal linux-2.6.36/fs/btrfs/super.c linux-2.6.36-vs2.3.0.36.33/f if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) return 0; -diff -NurpP --minimal linux-2.6.36/fs/char_dev.c linux-2.6.36-vs2.3.0.36.33/fs/char_dev.c +diff -NurpP --minimal linux-2.6.36/fs/char_dev.c linux-2.6.36-vs2.3.0.36.36/fs/char_dev.c --- linux-2.6.36/fs/char_dev.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/char_dev.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/char_dev.c 2010-10-21 13:09:36.000000000 +0200 @@ -21,6 +21,8 @@ #include <linux/mutex.h> #include <linux/backing-dev.h> @@ -2617,9 +2617,9 @@ diff -NurpP --minimal linux-2.6.36/fs/char_dev.c linux-2.6.36-vs2.3.0.36.33/fs/c if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-2.6.36/fs/dcache.c linux-2.6.36-vs2.3.0.36.33/fs/dcache.c +diff -NurpP --minimal linux-2.6.36/fs/dcache.c linux-2.6.36-vs2.3.0.36.36/fs/dcache.c --- linux-2.6.36/fs/dcache.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/dcache.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/dcache.c 2010-10-21 13:09:36.000000000 +0200 @@ -33,6 +33,7 @@ #include <linux/bootmem.h> #include <linux/fs_struct.h> @@ -2671,9 +2671,9 @@ diff -NurpP --minimal linux-2.6.36/fs/dcache.c linux-2.6.36-vs2.3.0.36.33/fs/dca found = dentry; spin_unlock(&dentry->d_lock); break; -diff -NurpP --minimal linux-2.6.36/fs/devpts/inode.c linux-2.6.36-vs2.3.0.36.33/fs/devpts/inode.c +diff -NurpP --minimal linux-2.6.36/fs/devpts/inode.c linux-2.6.36-vs2.3.0.36.36/fs/devpts/inode.c --- linux-2.6.36/fs/devpts/inode.c 2010-08-02 16:52:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/devpts/inode.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/devpts/inode.c 2010-10-21 22:25:15.000000000 +0200 @@ -25,6 +25,7 @@ #include <linux/parser.h> #include <linux/fsnotify.h> @@ -2756,9 +2756,9 @@ diff -NurpP --minimal linux-2.6.36/fs/devpts/inode.c linux-2.6.36-vs2.3.0.36.33/ inode->i_private = tty; tty->driver_data = inode; -diff -NurpP --minimal linux-2.6.36/fs/ext2/balloc.c linux-2.6.36-vs2.3.0.36.33/fs/ext2/balloc.c +diff -NurpP --minimal linux-2.6.36/fs/ext2/balloc.c linux-2.6.36-vs2.3.0.36.36/fs/ext2/balloc.c --- linux-2.6.36/fs/ext2/balloc.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext2/balloc.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext2/balloc.c 2010-10-21 13:09:36.000000000 +0200 @@ -702,7 +702,6 @@ ext2_try_to_allocate(struct super_block start = 0; end = EXT2_BLOCKS_PER_GROUP(sb); @@ -2767,9 +2767,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext2/balloc.c linux-2.6.36-vs2.3.0.36.33/f BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-2.6.36/fs/ext2/ext2.h linux-2.6.36-vs2.3.0.36.33/fs/ext2/ext2.h +diff -NurpP --minimal linux-2.6.36/fs/ext2/ext2.h linux-2.6.36-vs2.3.0.36.36/fs/ext2/ext2.h --- linux-2.6.36/fs/ext2/ext2.h 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext2/ext2.h 2010-10-21 14:10:55.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext2/ext2.h 2010-10-21 14:10:55.000000000 +0200 @@ -127,6 +127,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, @@ -2778,18 +2778,18 @@ diff -NurpP --minimal linux-2.6.36/fs/ext2/ext2.h linux-2.6.36-vs2.3.0.36.33/fs/ /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-2.6.36/fs/ext2/file.c linux-2.6.36-vs2.3.0.36.33/fs/ext2/file.c +diff -NurpP --minimal linux-2.6.36/fs/ext2/file.c linux-2.6.36-vs2.3.0.36.36/fs/ext2/file.c --- linux-2.6.36/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext2/file.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext2/file.c 2010-10-21 13:09:36.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-2.6.36/fs/ext2/ialloc.c linux-2.6.36-vs2.3.0.36.33/fs/ext2/ialloc.c +diff -NurpP --minimal linux-2.6.36/fs/ext2/ialloc.c linux-2.6.36-vs2.3.0.36.36/fs/ext2/ialloc.c --- linux-2.6.36/fs/ext2/ialloc.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext2/ialloc.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext2/ialloc.c 2010-10-21 13:09:36.000000000 +0200 @@ -17,6 +17,7 @@ #include <linux/backing-dev.h> #include <linux/buffer_head.h> @@ -2806,9 +2806,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext2/ialloc.c linux-2.6.36-vs2.3.0.36.33/f } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-2.6.36/fs/ext2/inode.c linux-2.6.36-vs2.3.0.36.33/fs/ext2/inode.c +diff -NurpP --minimal linux-2.6.36/fs/ext2/inode.c linux-2.6.36-vs2.3.0.36.36/fs/ext2/inode.c --- linux-2.6.36/fs/ext2/inode.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext2/inode.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext2/inode.c 2010-10-21 13:09:36.000000000 +0200 @@ -32,6 +32,7 @@ #include <linux/mpage.h> #include <linux/fiemap.h> @@ -2957,9 +2957,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext2/inode.c linux-2.6.36-vs2.3.0.36.33/fs error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-2.6.36/fs/ext2/ioctl.c linux-2.6.36-vs2.3.0.36.33/fs/ext2/ioctl.c +diff -NurpP --minimal linux-2.6.36/fs/ext2/ioctl.c linux-2.6.36-vs2.3.0.36.36/fs/ext2/ioctl.c --- linux-2.6.36/fs/ext2/ioctl.c 2009-09-10 15:26:21.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext2/ioctl.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext2/ioctl.c 2010-10-21 13:09:36.000000000 +0200 @@ -17,6 +17,16 @@ #include <asm/uaccess.h> @@ -3009,9 +3009,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext2/ioctl.c linux-2.6.36-vs2.3.0.36.33/fs flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; mutex_unlock(&inode->i_mutex); -diff -NurpP --minimal linux-2.6.36/fs/ext2/namei.c linux-2.6.36-vs2.3.0.36.33/fs/ext2/namei.c +diff -NurpP --minimal linux-2.6.36/fs/ext2/namei.c linux-2.6.36-vs2.3.0.36.36/fs/ext2/namei.c --- linux-2.6.36/fs/ext2/namei.c 2010-07-07 18:31:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext2/namei.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext2/namei.c 2010-10-21 13:09:36.000000000 +0200 @@ -32,6 +32,7 @@ #include <linux/pagemap.h> @@ -3036,9 +3036,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext2/namei.c linux-2.6.36-vs2.3.0.36.33/fs }; const struct inode_operations ext2_special_inode_operations = { -diff -NurpP --minimal linux-2.6.36/fs/ext2/super.c linux-2.6.36-vs2.3.0.36.33/fs/ext2/super.c +diff -NurpP --minimal linux-2.6.36/fs/ext2/super.c linux-2.6.36-vs2.3.0.36.36/fs/ext2/super.c --- linux-2.6.36/fs/ext2/super.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext2/super.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext2/super.c 2010-10-21 13:09:36.000000000 +0200 @@ -378,7 +378,8 @@ enum { Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, @@ -3104,9 +3104,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext2/super.c linux-2.6.36-vs2.3.0.36.33/fs sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-2.6.36/fs/ext3/file.c linux-2.6.36-vs2.3.0.36.33/fs/ext3/file.c +diff -NurpP --minimal linux-2.6.36/fs/ext3/file.c linux-2.6.36-vs2.3.0.36.36/fs/ext3/file.c --- linux-2.6.36/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext3/file.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext3/file.c 2010-10-21 13:09:36.000000000 +0200 @@ -81,5 +81,6 @@ const struct inode_operations ext3_file_ #endif .check_acl = ext3_check_acl, @@ -3114,9 +3114,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext3/file.c linux-2.6.36-vs2.3.0.36.33/fs/ + .sync_flags = ext3_sync_flags, }; -diff -NurpP --minimal linux-2.6.36/fs/ext3/ialloc.c linux-2.6.36-vs2.3.0.36.33/fs/ext3/ialloc.c +diff -NurpP --minimal linux-2.6.36/fs/ext3/ialloc.c linux-2.6.36-vs2.3.0.36.36/fs/ext3/ialloc.c --- linux-2.6.36/fs/ext3/ialloc.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext3/ialloc.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext3/ialloc.c 2010-10-21 13:09:36.000000000 +0200 @@ -23,6 +23,7 @@ #include <linux/buffer_head.h> #include <linux/random.h> @@ -3133,9 +3133,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext3/ialloc.c linux-2.6.36-vs2.3.0.36.33/f } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-2.6.36/fs/ext3/inode.c linux-2.6.36-vs2.3.0.36.33/fs/ext3/inode.c +diff -NurpP --minimal linux-2.6.36/fs/ext3/inode.c linux-2.6.36-vs2.3.0.36.36/fs/ext3/inode.c --- linux-2.6.36/fs/ext3/inode.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext3/inode.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext3/inode.c 2010-10-21 13:09:36.000000000 +0200 @@ -38,6 +38,7 @@ #include <linux/bio.h> #include <linux/fiemap.h> @@ -3319,9 +3319,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext3/inode.c linux-2.6.36-vs2.3.0.36.33/fs error = ext3_mark_inode_dirty(handle, inode); ext3_journal_stop(handle); } -diff -NurpP --minimal linux-2.6.36/fs/ext3/ioctl.c linux-2.6.36-vs2.3.0.36.33/fs/ext3/ioctl.c +diff -NurpP --minimal linux-2.6.36/fs/ext3/ioctl.c linux-2.6.36-vs2.3.0.36.36/fs/ext3/ioctl.c --- linux-2.6.36/fs/ext3/ioctl.c 2009-06-11 17:13:03.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext3/ioctl.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext3/ioctl.c 2010-10-21 13:09:36.000000000 +0200 @@ -8,6 +8,7 @@ */ @@ -3397,9 +3397,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext3/ioctl.c linux-2.6.36-vs2.3.0.36.33/fs flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-2.6.36/fs/ext3/namei.c linux-2.6.36-vs2.3.0.36.33/fs/ext3/namei.c +diff -NurpP --minimal linux-2.6.36/fs/ext3/namei.c linux-2.6.36-vs2.3.0.36.36/fs/ext3/namei.c --- linux-2.6.36/fs/ext3/namei.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext3/namei.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext3/namei.c 2010-10-21 13:09:36.000000000 +0200 @@ -36,6 +36,7 @@ #include <linux/quotaops.h> #include <linux/buffer_head.h> @@ -3424,9 +3424,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext3/namei.c linux-2.6.36-vs2.3.0.36.33/fs }; const struct inode_operations ext3_special_inode_operations = { -diff -NurpP --minimal linux-2.6.36/fs/ext3/super.c linux-2.6.36-vs2.3.0.36.33/fs/ext3/super.c +diff -NurpP --minimal linux-2.6.36/fs/ext3/super.c linux-2.6.36-vs2.3.0.36.36/fs/ext3/super.c --- linux-2.6.36/fs/ext3/super.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext3/super.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext3/super.c 2010-10-21 13:09:36.000000000 +0200 @@ -802,7 +802,8 @@ enum { Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, @@ -3493,9 +3493,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext3/super.c linux-2.6.36-vs2.3.0.36.33/fs sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-2.6.36/fs/ext4/ext4.h linux-2.6.36-vs2.3.0.36.33/fs/ext4/ext4.h +diff -NurpP --minimal linux-2.6.36/fs/ext4/ext4.h linux-2.6.36-vs2.3.0.36.36/fs/ext4/ext4.h --- linux-2.6.36/fs/ext4/ext4.h 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext4/ext4.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext4/ext4.h 2010-10-21 13:09:36.000000000 +0200 @@ -323,8 +323,12 @@ struct flex_groups { #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ @@ -3543,9 +3543,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext4/ext4.h linux-2.6.36-vs2.3.0.36.33/fs/ /* 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-2.6.36/fs/ext4/file.c linux-2.6.36-vs2.3.0.36.33/fs/ext4/file.c +diff -NurpP --minimal linux-2.6.36/fs/ext4/file.c linux-2.6.36-vs2.3.0.36.36/fs/ext4/file.c --- linux-2.6.36/fs/ext4/file.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext4/file.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext4/file.c 2010-10-21 13:09:36.000000000 +0200 @@ -161,5 +161,6 @@ const struct inode_operations ext4_file_ .check_acl = ext4_check_acl, .fallocate = ext4_fallocate, @@ -3553,9 +3553,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext4/file.c linux-2.6.36-vs2.3.0.36.33/fs/ + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-2.6.36/fs/ext4/ialloc.c linux-2.6.36-vs2.3.0.36.33/fs/ext4/ialloc.c +diff -NurpP --minimal linux-2.6.36/fs/ext4/ialloc.c linux-2.6.36-vs2.3.0.36.36/fs/ext4/ialloc.c --- linux-2.6.36/fs/ext4/ialloc.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext4/ialloc.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext4/ialloc.c 2010-10-21 13:09:36.000000000 +0200 @@ -22,6 +22,7 @@ #include <linux/random.h> #include <linux/bitops.h> @@ -3572,9 +3572,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext4/ialloc.c linux-2.6.36-vs2.3.0.36.33/f } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-2.6.36/fs/ext4/inode.c linux-2.6.36-vs2.3.0.36.33/fs/ext4/inode.c +diff -NurpP --minimal linux-2.6.36/fs/ext4/inode.c linux-2.6.36-vs2.3.0.36.36/fs/ext4/inode.c --- linux-2.6.36/fs/ext4/inode.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext4/inode.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext4/inode.c 2010-10-21 13:09:36.000000000 +0200 @@ -40,6 +40,7 @@ #include <linux/workqueue.h> #include <linux/kernel.h> @@ -3761,9 +3761,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext4/inode.c linux-2.6.36-vs2.3.0.36.33/fs error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-2.6.36/fs/ext4/ioctl.c linux-2.6.36-vs2.3.0.36.33/fs/ext4/ioctl.c +diff -NurpP --minimal linux-2.6.36/fs/ext4/ioctl.c linux-2.6.36-vs2.3.0.36.36/fs/ext4/ioctl.c --- linux-2.6.36/fs/ext4/ioctl.c 2010-08-02 16:52:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext4/ioctl.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext4/ioctl.c 2010-10-21 13:09:36.000000000 +0200 @@ -14,10 +14,39 @@ #include <linux/compat.h> #include <linux/mount.h> @@ -3827,9 +3827,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext4/ioctl.c linux-2.6.36-vs2.3.0.36.33/fs if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-2.6.36/fs/ext4/namei.c linux-2.6.36-vs2.3.0.36.33/fs/ext4/namei.c +diff -NurpP --minimal linux-2.6.36/fs/ext4/namei.c linux-2.6.36-vs2.3.0.36.36/fs/ext4/namei.c --- linux-2.6.36/fs/ext4/namei.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext4/namei.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext4/namei.c 2010-10-21 13:09:36.000000000 +0200 @@ -34,6 +34,7 @@ #include <linux/quotaops.h> #include <linux/buffer_head.h> @@ -3854,9 +3854,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext4/namei.c linux-2.6.36-vs2.3.0.36.33/fs }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-2.6.36/fs/ext4/super.c linux-2.6.36-vs2.3.0.36.33/fs/ext4/super.c +diff -NurpP --minimal linux-2.6.36/fs/ext4/super.c linux-2.6.36-vs2.3.0.36.36/fs/ext4/super.c --- linux-2.6.36/fs/ext4/super.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ext4/super.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ext4/super.c 2010-10-21 13:09:36.000000000 +0200 @@ -1219,6 +1219,7 @@ enum { Opt_inode_readahead_blks, Opt_journal_ioprio, Opt_dioread_nolock, Opt_dioread_lock, @@ -3921,9 +3921,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ext4/super.c linux-2.6.36-vs2.3.0.36.33/fs sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-2.6.36/fs/fcntl.c linux-2.6.36-vs2.3.0.36.33/fs/fcntl.c +diff -NurpP --minimal linux-2.6.36/fs/fcntl.c linux-2.6.36-vs2.3.0.36.36/fs/fcntl.c --- linux-2.6.36/fs/fcntl.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/fcntl.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/fcntl.c 2010-10-21 13:09:36.000000000 +0200 @@ -20,6 +20,7 @@ #include <linux/signal.h> #include <linux/rcupdate.h> @@ -3950,9 +3950,9 @@ diff -NurpP --minimal linux-2.6.36/fs/fcntl.c linux-2.6.36-vs2.3.0.36.33/fs/fcnt err = security_file_fcntl(filp, cmd, arg); if (err) { -diff -NurpP --minimal linux-2.6.36/fs/file.c linux-2.6.36-vs2.3.0.36.33/fs/file.c +diff -NurpP --minimal linux-2.6.36/fs/file.c linux-2.6.36-vs2.3.0.36.36/fs/file.c --- linux-2.6.36/fs/file.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/file.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/file.c 2010-10-21 13:09:36.000000000 +0200 @@ -20,6 +20,7 @@ #include <linux/spinlock.h> #include <linux/rcupdate.h> @@ -3978,9 +3978,9 @@ diff -NurpP --minimal linux-2.6.36/fs/file.c linux-2.6.36-vs2.3.0.36.33/fs/file. #if 1 /* Sanity check */ if (rcu_dereference_raw(fdt->fd[fd]) != NULL) { -diff -NurpP --minimal linux-2.6.36/fs/file_table.c linux-2.6.36-vs2.3.0.36.33/fs/file_table.c +diff -NurpP --minimal linux-2.6.36/fs/file_table.c linux-2.6.36-vs2.3.0.36.36/fs/file_table.c --- linux-2.6.36/fs/file_table.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/file_table.c 2010-10-21 14:10:28.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/file_table.c 2010-10-21 14:10:28.000000000 +0200 @@ -24,6 +24,8 @@ #include <linux/percpu_counter.h> #include <linux/percpu.h> @@ -4017,9 +4017,9 @@ diff -NurpP --minimal linux-2.6.36/fs/file_table.c linux-2.6.36-vs2.3.0.36.33/fs file_sb_list_del(file); file_free(file); } -diff -NurpP --minimal linux-2.6.36/fs/fs_struct.c linux-2.6.36-vs2.3.0.36.33/fs/fs_struct.c +diff -NurpP --minimal linux-2.6.36/fs/fs_struct.c linux-2.6.36-vs2.3.0.36.36/fs/fs_struct.c --- linux-2.6.36/fs/fs_struct.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/fs_struct.c 2010-10-21 13:56:13.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/fs_struct.c 2010-10-21 13:56:13.000000000 +0200 @@ -4,6 +4,7 @@ #include <linux/path.h> #include <linux/slab.h> @@ -4044,9 +4044,9 @@ diff -NurpP --minimal linux-2.6.36/fs/fs_struct.c linux-2.6.36-vs2.3.0.36.33/fs/ } return fs; } -diff -NurpP --minimal linux-2.6.36/fs/gfs2/file.c linux-2.6.36-vs2.3.0.36.33/fs/gfs2/file.c +diff -NurpP --minimal linux-2.6.36/fs/gfs2/file.c linux-2.6.36-vs2.3.0.36.36/fs/gfs2/file.c --- linux-2.6.36/fs/gfs2/file.c 2010-10-21 13:07:49.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/gfs2/file.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/gfs2/file.c 2010-10-21 13:09:36.000000000 +0200 @@ -132,6 +132,9 @@ static const u32 fsflags_to_gfs2[32] = { [7] = GFS2_DIF_NOATIME, [12] = GFS2_DIF_EXHASH, @@ -4167,9 +4167,9 @@ diff -NurpP --minimal linux-2.6.36/fs/gfs2/file.c linux-2.6.36-vs2.3.0.36.33/fs/ static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-2.6.36/fs/gfs2/inode.h linux-2.6.36-vs2.3.0.36.33/fs/gfs2/inode.h +diff -NurpP --minimal linux-2.6.36/fs/gfs2/inode.h linux-2.6.36-vs2.3.0.36.36/fs/gfs2/inode.h --- linux-2.6.36/fs/gfs2/inode.h 2010-08-02 16:52:49.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/gfs2/inode.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/gfs2/inode.h 2010-10-21 13:09:36.000000000 +0200 @@ -109,6 +109,7 @@ extern const struct file_operations gfs2 extern const struct file_operations gfs2_dir_fops_nolock; @@ -4178,9 +4178,9 @@ diff -NurpP --minimal linux-2.6.36/fs/gfs2/inode.h linux-2.6.36-vs2.3.0.36.33/fs #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-2.6.36/fs/gfs2/ops_inode.c linux-2.6.36-vs2.3.0.36.33/fs/gfs2/ops_inode.c +diff -NurpP --minimal linux-2.6.36/fs/gfs2/ops_inode.c linux-2.6.36-vs2.3.0.36.36/fs/gfs2/ops_inode.c --- linux-2.6.36/fs/gfs2/ops_inode.c 2010-10-21 13:07:49.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/gfs2/ops_inode.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/gfs2/ops_inode.c 2010-10-21 13:09:36.000000000 +0200 @@ -1352,6 +1352,7 @@ const struct inode_operations gfs2_file_ .listxattr = gfs2_listxattr, .removexattr = gfs2_removexattr, @@ -4197,9 +4197,9 @@ diff -NurpP --minimal linux-2.6.36/fs/gfs2/ops_inode.c linux-2.6.36-vs2.3.0.36.3 }; const struct inode_operations gfs2_symlink_iops = { -diff -NurpP --minimal linux-2.6.36/fs/hfsplus/ioctl.c linux-2.6.36-vs2.3.0.36.33/fs/hfsplus/ioctl.c +diff -NurpP --minimal linux-2.6.36/fs/hfsplus/ioctl.c linux-2.6.36-vs2.3.0.36.36/fs/hfsplus/ioctl.c --- linux-2.6.36/fs/hfsplus/ioctl.c 2010-08-02 16:52:49.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/hfsplus/ioctl.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/hfsplus/ioctl.c 2010-10-21 13:09:36.000000000 +0200 @@ -18,6 +18,7 @@ #include <linux/sched.h> #include <linux/xattr.h> @@ -4208,9 +4208,9 @@ diff -NurpP --minimal linux-2.6.36/fs/hfsplus/ioctl.c linux-2.6.36-vs2.3.0.36.33 #include <asm/uaccess.h> #include "hfsplus_fs.h" -diff -NurpP --minimal linux-2.6.36/fs/inode.c linux-2.6.36-vs2.3.0.36.33/fs/inode.c +diff -NurpP --minimal linux-2.6.36/fs/inode.c linux-2.6.36-vs2.3.0.36.36/fs/inode.c --- linux-2.6.36/fs/inode.c 2010-10-21 13:07:49.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/inode.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/inode.c 2010-10-21 13:09:36.000000000 +0200 @@ -24,6 +24,7 @@ #include <linux/mount.h> #include <linux/async.h> @@ -4265,9 +4265,9 @@ diff -NurpP --minimal linux-2.6.36/fs/inode.c linux-2.6.36-vs2.3.0.36.33/fs/inod + inode->i_tag = dx_current_fstag(inode->i_sb); } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-2.6.36/fs/ioctl.c linux-2.6.36-vs2.3.0.36.33/fs/ioctl.c +diff -NurpP --minimal linux-2.6.36/fs/ioctl.c linux-2.6.36-vs2.3.0.36.36/fs/ioctl.c --- linux-2.6.36/fs/ioctl.c 2010-10-21 13:07:49.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ioctl.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ioctl.c 2010-10-21 13:09:36.000000000 +0200 @@ -16,6 +16,9 @@ #include <linux/writeback.h> #include <linux/buffer_head.h> @@ -4278,9 +4278,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ioctl.c linux-2.6.36-vs2.3.0.36.33/fs/ioct #include <asm/ioctls.h> -diff -NurpP --minimal linux-2.6.36/fs/ioprio.c linux-2.6.36-vs2.3.0.36.33/fs/ioprio.c +diff -NurpP --minimal linux-2.6.36/fs/ioprio.c linux-2.6.36-vs2.3.0.36.36/fs/ioprio.c --- linux-2.6.36/fs/ioprio.c 2010-07-07 18:31:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ioprio.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ioprio.c 2010-10-21 13:09:36.000000000 +0200 @@ -27,6 +27,7 @@ #include <linux/syscalls.h> #include <linux/security.h> @@ -4307,9 +4307,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ioprio.c linux-2.6.36-vs2.3.0.36.33/fs/iop tmpio = get_task_ioprio(p); if (tmpio < 0) continue; -diff -NurpP --minimal linux-2.6.36/fs/jfs/file.c linux-2.6.36-vs2.3.0.36.33/fs/jfs/file.c +diff -NurpP --minimal linux-2.6.36/fs/jfs/file.c linux-2.6.36-vs2.3.0.36.36/fs/jfs/file.c --- linux-2.6.36/fs/jfs/file.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/jfs/file.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/jfs/file.c 2010-10-21 13:09:36.000000000 +0200 @@ -102,7 +102,8 @@ int jfs_setattr(struct dentry *dentry, s if (is_quota_modification(inode, iattr)) dquot_initialize(inode); @@ -4328,9 +4328,9 @@ diff -NurpP --minimal linux-2.6.36/fs/jfs/file.c linux-2.6.36-vs2.3.0.36.33/fs/j }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-2.6.36/fs/jfs/ioctl.c linux-2.6.36-vs2.3.0.36.33/fs/jfs/ioctl.c +diff -NurpP --minimal linux-2.6.36/fs/jfs/ioctl.c linux-2.6.36-vs2.3.0.36.36/fs/jfs/ioctl.c --- linux-2.6.36/fs/jfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/fs/jfs/ioctl.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/jfs/ioctl.c 2010-10-21 13:09:36.000000000 +0200 @@ -11,6 +11,7 @@ #include <linux/mount.h> #include <linux/time.h> @@ -4388,9 +4388,9 @@ diff -NurpP --minimal linux-2.6.36/fs/jfs/ioctl.c linux-2.6.36-vs2.3.0.36.33/fs/ flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_dinode.h linux-2.6.36-vs2.3.0.36.33/fs/jfs/jfs_dinode.h +diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_dinode.h linux-2.6.36-vs2.3.0.36.36/fs/jfs/jfs_dinode.h --- linux-2.6.36/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/fs/jfs/jfs_dinode.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/jfs/jfs_dinode.h 2010-10-21 13:09:36.000000000 +0200 @@ -161,9 +161,13 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ @@ -4407,9 +4407,9 @@ diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_dinode.h linux-2.6.36-vs2.3.0.36.3 #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_filsys.h linux-2.6.36-vs2.3.0.36.33/fs/jfs/jfs_filsys.h +diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_filsys.h linux-2.6.36-vs2.3.0.36.36/fs/jfs/jfs_filsys.h --- linux-2.6.36/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/fs/jfs/jfs_filsys.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/jfs/jfs_filsys.h 2010-10-21 13:09:36.000000000 +0200 @@ -263,6 +263,7 @@ #define JFS_NAME_MAX 255 #define JFS_PATH_MAX BPSIZE @@ -4418,9 +4418,9 @@ diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_filsys.h linux-2.6.36-vs2.3.0.36.3 /* * file system state (superblock state) -diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_imap.c linux-2.6.36-vs2.3.0.36.33/fs/jfs/jfs_imap.c +diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_imap.c linux-2.6.36-vs2.3.0.36.36/fs/jfs/jfs_imap.c --- linux-2.6.36/fs/jfs/jfs_imap.c 2010-07-07 18:31:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/jfs/jfs_imap.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/jfs/jfs_imap.c 2010-10-21 13:09:36.000000000 +0200 @@ -46,6 +46,7 @@ #include <linux/pagemap.h> #include <linux/quotaops.h> @@ -4480,9 +4480,9 @@ diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_imap.c linux-2.6.36-vs2.3.0.36.33/ jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_inode.c linux-2.6.36-vs2.3.0.36.33/fs/jfs/jfs_inode.c +diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_inode.c linux-2.6.36-vs2.3.0.36.36/fs/jfs/jfs_inode.c --- linux-2.6.36/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/jfs/jfs_inode.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/jfs/jfs_inode.c 2010-10-21 13:09:36.000000000 +0200 @@ -18,6 +18,7 @@ #include <linux/fs.h> @@ -4556,9 +4556,9 @@ diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_inode.c linux-2.6.36-vs2.3.0.36.33 } /* -diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_inode.h linux-2.6.36-vs2.3.0.36.33/fs/jfs/jfs_inode.h +diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_inode.h linux-2.6.36-vs2.3.0.36.36/fs/jfs/jfs_inode.h --- linux-2.6.36/fs/jfs/jfs_inode.h 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/jfs/jfs_inode.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/jfs/jfs_inode.h 2010-10-21 13:09:36.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); @@ -4567,9 +4567,9 @@ diff -NurpP --minimal linux-2.6.36/fs/jfs/jfs_inode.h linux-2.6.36-vs2.3.0.36.33 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-2.6.36/fs/jfs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/jfs/namei.c +diff -NurpP --minimal linux-2.6.36/fs/jfs/namei.c linux-2.6.36-vs2.3.0.36.36/fs/jfs/namei.c --- linux-2.6.36/fs/jfs/namei.c 2010-07-07 18:31:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/jfs/namei.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/jfs/namei.c 2010-10-21 13:09:36.000000000 +0200 @@ -21,6 +21,7 @@ #include <linux/ctype.h> #include <linux/quotaops.h> @@ -4594,9 +4594,9 @@ diff -NurpP --minimal linux-2.6.36/fs/jfs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/ }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-2.6.36/fs/jfs/super.c linux-2.6.36-vs2.3.0.36.33/fs/jfs/super.c +diff -NurpP --minimal linux-2.6.36/fs/jfs/super.c linux-2.6.36-vs2.3.0.36.36/fs/jfs/super.c --- linux-2.6.36/fs/jfs/super.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/jfs/super.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/jfs/super.c 2010-10-21 13:09:36.000000000 +0200 @@ -195,7 +195,8 @@ static void jfs_put_super(struct super_b enum { Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, @@ -4662,9 +4662,9 @@ diff -NurpP --minimal linux-2.6.36/fs/jfs/super.c linux-2.6.36-vs2.3.0.36.33/fs/ if (newLVSize) { printk(KERN_ERR "resize option for remount only\n"); -diff -NurpP --minimal linux-2.6.36/fs/libfs.c linux-2.6.36-vs2.3.0.36.33/fs/libfs.c +diff -NurpP --minimal linux-2.6.36/fs/libfs.c linux-2.6.36-vs2.3.0.36.36/fs/libfs.c --- linux-2.6.36/fs/libfs.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/libfs.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/libfs.c 2010-10-21 13:09:36.000000000 +0200 @@ -124,7 +124,8 @@ static inline unsigned char dt_type(stru * both impossible due to the lock on directory. */ @@ -4711,9 +4711,9 @@ diff -NurpP --minimal linux-2.6.36/fs/libfs.c linux-2.6.36-vs2.3.0.36.33/fs/libf EXPORT_SYMBOL(generic_read_dir); EXPORT_SYMBOL(get_sb_pseudo); EXPORT_SYMBOL(simple_write_begin); -diff -NurpP --minimal linux-2.6.36/fs/locks.c linux-2.6.36-vs2.3.0.36.33/fs/locks.c +diff -NurpP --minimal linux-2.6.36/fs/locks.c linux-2.6.36-vs2.3.0.36.36/fs/locks.c --- linux-2.6.36/fs/locks.c 2010-07-07 18:31:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/locks.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/locks.c 2010-10-21 13:09:36.000000000 +0200 @@ -127,6 +127,8 @@ #include <linux/time.h> #include <linux/rcupdate.h> @@ -4899,9 +4899,9 @@ diff -NurpP --minimal linux-2.6.36/fs/locks.c linux-2.6.36-vs2.3.0.36.33/fs/lock f->private++; return 0; -diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/namei.c +diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.36/fs/namei.c --- linux-2.6.36/fs/namei.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/namei.c 2010-10-21 14:45:53.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/namei.c 2010-10-21 22:09:46.000000000 +0200 @@ -32,6 +32,14 @@ #include <linux/fcntl.h> #include <linux/device_cgroup.h> @@ -4917,7 +4917,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name #include <asm/uaccess.h> #include "internal.h" -@@ -166,6 +174,77 @@ void putname(const char *name) +@@ -166,6 +174,84 @@ void putname(const char *name) EXPORT_SYMBOL(putname); #endif @@ -4940,6 +4940,9 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name + if (S_ISDIR(inode->i_mode) || + vx_check((xid_t)inode->i_tag, VS_IDENT | VS_WATCH_P)) + return 0; ++ ++ /* just say we didn't find anything */ ++ return -ENOENT; + } + else if (inode->i_sb->s_magic == PROC_SUPER_MAGIC) { + struct proc_dir_entry *de = PDE(inode); @@ -4985,7 +4988,11 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name +{ + int ret = __dx_permission(inode, mask); + if (unlikely(ret)) { -+ vxwprintk_task(1, "denied %x access to %s:%p[#%d,%lu]", ++#ifndef CONFIG_VSERVER_WARN_DEVPTS ++ if (inode->i_sb->s_magic != DEVPTS_SUPER_MAGIC) ++#endif ++ vxwprintk_task(1, ++ "denied [0x%x] access to inode %s:%p[#%d,%lu]", + mask, inode->i_sb->s_id, inode, inode->i_tag, + inode->i_ino); + } @@ -4995,7 +5002,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name /* * This does basic POSIX ACL permission checking */ -@@ -266,10 +345,14 @@ int inode_permission(struct inode *inode +@@ -266,10 +352,14 @@ int inode_permission(struct inode *inode /* * Nobody gets write access to an immutable file. */ @@ -5011,7 +5018,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name if (inode->i_op->permission) retval = inode->i_op->permission(inode, mask); else -@@ -463,6 +546,9 @@ static int exec_permission(struct inode +@@ -463,6 +553,9 @@ static int exec_permission(struct inode { int ret; @@ -5021,7 +5028,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name if (inode->i_op->permission) { ret = inode->i_op->permission(inode, MAY_EXEC); if (!ret) -@@ -672,7 +758,8 @@ static __always_inline void follow_dotdo +@@ -672,7 +765,8 @@ static __always_inline void follow_dotdo if (nd->path.dentry == nd->root.dentry && nd->path.mnt == nd->root.mnt) { @@ -5031,7 +5038,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name } if (nd->path.dentry != nd->path.mnt->mnt_root) { /* rare case of legitimate dget_parent()... */ -@@ -725,7 +812,7 @@ static int do_lookup(struct nameidata *n +@@ -725,7 +819,7 @@ static int do_lookup(struct nameidata *n { struct vfsmount *mnt = nd->path.mnt; struct dentry *dentry, *parent; @@ -5040,7 +5047,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name /* * See if the low-level filesystem might want * to use its own hash.. -@@ -747,12 +834,26 @@ static int do_lookup(struct nameidata *n +@@ -747,12 +841,31 @@ static int do_lookup(struct nameidata *n found: if (dentry->d_op && dentry->d_op->d_revalidate) goto need_revalidate; @@ -5058,16 +5065,21 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name return 0; +hidden: -+ vxwprintk_task(1, "did lookup hidden %s:%p[#%d,%lu] »%s/%.*s«.", ++#ifndef CONFIG_VSERVER_WARN_DEVPTS ++ if (inode->i_sb->s_magic != DEVPTS_SUPER_MAGIC) ++#endif ++ vxwprintk_task(1, ++ "did lookup hidden %s:%p[#%d,%lu] " VS_Q("%s/%.*s") ".", + inode->i_sb->s_id, inode, inode->i_tag, inode->i_ino, + vxd_path(&nd->path), name->len, name->name); ++ + dput(dentry); + return -ENOENT; + need_lookup: parent = nd->path.dentry; dir = parent->d_inode; -@@ -1307,7 +1408,7 @@ static int may_delete(struct inode *dir, +@@ -1307,7 +1420,7 @@ static int may_delete(struct inode *dir, if (IS_APPEND(dir)) return -EPERM; if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)|| @@ -5076,7 +5088,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name return -EPERM; if (isdir) { if (!S_ISDIR(victim->d_inode->i_mode)) -@@ -1430,6 +1531,14 @@ int may_open(struct path *path, int acc_ +@@ -1430,6 +1543,14 @@ int may_open(struct path *path, int acc_ break; } @@ -5091,7 +5103,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name error = inode_permission(inode, acc_mode); if (error) return error; -@@ -1538,7 +1647,8 @@ static int open_will_truncate(int flag, +@@ -1538,7 +1659,8 @@ static int open_will_truncate(int flag, } static struct file *finish_open(struct nameidata *nd, @@ -5101,7 +5113,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name { struct file *filp; int will_truncate; -@@ -1551,6 +1661,23 @@ static struct file *finish_open(struct n +@@ -1551,6 +1673,23 @@ static struct file *finish_open(struct n goto exit; } error = may_open(&nd->path, acc_mode, open_flag); @@ -5125,7 +5137,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name if (error) { if (will_truncate) mnt_drop_write(nd->path.mnt); -@@ -1719,7 +1846,7 @@ static struct file *do_last(struct namei +@@ -1719,7 +1858,7 @@ static struct file *do_last(struct namei if (S_ISDIR(path->dentry->d_inode->i_mode)) goto exit; ok: @@ -5134,7 +5146,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name return filp; exit_mutex_unlock: -@@ -1748,7 +1875,11 @@ struct file *do_filp_open(int dfd, const +@@ -1748,7 +1887,11 @@ struct file *do_filp_open(int dfd, const int count = 0; int flag = open_to_namei_flags(open_flag); int force_reval = 0; @@ -5147,7 +5159,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name if (!(open_flag & O_CREAT)) mode = 0; -@@ -1814,6 +1945,13 @@ reval: +@@ -1814,6 +1957,13 @@ reval: if (!(open_flag & O_NOFOLLOW)) nd.flags |= LOOKUP_FOLLOW; filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname); @@ -5161,7 +5173,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name while (unlikely(!filp)) { /* trailing symlink */ struct path holder; struct inode *inode = path.dentry->d_inode; -@@ -1852,6 +1990,13 @@ reval: +@@ -1852,6 +2002,13 @@ reval: holder = path; nd.flags &= ~LOOKUP_PARENT; filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname); @@ -5175,7 +5187,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name if (inode->i_op->put_link) inode->i_op->put_link(holder.dentry, &nd, cookie); path_put(&holder); -@@ -1952,9 +2097,17 @@ int vfs_mknod(struct inode *dir, struct +@@ -1952,9 +2109,17 @@ int vfs_mknod(struct inode *dir, struct if (error) return error; @@ -5194,7 +5206,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name if (!dir->i_op->mknod) return -EPERM; -@@ -2419,7 +2572,7 @@ int vfs_link(struct dentry *old_dentry, +@@ -2419,7 +2584,7 @@ int vfs_link(struct dentry *old_dentry, /* * A link to an append-only or immutable file cannot be created. */ @@ -5203,7 +5215,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name return -EPERM; if (!dir->i_op->link) return -EPERM; -@@ -2791,6 +2944,218 @@ int vfs_follow_link(struct nameidata *nd +@@ -2791,6 +2956,222 @@ int vfs_follow_link(struct nameidata *nd return __vfs_follow_link(nd, link); } @@ -5231,7 +5243,8 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name + char *to, *path, pad='\251'; + loff_t size; + -+ vxdprintk(VXD_CBIT(misc, 1), "cow_break_link(»%s«)", pathname); ++ vxdprintk(VXD_CBIT(misc, 1), ++ "cow_break_link(" VS_Q("%s") ")", pathname); + path = kmalloc(PATH_MAX, GFP_KERNEL); + ret = -ENOMEM; + if (!path) @@ -5248,7 +5261,8 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name + + to = d_path(&old_path, path, PATH_MAX-2); + pathlen = strlen(to); -+ vxdprintk(VXD_CBIT(misc, 2), "old path »%s« [»%.*s«:%d]", to, ++ vxdprintk(VXD_CBIT(misc, 2), ++ "old path " VS_Q("%s") " [" VS_Q("%.*s") ":%d]", to, + old_path.dentry->d_name.len, old_path.dentry->d_name.name, + old_path.dentry->d_name.len); + @@ -5259,7 +5273,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name + if (pad <= '\240') + goto out_rel_old; + -+ vxdprintk(VXD_CBIT(misc, 1), "temp copy »%s«", to); ++ vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to); + /* dir_nd will have refs to dentry and mnt */ + ret = path_lookup(to, + LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &dir_nd); @@ -5278,7 +5292,8 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name + goto retry; + } + vxdprintk(VXD_CBIT(misc, 2), -+ "lookup_create(new): %p [»%.*s«:%d]", new_path.dentry, ++ "lookup_create(new): %p [" VS_Q("%.*s") ":%d]", ++ new_path.dentry, + new_path.dentry->d_name.len, new_path.dentry->d_name.name, + new_path.dentry->d_name.len); + dir = dir_nd.path.dentry; @@ -5354,7 +5369,7 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name + goto out_unlock; + + vxdprintk(VXD_CBIT(misc, 2), -+ "vfs_rename: [»%*s«:%d] -> [»%*s«:%d]", ++ "vfs_rename: [" VS_Q("%*s") ":%d] -> [" VS_Q("%*s") ":%d]", + new_path.dentry->d_name.len, new_path.dentry->d_name.name, + new_path.dentry->d_name.len, + old_path.dentry->d_name.len, old_path.dentry->d_name.name, @@ -5399,7 +5414,8 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name + + new_path.dentry = old_nd.path.dentry; + vxdprintk(VXD_CBIT(misc, 2), -+ "path_lookup(redo): %p [»%.*s«:%d]", new_path.dentry, ++ "path_lookup(redo): %p [" VS_Q("%.*s") ":%d]", ++ new_path.dentry, + new_path.dentry->d_name.len, new_path.dentry->d_name.name, + new_path.dentry->d_name.len); + dget(new_path.dentry); @@ -5422,9 +5438,9 @@ diff -NurpP --minimal linux-2.6.36/fs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/name /* get the link contents into pagecache */ static char *page_getlink(struct dentry * dentry, struct page **ppage) { -diff -NurpP --minimal linux-2.6.36/fs/namespace.c linux-2.6.36-vs2.3.0.36.33/fs/namespace.c +diff -NurpP --minimal linux-2.6.36/fs/namespace.c linux-2.6.36-vs2.3.0.36.36/fs/namespace.c --- linux-2.6.36/fs/namespace.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/namespace.c 2010-10-21 15:11:02.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/namespace.c 2010-10-21 15:11:02.000000000 +0200 @@ -32,6 +32,11 @@ #include <linux/idr.h> #include <linux/fs_struct.h> @@ -5714,9 +5730,9 @@ diff -NurpP --minimal linux-2.6.36/fs/namespace.c linux-2.6.36-vs2.3.0.36.33/fs/ kfree(ns); } EXPORT_SYMBOL(put_mnt_ns); -diff -NurpP --minimal linux-2.6.36/fs/nfs/client.c linux-2.6.36-vs2.3.0.36.33/fs/nfs/client.c +diff -NurpP --minimal linux-2.6.36/fs/nfs/client.c linux-2.6.36-vs2.3.0.36.36/fs/nfs/client.c --- linux-2.6.36/fs/nfs/client.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/nfs/client.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/nfs/client.c 2010-10-21 13:09:36.000000000 +0200 @@ -740,6 +740,9 @@ static int nfs_init_server_rpcclient(str if (server->flags & NFS_MOUNT_SOFT) server->client->cl_softrtry = 1; @@ -5738,9 +5754,9 @@ diff -NurpP --minimal linux-2.6.36/fs/nfs/client.c linux-2.6.36-vs2.3.0.36.33/fs server->maxfilesize = fsinfo->maxfilesize; /* We're airborne Set socket buffersize */ -diff -NurpP --minimal linux-2.6.36/fs/nfs/dir.c linux-2.6.36-vs2.3.0.36.33/fs/nfs/dir.c +diff -NurpP --minimal linux-2.6.36/fs/nfs/dir.c linux-2.6.36-vs2.3.0.36.36/fs/nfs/dir.c --- linux-2.6.36/fs/nfs/dir.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/nfs/dir.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/nfs/dir.c 2010-10-21 13:09:36.000000000 +0200 @@ -33,6 +33,7 @@ #include <linux/namei.h> #include <linux/mount.h> @@ -5757,9 +5773,9 @@ diff -NurpP --minimal linux-2.6.36/fs/nfs/dir.c linux-2.6.36-vs2.3.0.36.33/fs/nf no_entry: res = d_materialise_unique(dentry, inode); if (res != NULL) { -diff -NurpP --minimal linux-2.6.36/fs/nfs/inode.c linux-2.6.36-vs2.3.0.36.33/fs/nfs/inode.c +diff -NurpP --minimal linux-2.6.36/fs/nfs/inode.c linux-2.6.36-vs2.3.0.36.36/fs/nfs/inode.c --- linux-2.6.36/fs/nfs/inode.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/nfs/inode.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/nfs/inode.c 2010-10-21 13:09:36.000000000 +0200 @@ -37,6 +37,7 @@ #include <linux/inet.h> #include <linux/nfs_xdr.h> @@ -5911,9 +5927,9 @@ diff -NurpP --minimal linux-2.6.36/fs/nfs/inode.c linux-2.6.36-vs2.3.0.36.33/fs/ if (fattr->valid & NFS_ATTR_FATTR_NLINK) { if (inode->i_nlink != fattr->nlink) { invalid |= NFS_INO_INVALID_ATTR; -diff -NurpP --minimal linux-2.6.36/fs/nfs/nfs3xdr.c linux-2.6.36-vs2.3.0.36.33/fs/nfs/nfs3xdr.c +diff -NurpP --minimal linux-2.6.36/fs/nfs/nfs3xdr.c linux-2.6.36-vs2.3.0.36.36/fs/nfs/nfs3xdr.c --- linux-2.6.36/fs/nfs/nfs3xdr.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/nfs/nfs3xdr.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/nfs/nfs3xdr.c 2010-10-21 13:09:36.000000000 +0200 @@ -20,6 +20,7 @@ #include <linux/nfs3.h> #include <linux/nfs_fs.h> @@ -6003,9 +6019,9 @@ diff -NurpP --minimal linux-2.6.36/fs/nfs/nfs3xdr.c linux-2.6.36-vs2.3.0.36.33/f if (args->type == NF3CHR || args->type == NF3BLK) { *p++ = htonl(MAJOR(args->rdev)); *p++ = htonl(MINOR(args->rdev)); -diff -NurpP --minimal linux-2.6.36/fs/nfs/nfsroot.c linux-2.6.36-vs2.3.0.36.33/fs/nfs/nfsroot.c +diff -NurpP --minimal linux-2.6.36/fs/nfs/nfsroot.c linux-2.6.36-vs2.3.0.36.36/fs/nfs/nfsroot.c --- linux-2.6.36/fs/nfs/nfsroot.c 2010-08-02 16:52:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/nfs/nfsroot.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/nfs/nfsroot.c 2010-10-21 13:09:36.000000000 +0200 @@ -122,12 +122,12 @@ static int mount_port __initdata = 0; / enum { /* Options that take integer arguments */ @@ -6052,9 +6068,9 @@ diff -NurpP --minimal linux-2.6.36/fs/nfs/nfsroot.c linux-2.6.36-vs2.3.0.36.33/f default: printk(KERN_WARNING "Root-NFS: unknown " "option: %s\n", p); -diff -NurpP --minimal linux-2.6.36/fs/nfs/super.c linux-2.6.36-vs2.3.0.36.33/fs/nfs/super.c +diff -NurpP --minimal linux-2.6.36/fs/nfs/super.c linux-2.6.36-vs2.3.0.36.36/fs/nfs/super.c --- linux-2.6.36/fs/nfs/super.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/nfs/super.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/nfs/super.c 2010-10-21 13:09:36.000000000 +0200 @@ -54,6 +54,7 @@ #include <linux/nfs_xdr.h> #include <linux/magic.h> @@ -6071,9 +6087,9 @@ diff -NurpP --minimal linux-2.6.36/fs/nfs/super.c linux-2.6.36-vs2.3.0.36.33/fs/ { 0, NULL, NULL } }; const struct proc_nfs_info *nfs_infop; -diff -NurpP --minimal linux-2.6.36/fs/nfsd/auth.c linux-2.6.36-vs2.3.0.36.33/fs/nfsd/auth.c +diff -NurpP --minimal linux-2.6.36/fs/nfsd/auth.c linux-2.6.36-vs2.3.0.36.36/fs/nfsd/auth.c --- linux-2.6.36/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/fs/nfsd/auth.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/nfsd/auth.c 2010-10-21 13:09:36.000000000 +0200 @@ -1,6 +1,7 @@ /* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */ @@ -6092,9 +6108,9 @@ diff -NurpP --minimal linux-2.6.36/fs/nfsd/auth.c linux-2.6.36-vs2.3.0.36.33/fs/ rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-2.6.36/fs/nfsd/nfs3xdr.c linux-2.6.36-vs2.3.0.36.33/fs/nfsd/nfs3xdr.c +diff -NurpP --minimal linux-2.6.36/fs/nfsd/nfs3xdr.c linux-2.6.36-vs2.3.0.36.36/fs/nfsd/nfs3xdr.c --- linux-2.6.36/fs/nfsd/nfs3xdr.c 2010-02-25 11:52:05.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/fs/nfsd/nfs3xdr.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/nfsd/nfs3xdr.c 2010-10-21 13:09:36.000000000 +0200 @@ -7,6 +7,7 @@ */ @@ -6145,9 +6161,9 @@ diff -NurpP --minimal linux-2.6.36/fs/nfsd/nfs3xdr.c linux-2.6.36-vs2.3.0.36.33/ if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-2.6.36/fs/nfsd/nfs4xdr.c linux-2.6.36-vs2.3.0.36.33/fs/nfsd/nfs4xdr.c +diff -NurpP --minimal linux-2.6.36/fs/nfsd/nfs4xdr.c linux-2.6.36-vs2.3.0.36.36/fs/nfsd/nfs4xdr.c --- linux-2.6.36/fs/nfsd/nfs4xdr.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/nfsd/nfs4xdr.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/nfsd/nfs4xdr.c 2010-10-21 13:09:36.000000000 +0200 @@ -47,6 +47,7 @@ #include <linux/nfsd_idmap.h> #include <linux/nfs4_acl.h> @@ -6177,9 +6193,9 @@ diff -NurpP --minimal linux-2.6.36/fs/nfsd/nfs4xdr.c linux-2.6.36-vs2.3.0.36.33/ if (status == nfserr_resource) goto out_resource; if (status) -diff -NurpP --minimal linux-2.6.36/fs/nfsd/nfsxdr.c linux-2.6.36-vs2.3.0.36.33/fs/nfsd/nfsxdr.c +diff -NurpP --minimal linux-2.6.36/fs/nfsd/nfsxdr.c linux-2.6.36-vs2.3.0.36.36/fs/nfsd/nfsxdr.c --- linux-2.6.36/fs/nfsd/nfsxdr.c 2010-02-25 11:52:05.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/fs/nfsd/nfsxdr.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/nfsd/nfsxdr.c 2010-10-21 13:09:36.000000000 +0200 @@ -6,6 +6,7 @@ #include "xdr.h" @@ -6228,9 +6244,9 @@ diff -NurpP --minimal linux-2.6.36/fs/nfsd/nfsxdr.c linux-2.6.36-vs2.3.0.36.33/f if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-2.6.36/fs/ocfs2/dlmglue.c linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/dlmglue.c +diff -NurpP --minimal linux-2.6.36/fs/ocfs2/dlmglue.c linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/dlmglue.c --- linux-2.6.36/fs/ocfs2/dlmglue.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/dlmglue.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/dlmglue.c 2010-10-21 13:09:36.000000000 +0200 @@ -2114,6 +2114,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); @@ -6247,9 +6263,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ocfs2/dlmglue.c linux-2.6.36-vs2.3.0.36.33 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-2.6.36/fs/ocfs2/dlmglue.h linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/dlmglue.h +diff -NurpP --minimal linux-2.6.36/fs/ocfs2/dlmglue.h linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/dlmglue.h --- linux-2.6.36/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/dlmglue.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/dlmglue.h 2010-10-21 13:09:36.000000000 +0200 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { __be16 lvb_inlink; __be32 lvb_iattr; @@ -6260,9 +6276,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ocfs2/dlmglue.h linux-2.6.36-vs2.3.0.36.33 }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-2.6.36/fs/ocfs2/file.c linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/file.c +diff -NurpP --minimal linux-2.6.36/fs/ocfs2/file.c linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/file.c --- linux-2.6.36/fs/ocfs2/file.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/file.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/file.c 2010-10-21 13:09:36.000000000 +0200 @@ -1138,13 +1138,15 @@ int ocfs2_setattr(struct dentry *dentry, mlog(0, "uid change: %d\n", attr->ia_uid); if (attr->ia_valid & ATTR_GID) @@ -6280,9 +6296,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ocfs2/file.c linux-2.6.36-vs2.3.0.36.33/fs if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) { mlog(0, "can't handle attrs: 0x%x\n", attr->ia_valid); return 0; -diff -NurpP --minimal linux-2.6.36/fs/ocfs2/inode.c linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/inode.c +diff -NurpP --minimal linux-2.6.36/fs/ocfs2/inode.c linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/inode.c --- linux-2.6.36/fs/ocfs2/inode.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/inode.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/inode.c 2010-10-21 13:09:36.000000000 +0200 @@ -28,6 +28,7 @@ #include <linux/highmem.h> #include <linux/pagemap.h> @@ -6379,9 +6395,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ocfs2/inode.c linux-2.6.36-vs2.3.0.36.33/f /* Fast symlinks will have i_size but no allocated clusters. */ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) -diff -NurpP --minimal linux-2.6.36/fs/ocfs2/inode.h linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/inode.h +diff -NurpP --minimal linux-2.6.36/fs/ocfs2/inode.h linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/inode.h --- linux-2.6.36/fs/ocfs2/inode.h 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/inode.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/inode.h 2010-10-21 13:09:36.000000000 +0200 @@ -153,6 +153,7 @@ struct buffer_head *ocfs2_bread(struct i void ocfs2_set_inode_flags(struct inode *inode); @@ -6390,9 +6406,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ocfs2/inode.h linux-2.6.36-vs2.3.0.36.33/f static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-2.6.36/fs/ocfs2/ioctl.c linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/ioctl.c +diff -NurpP --minimal linux-2.6.36/fs/ocfs2/ioctl.c linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/ioctl.c --- linux-2.6.36/fs/ocfs2/ioctl.c 2010-02-25 11:52:06.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/ioctl.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/ioctl.c 2010-10-21 13:09:36.000000000 +0200 @@ -43,7 +43,41 @@ static int ocfs2_get_inode_attr(struct i return status; } @@ -6456,9 +6472,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ocfs2/ioctl.c linux-2.6.36-vs2.3.0.36.33/f 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-2.6.36/fs/ocfs2/namei.c linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/namei.c +diff -NurpP --minimal linux-2.6.36/fs/ocfs2/namei.c linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/namei.c --- linux-2.6.36/fs/ocfs2/namei.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/namei.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/namei.c 2010-10-21 13:09:36.000000000 +0200 @@ -41,6 +41,7 @@ #include <linux/slab.h> #include <linux/highmem.h> @@ -6489,9 +6505,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ocfs2/namei.c linux-2.6.36-vs2.3.0.36.33/f 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-2.6.36/fs/ocfs2/ocfs2_fs.h linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/ocfs2_fs.h +diff -NurpP --minimal linux-2.6.36/fs/ocfs2/ocfs2_fs.h linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/ocfs2_fs.h --- linux-2.6.36/fs/ocfs2/ocfs2_fs.h 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/ocfs2_fs.h 2010-10-21 14:00:41.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/ocfs2_fs.h 2010-10-21 14:00:41.000000000 +0200 @@ -258,6 +258,11 @@ #define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ #define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */ @@ -6504,9 +6520,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ocfs2/ocfs2_fs.h linux-2.6.36-vs2.3.0.36.3 #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-2.6.36/fs/ocfs2/ocfs2.h linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/ocfs2.h +diff -NurpP --minimal linux-2.6.36/fs/ocfs2/ocfs2.h linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/ocfs2.h --- linux-2.6.36/fs/ocfs2/ocfs2.h 2010-08-02 16:52:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/ocfs2.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/ocfs2.h 2010-10-21 13:09:36.000000000 +0200 @@ -256,6 +256,7 @@ enum ocfs2_mount_options control lists */ OCFS2_MOUNT_USRQUOTA = 1 << 10, /* We support user quotas */ @@ -6515,9 +6531,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ocfs2/ocfs2.h linux-2.6.36-vs2.3.0.36.33/f }; #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-2.6.36/fs/ocfs2/super.c linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/super.c +diff -NurpP --minimal linux-2.6.36/fs/ocfs2/super.c linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/super.c --- linux-2.6.36/fs/ocfs2/super.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/ocfs2/super.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/ocfs2/super.c 2010-10-21 13:09:36.000000000 +0200 @@ -179,6 +179,7 @@ enum { Opt_grpquota, Opt_resv_level, @@ -6581,9 +6597,9 @@ diff -NurpP --minimal linux-2.6.36/fs/ocfs2/super.c linux-2.6.36-vs2.3.0.36.33/f default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-2.6.36/fs/open.c linux-2.6.36-vs2.3.0.36.33/fs/open.c +diff -NurpP --minimal linux-2.6.36/fs/open.c linux-2.6.36-vs2.3.0.36.36/fs/open.c --- linux-2.6.36/fs/open.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/open.c 2010-10-21 13:55:41.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/open.c 2010-10-21 13:55:41.000000000 +0200 @@ -30,6 +30,11 @@ #include <linux/fs_struct.h> #include <linux/ima.h> @@ -6664,9 +6680,9 @@ diff -NurpP --minimal linux-2.6.36/fs/open.c linux-2.6.36-vs2.3.0.36.33/fs/open. } void put_unused_fd(unsigned int fd) -diff -NurpP --minimal linux-2.6.36/fs/proc/array.c linux-2.6.36-vs2.3.0.36.33/fs/proc/array.c +diff -NurpP --minimal linux-2.6.36/fs/proc/array.c linux-2.6.36-vs2.3.0.36.36/fs/proc/array.c --- linux-2.6.36/fs/proc/array.c 2010-08-02 16:52:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/proc/array.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/proc/array.c 2010-10-21 13:09:36.000000000 +0200 @@ -81,6 +81,8 @@ #include <linux/pid_namespace.h> #include <linux/ptrace.h> @@ -6780,9 +6796,9 @@ diff -NurpP --minimal linux-2.6.36/fs/proc/array.c linux-2.6.36-vs2.3.0.36.33/fs 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-2.6.36/fs/proc/base.c linux-2.6.36-vs2.3.0.36.33/fs/proc/base.c +diff -NurpP --minimal linux-2.6.36/fs/proc/base.c linux-2.6.36-vs2.3.0.36.36/fs/proc/base.c --- linux-2.6.36/fs/proc/base.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/proc/base.c 2010-10-21 13:58:32.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/proc/base.c 2010-10-21 13:58:32.000000000 +0200 @@ -83,6 +83,8 @@ #include <linux/pid_namespace.h> #include <linux/fs_struct.h> @@ -6924,9 +6940,9 @@ diff -NurpP --minimal linux-2.6.36/fs/proc/base.c linux-2.6.36-vs2.3.0.36.33/fs/ ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-2.6.36/fs/proc/generic.c linux-2.6.36-vs2.3.0.36.33/fs/proc/generic.c +diff -NurpP --minimal linux-2.6.36/fs/proc/generic.c linux-2.6.36-vs2.3.0.36.36/fs/proc/generic.c --- linux-2.6.36/fs/proc/generic.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/proc/generic.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/proc/generic.c 2010-10-21 21:43:28.000000000 +0200 @@ -22,6 +22,7 @@ #include <linux/bitops.h> #include <linux/spinlock.h> @@ -6939,8 +6955,8 @@ diff -NurpP --minimal linux-2.6.36/fs/proc/generic.c linux-2.6.36-vs2.3.0.36.33/ for (de = de->subdir; de ; de = de->next) { if (de->namelen != dentry->d_name.len) continue; -+ if (!vx_hide_check(0, de->vx_flags)) -+ continue; ++ if (!vx_hide_check(0, de->vx_flags)) ++ continue; if (!memcmp(dentry->d_name.name, de->name, de->namelen)) { unsigned int ino; @@ -6948,8 +6964,8 @@ diff -NurpP --minimal linux-2.6.36/fs/proc/generic.c linux-2.6.36-vs2.3.0.36.33/ spin_unlock(&proc_subdir_lock); error = -EINVAL; inode = proc_get_inode(dir->i_sb, ino, de); -+ /* generic proc entries belong to the host */ -+ inode->i_tag = 0; ++ /* generic proc entries belong to the host */ ++ inode->i_tag = 0; goto out_unlock; } } @@ -6988,9 +7004,9 @@ diff -NurpP --minimal linux-2.6.36/fs/proc/generic.c linux-2.6.36-vs2.3.0.36.33/ } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-2.6.36/fs/proc/inode.c linux-2.6.36-vs2.3.0.36.33/fs/proc/inode.c +diff -NurpP --minimal linux-2.6.36/fs/proc/inode.c linux-2.6.36-vs2.3.0.36.36/fs/proc/inode.c --- linux-2.6.36/fs/proc/inode.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/proc/inode.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/proc/inode.c 2010-10-21 13:09:36.000000000 +0200 @@ -428,6 +428,8 @@ struct inode *proc_get_inode(struct supe inode->i_uid = de->uid; inode->i_gid = de->gid; @@ -7000,9 +7016,9 @@ diff -NurpP --minimal linux-2.6.36/fs/proc/inode.c linux-2.6.36-vs2.3.0.36.33/fs if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-2.6.36/fs/proc/internal.h linux-2.6.36-vs2.3.0.36.33/fs/proc/internal.h +diff -NurpP --minimal linux-2.6.36/fs/proc/internal.h linux-2.6.36-vs2.3.0.36.36/fs/proc/internal.h --- linux-2.6.36/fs/proc/internal.h 2010-02-25 11:52:06.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/fs/proc/internal.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/proc/internal.h 2010-10-21 13:09:36.000000000 +0200 @@ -10,6 +10,7 @@ */ @@ -7039,9 +7055,9 @@ diff -NurpP --minimal linux-2.6.36/fs/proc/internal.h linux-2.6.36-vs2.3.0.36.33 static inline int proc_fd(struct inode *inode) { return PROC_I(inode)->fd; -diff -NurpP --minimal linux-2.6.36/fs/proc/loadavg.c linux-2.6.36-vs2.3.0.36.33/fs/proc/loadavg.c +diff -NurpP --minimal linux-2.6.36/fs/proc/loadavg.c linux-2.6.36-vs2.3.0.36.36/fs/proc/loadavg.c --- linux-2.6.36/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/proc/loadavg.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/proc/loadavg.c 2010-10-21 13:09:36.000000000 +0200 @@ -12,15 +12,27 @@ static int loadavg_proc_show(struct seq_file *m, void *v) @@ -7071,9 +7087,9 @@ diff -NurpP --minimal linux-2.6.36/fs/proc/loadavg.c linux-2.6.36-vs2.3.0.36.33/ task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-2.6.36/fs/proc/meminfo.c linux-2.6.36-vs2.3.0.36.33/fs/proc/meminfo.c +diff -NurpP --minimal linux-2.6.36/fs/proc/meminfo.c linux-2.6.36-vs2.3.0.36.36/fs/proc/meminfo.c --- linux-2.6.36/fs/proc/meminfo.c 2009-12-03 20:02:53.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/fs/proc/meminfo.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/proc/meminfo.c 2010-10-21 13:09:36.000000000 +0200 @@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_ allowed = ((totalram_pages - hugetlb_total_pages()) * sysctl_overcommit_ratio / 100) + total_swap_pages; @@ -7084,9 +7100,9 @@ diff -NurpP --minimal linux-2.6.36/fs/proc/meminfo.c linux-2.6.36-vs2.3.0.36.33/ total_swapcache_pages - i.bufferram; if (cached < 0) cached = 0; -diff -NurpP --minimal linux-2.6.36/fs/proc/root.c linux-2.6.36-vs2.3.0.36.33/fs/proc/root.c +diff -NurpP --minimal linux-2.6.36/fs/proc/root.c linux-2.6.36-vs2.3.0.36.36/fs/proc/root.c --- linux-2.6.36/fs/proc/root.c 2010-08-02 16:52:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/proc/root.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/proc/root.c 2010-10-21 13:09:36.000000000 +0200 @@ -18,9 +18,14 @@ #include <linux/bitops.h> #include <linux/mount.h> @@ -7118,9 +7134,9 @@ diff -NurpP --minimal linux-2.6.36/fs/proc/root.c linux-2.6.36-vs2.3.0.36.33/fs/ }; int pid_ns_prepare_proc(struct pid_namespace *ns) -diff -NurpP --minimal linux-2.6.36/fs/proc/uptime.c linux-2.6.36-vs2.3.0.36.33/fs/proc/uptime.c +diff -NurpP --minimal linux-2.6.36/fs/proc/uptime.c linux-2.6.36-vs2.3.0.36.36/fs/proc/uptime.c --- linux-2.6.36/fs/proc/uptime.c 2009-12-03 20:02:53.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/fs/proc/uptime.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/proc/uptime.c 2010-10-21 13:09:36.000000000 +0200 @@ -4,22 +4,22 @@ #include <linux/sched.h> #include <linux/seq_file.h> @@ -7150,9 +7166,9 @@ diff -NurpP --minimal linux-2.6.36/fs/proc/uptime.c linux-2.6.36-vs2.3.0.36.33/f seq_printf(m, "%lu.%02lu %lu.%02lu\n", (unsigned long) uptime.tv_sec, (uptime.tv_nsec / (NSEC_PER_SEC / 100)), -diff -NurpP --minimal linux-2.6.36/fs/quota/dquot.c linux-2.6.36-vs2.3.0.36.33/fs/quota/dquot.c +diff -NurpP --minimal linux-2.6.36/fs/quota/dquot.c linux-2.6.36-vs2.3.0.36.36/fs/quota/dquot.c --- linux-2.6.36/fs/quota/dquot.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/quota/dquot.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/quota/dquot.c 2010-10-21 13:09:36.000000000 +0200 @@ -1538,6 +1538,9 @@ int __dquot_alloc_space(struct inode *in int reserve = flags & DQUOT_SPACE_RESERVE; int nofail = flags & DQUOT_SPACE_NOFAIL; @@ -7191,9 +7207,9 @@ diff -NurpP --minimal linux-2.6.36/fs/quota/dquot.c linux-2.6.36-vs2.3.0.36.33/f /* 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-2.6.36/fs/quota/quota.c linux-2.6.36-vs2.3.0.36.33/fs/quota/quota.c +diff -NurpP --minimal linux-2.6.36/fs/quota/quota.c linux-2.6.36-vs2.3.0.36.36/fs/quota/quota.c --- linux-2.6.36/fs/quota/quota.c 2010-08-02 16:52:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/quota/quota.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/quota/quota.c 2010-10-21 13:09:36.000000000 +0200 @@ -8,6 +8,7 @@ #include <linux/fs.h> #include <linux/namei.h> @@ -7281,18 +7297,18 @@ diff -NurpP --minimal linux-2.6.36/fs/quota/quota.c linux-2.6.36-vs2.3.0.36.33/f sb = get_super(bdev); bdput(bdev); if (!sb) -diff -NurpP --minimal linux-2.6.36/fs/reiserfs/file.c linux-2.6.36-vs2.3.0.36.33/fs/reiserfs/file.c +diff -NurpP --minimal linux-2.6.36/fs/reiserfs/file.c linux-2.6.36-vs2.3.0.36.36/fs/reiserfs/file.c --- linux-2.6.36/fs/reiserfs/file.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/reiserfs/file.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/reiserfs/file.c 2010-10-21 13:09:36.000000000 +0200 @@ -313,4 +313,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-2.6.36/fs/reiserfs/inode.c linux-2.6.36-vs2.3.0.36.33/fs/reiserfs/inode.c +diff -NurpP --minimal linux-2.6.36/fs/reiserfs/inode.c linux-2.6.36-vs2.3.0.36.36/fs/reiserfs/inode.c --- linux-2.6.36/fs/reiserfs/inode.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/reiserfs/inode.c 2010-10-21 13:59:16.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/reiserfs/inode.c 2010-10-21 13:59:16.000000000 +0200 @@ -19,6 +19,7 @@ #include <linux/writeback.h> #include <linux/quotaops.h> @@ -7458,9 +7474,9 @@ diff -NurpP --minimal linux-2.6.36/fs/reiserfs/inode.c linux-2.6.36-vs2.3.0.36.3 mark_inode_dirty(inode); error = journal_end(&th, inode->i_sb, jbegin_count); if (error) -diff -NurpP --minimal linux-2.6.36/fs/reiserfs/ioctl.c linux-2.6.36-vs2.3.0.36.33/fs/reiserfs/ioctl.c +diff -NurpP --minimal linux-2.6.36/fs/reiserfs/ioctl.c linux-2.6.36-vs2.3.0.36.36/fs/reiserfs/ioctl.c --- linux-2.6.36/fs/reiserfs/ioctl.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/reiserfs/ioctl.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/reiserfs/ioctl.c 2010-10-21 13:09:36.000000000 +0200 @@ -7,11 +7,27 @@ #include <linux/mount.h> #include <linux/reiserfs_fs.h> @@ -7528,9 +7544,9 @@ diff -NurpP --minimal linux-2.6.36/fs/reiserfs/ioctl.c linux-2.6.36-vs2.3.0.36.3 sd_attrs_to_i_attrs(flags, inode); REISERFS_I(inode)->i_attrs = flags; inode->i_ctime = CURRENT_TIME_SEC; -diff -NurpP --minimal linux-2.6.36/fs/reiserfs/namei.c linux-2.6.36-vs2.3.0.36.33/fs/reiserfs/namei.c +diff -NurpP --minimal linux-2.6.36/fs/reiserfs/namei.c linux-2.6.36-vs2.3.0.36.36/fs/reiserfs/namei.c --- linux-2.6.36/fs/reiserfs/namei.c 2010-08-02 16:52:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/reiserfs/namei.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/reiserfs/namei.c 2010-10-21 13:09:36.000000000 +0200 @@ -18,6 +18,7 @@ #include <linux/reiserfs_acl.h> #include <linux/reiserfs_xattr.h> @@ -7555,9 +7571,9 @@ diff -NurpP --minimal linux-2.6.36/fs/reiserfs/namei.c linux-2.6.36-vs2.3.0.36.3 }; /* -diff -NurpP --minimal linux-2.6.36/fs/reiserfs/super.c linux-2.6.36-vs2.3.0.36.33/fs/reiserfs/super.c +diff -NurpP --minimal linux-2.6.36/fs/reiserfs/super.c linux-2.6.36-vs2.3.0.36.36/fs/reiserfs/super.c --- linux-2.6.36/fs/reiserfs/super.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/reiserfs/super.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/reiserfs/super.c 2010-10-21 13:09:36.000000000 +0200 @@ -893,6 +893,14 @@ static int reiserfs_parse_options(struct {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT}, {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT}, @@ -7599,9 +7615,9 @@ diff -NurpP --minimal linux-2.6.36/fs/reiserfs/super.c linux-2.6.36-vs2.3.0.36.3 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-2.6.36/fs/reiserfs/xattr.c linux-2.6.36-vs2.3.0.36.33/fs/reiserfs/xattr.c +diff -NurpP --minimal linux-2.6.36/fs/reiserfs/xattr.c linux-2.6.36-vs2.3.0.36.36/fs/reiserfs/xattr.c --- linux-2.6.36/fs/reiserfs/xattr.c 2010-08-02 16:52:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/reiserfs/xattr.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/reiserfs/xattr.c 2010-10-21 13:09:36.000000000 +0200 @@ -40,6 +40,7 @@ #include <linux/errno.h> #include <linux/gfp.h> @@ -7610,9 +7626,9 @@ diff -NurpP --minimal linux-2.6.36/fs/reiserfs/xattr.c linux-2.6.36-vs2.3.0.36.3 #include <linux/file.h> #include <linux/pagemap.h> #include <linux/xattr.h> -diff -NurpP --minimal linux-2.6.36/fs/stat.c linux-2.6.36-vs2.3.0.36.33/fs/stat.c +diff -NurpP --minimal linux-2.6.36/fs/stat.c linux-2.6.36-vs2.3.0.36.36/fs/stat.c --- linux-2.6.36/fs/stat.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/stat.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/stat.c 2010-10-21 13:09:36.000000000 +0200 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -7621,9 +7637,9 @@ diff -NurpP --minimal linux-2.6.36/fs/stat.c linux-2.6.36-vs2.3.0.36.33/fs/stat. stat->rdev = inode->i_rdev; stat->atime = inode->i_atime; stat->mtime = inode->i_mtime; -diff -NurpP --minimal linux-2.6.36/fs/statfs.c linux-2.6.36-vs2.3.0.36.33/fs/statfs.c +diff -NurpP --minimal linux-2.6.36/fs/statfs.c linux-2.6.36-vs2.3.0.36.36/fs/statfs.c --- linux-2.6.36/fs/statfs.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/statfs.c 2010-10-21 14:07:35.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/statfs.c 2010-10-21 14:07:35.000000000 +0200 @@ -7,6 +7,8 @@ #include <linux/statfs.h> #include <linux/security.h> @@ -7642,9 +7658,9 @@ diff -NurpP --minimal linux-2.6.36/fs/statfs.c linux-2.6.36-vs2.3.0.36.33/fs/sta return retval; } -diff -NurpP --minimal linux-2.6.36/fs/super.c linux-2.6.36-vs2.3.0.36.33/fs/super.c +diff -NurpP --minimal linux-2.6.36/fs/super.c linux-2.6.36-vs2.3.0.36.36/fs/super.c --- linux-2.6.36/fs/super.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/super.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/super.c 2010-10-21 13:09:36.000000000 +0200 @@ -30,6 +30,9 @@ #include <linux/idr.h> #include <linux/mutex.h> @@ -7697,9 +7713,9 @@ diff -NurpP --minimal linux-2.6.36/fs/super.c linux-2.6.36-vs2.3.0.36.33/fs/supe if (error) goto out_sb; -diff -NurpP --minimal linux-2.6.36/fs/sysfs/mount.c linux-2.6.36-vs2.3.0.36.33/fs/sysfs/mount.c +diff -NurpP --minimal linux-2.6.36/fs/sysfs/mount.c linux-2.6.36-vs2.3.0.36.36/fs/sysfs/mount.c --- linux-2.6.36/fs/sysfs/mount.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/sysfs/mount.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/sysfs/mount.c 2010-10-21 13:09:36.000000000 +0200 @@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super sb->s_blocksize = PAGE_CACHE_SIZE; @@ -7709,9 +7725,9 @@ diff -NurpP --minimal linux-2.6.36/fs/sysfs/mount.c linux-2.6.36-vs2.3.0.36.33/f sb->s_op = &sysfs_ops; sb->s_time_gran = 1; -diff -NurpP --minimal linux-2.6.36/fs/utimes.c linux-2.6.36-vs2.3.0.36.33/fs/utimes.c +diff -NurpP --minimal linux-2.6.36/fs/utimes.c linux-2.6.36-vs2.3.0.36.36/fs/utimes.c --- linux-2.6.36/fs/utimes.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/utimes.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/utimes.c 2010-10-21 13:09:36.000000000 +0200 @@ -8,6 +8,8 @@ #include <linux/stat.h> #include <linux/utime.h> @@ -7741,9 +7757,9 @@ diff -NurpP --minimal linux-2.6.36/fs/utimes.c linux-2.6.36-vs2.3.0.36.33/fs/uti if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-2.6.36/fs/xattr.c linux-2.6.36-vs2.3.0.36.33/fs/xattr.c +diff -NurpP --minimal linux-2.6.36/fs/xattr.c linux-2.6.36-vs2.3.0.36.36/fs/xattr.c --- linux-2.6.36/fs/xattr.c 2010-08-02 16:52:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xattr.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xattr.c 2010-10-21 13:09:36.000000000 +0200 @@ -18,6 +18,7 @@ #include <linux/module.h> #include <linux/fsnotify.h> @@ -7761,9 +7777,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xattr.c linux-2.6.36-vs2.3.0.36.33/fs/xatt /* In user.* namespace, only regular files and directories can have * extended attributes. For sticky directories, only the owner and -diff -NurpP --minimal linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.36-vs2.3.0.36.33/fs/xfs/linux-2.6/xfs_ioctl.c +diff -NurpP --minimal linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.36-vs2.3.0.36.36/fs/xfs/linux-2.6/xfs_ioctl.c --- linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/linux-2.6/xfs_ioctl.c 2010-10-21 14:02:37.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/linux-2.6/xfs_ioctl.c 2010-10-21 14:02:37.000000000 +0200 @@ -28,7 +28,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -7832,9 +7848,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.36-vs2 return xfs_ioc_setxflags(ip, filp, arg); case XFS_IOC_FSSETDM: { -diff -NurpP --minimal linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.36-vs2.3.0.36.33/fs/xfs/linux-2.6/xfs_ioctl.h +diff -NurpP --minimal linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.36-vs2.3.0.36.36/fs/xfs/linux-2.6/xfs_ioctl.h --- linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 18:31:54.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/linux-2.6/xfs_ioctl.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/linux-2.6/xfs_ioctl.h 2010-10-21 13:09:36.000000000 +0200 @@ -70,6 +70,12 @@ xfs_handle_to_dentry( void __user *uhandle, u32 hlen); @@ -7848,9 +7864,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.36-vs2 extern long xfs_file_ioctl( struct file *filp, -diff -NurpP --minimal linux-2.6.36/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.36-vs2.3.0.36.33/fs/xfs/linux-2.6/xfs_iops.c +diff -NurpP --minimal linux-2.6.36/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.36-vs2.3.0.36.36/fs/xfs/linux-2.6/xfs_iops.c --- linux-2.6.36/fs/xfs/linux-2.6/xfs_iops.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/linux-2.6/xfs_iops.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/linux-2.6/xfs_iops.c 2010-10-21 13:09:36.000000000 +0200 @@ -30,6 +30,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -7926,9 +7942,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.36-vs2. switch (inode->i_mode & S_IFMT) { case S_IFBLK: -diff -NurpP --minimal linux-2.6.36/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.36-vs2.3.0.36.33/fs/xfs/linux-2.6/xfs_linux.h +diff -NurpP --minimal linux-2.6.36/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.36-vs2.3.0.36.36/fs/xfs/linux-2.6/xfs_linux.h --- linux-2.6.36/fs/xfs/linux-2.6/xfs_linux.h 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/linux-2.6/xfs_linux.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/linux-2.6/xfs_linux.h 2010-10-21 13:09:36.000000000 +0200 @@ -116,6 +116,7 @@ #define current_cpu() (raw_smp_processor_id()) @@ -7937,9 +7953,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.36-vs2 #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-2.6.36/fs/xfs/linux-2.6/xfs_super.c linux-2.6.36-vs2.3.0.36.33/fs/xfs/linux-2.6/xfs_super.c +diff -NurpP --minimal linux-2.6.36/fs/xfs/linux-2.6/xfs_super.c linux-2.6.36-vs2.3.0.36.36/fs/xfs/linux-2.6/xfs_super.c --- linux-2.6.36/fs/xfs/linux-2.6/xfs_super.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/linux-2.6/xfs_super.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/linux-2.6/xfs_super.c 2010-10-21 13:09:36.000000000 +0200 @@ -113,6 +113,9 @@ mempool_t *xfs_ioend_pool; #define MNTOPT_QUOTANOENF "qnoenforce" /* same as uqnoenforce */ #define MNTOPT_DELAYLOG "delaylog" /* Delayed loging enabled */ @@ -8012,9 +8028,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/linux-2.6/xfs_super.c linux-2.6.36-vs2 sb->s_magic = XFS_SB_MAGIC; sb->s_blocksize = mp->m_sb.sb_blocksize; sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1; -diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_dinode.h linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_dinode.h +diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_dinode.h linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_dinode.h --- linux-2.6.36/fs/xfs/xfs_dinode.h 2009-06-11 17:13:09.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_dinode.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_dinode.h 2010-10-21 13:09:36.000000000 +0200 @@ -50,7 +50,9 @@ typedef struct xfs_dinode { __be32 di_gid; /* owner's group id */ __be32 di_nlink; /* number of links to file */ @@ -8055,9 +8071,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_dinode.h linux-2.6.36-vs2.3.0.36.3 +#define XFS_DIVFLAG_COW 0x02 #endif /* __XFS_DINODE_H__ */ -diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_fs.h linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_fs.h +diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_fs.h linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_fs.h --- linux-2.6.36/fs/xfs/xfs_fs.h 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_fs.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_fs.h 2010-10-21 13:09:36.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 */ @@ -8078,9 +8094,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_fs.h linux-2.6.36-vs2.3.0.36.33/fs __u32 bs_dmevmask; /* DMIG event mask */ __u16 bs_dmstate; /* DMIG state info */ __u16 bs_aextents; /* attribute number of extents */ -diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_ialloc.c linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_ialloc.c +diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_ialloc.c linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_ialloc.c --- linux-2.6.36/fs/xfs/xfs_ialloc.c 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_ialloc.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_ialloc.c 2010-10-21 13:09:36.000000000 +0200 @@ -37,7 +37,6 @@ #include "xfs_error.h" #include "xfs_bmap.h" @@ -8089,9 +8105,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_ialloc.c linux-2.6.36-vs2.3.0.36.3 /* * Allocation group level functions. */ -diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_inode.c linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_inode.c +diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_inode.c linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_inode.c --- linux-2.6.36/fs/xfs/xfs_inode.c 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_inode.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_inode.c 2010-10-21 13:09:36.000000000 +0200 @@ -245,6 +245,7 @@ xfs_inotobp( return 0; } @@ -8266,9 +8282,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_inode.c linux-2.6.36-vs2.3.0.36.33 /* Wrap, we never let the log put out DI_MAX_FLUSH */ if (ip->i_d.di_flushiter == DI_MAX_FLUSH) -diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_inode.h linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_inode.h +diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_inode.h linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_inode.h --- linux-2.6.36/fs/xfs/xfs_inode.h 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_inode.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_inode.h 2010-10-21 13:09:36.000000000 +0200 @@ -135,7 +135,9 @@ typedef struct xfs_icdinode { __uint32_t di_gid; /* owner's group id */ __uint32_t di_nlink; /* number of links to file */ @@ -8289,9 +8305,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_inode.h linux-2.6.36-vs2.3.0.36.33 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-2.6.36/fs/xfs/xfs_itable.c linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_itable.c +diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_itable.c linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_itable.c --- linux-2.6.36/fs/xfs/xfs_itable.c 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_itable.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_itable.c 2010-10-21 13:09:36.000000000 +0200 @@ -97,6 +97,7 @@ xfs_bulkstat_one_int( buf->bs_mode = dic->di_mode; buf->bs_uid = dic->di_uid; @@ -8300,9 +8316,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_itable.c linux-2.6.36-vs2.3.0.36.3 buf->bs_size = dic->di_size; /* -diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_log_recover.c linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_log_recover.c +diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_log_recover.c linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_log_recover.c --- linux-2.6.36/fs/xfs/xfs_log_recover.c 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_log_recover.c 2010-10-21 14:02:02.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_log_recover.c 2010-10-21 14:02:02.000000000 +0200 @@ -2450,7 +2450,8 @@ xlog_recover_do_inode_trans( } @@ -8313,9 +8329,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_log_recover.c linux-2.6.36-vs2.3.0 /* the rest is in on-disk format */ if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) { -diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_mount.h linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_mount.h +diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_mount.h linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_mount.h --- linux-2.6.36/fs/xfs/xfs_mount.h 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_mount.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_mount.h 2010-10-21 13:09:36.000000000 +0200 @@ -238,6 +238,7 @@ typedef struct xfs_mount { allocator */ #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */ @@ -8324,9 +8340,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_mount.h linux-2.6.36-vs2.3.0.36.33 /* * Default minimum read and write sizes. -diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_vnodeops.c linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_vnodeops.c +diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_vnodeops.c linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_vnodeops.c --- linux-2.6.36/fs/xfs/xfs_vnodeops.c 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_vnodeops.c 2010-10-21 15:17:26.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_vnodeops.c 2010-10-21 15:17:26.000000000 +0200 @@ -50,6 +50,78 @@ #include "xfs_vnodeops.h" #include "xfs_trace.h" @@ -8464,9 +8480,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_vnodeops.c linux-2.6.36-vs2.3.0.36 if (iuid != uid) { if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) { ASSERT(mask & ATTR_UID); -diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_vnodeops.h linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_vnodeops.h +diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_vnodeops.h linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_vnodeops.h --- linux-2.6.36/fs/xfs/xfs_vnodeops.h 2010-07-07 18:31:54.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/fs/xfs/xfs_vnodeops.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/fs/xfs/xfs_vnodeops.h 2010-10-21 13:09:36.000000000 +0200 @@ -14,6 +14,7 @@ struct xfs_inode; struct xfs_iomap; @@ -8475,9 +8491,9 @@ diff -NurpP --minimal linux-2.6.36/fs/xfs/xfs_vnodeops.h linux-2.6.36-vs2.3.0.36 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-2.6.36/include/asm-generic/tlb.h linux-2.6.36-vs2.3.0.36.33/include/asm-generic/tlb.h +diff -NurpP --minimal linux-2.6.36/include/asm-generic/tlb.h linux-2.6.36-vs2.3.0.36.36/include/asm-generic/tlb.h --- linux-2.6.36/include/asm-generic/tlb.h 2009-09-10 15:26:24.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/asm-generic/tlb.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/asm-generic/tlb.h 2010-10-21 13:09:36.000000000 +0200 @@ -14,6 +14,7 @@ #define _ASM_GENERIC__TLB_H @@ -8486,9 +8502,9 @@ diff -NurpP --minimal linux-2.6.36/include/asm-generic/tlb.h linux-2.6.36-vs2.3. #include <asm/pgalloc.h> #include <asm/tlbflush.h> -diff -NurpP --minimal linux-2.6.36/include/linux/capability.h linux-2.6.36-vs2.3.0.36.33/include/linux/capability.h +diff -NurpP --minimal linux-2.6.36/include/linux/capability.h linux-2.6.36-vs2.3.0.36.36/include/linux/capability.h --- linux-2.6.36/include/linux/capability.h 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/capability.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/capability.h 2010-10-21 13:09:36.000000000 +0200 @@ -280,6 +280,7 @@ struct cpu_vfs_cap_data { arbitrary SCSI commands */ /* Allow setting encryption key on loopback filesystem */ @@ -8512,18 +8528,18 @@ diff -NurpP --minimal linux-2.6.36/include/linux/capability.h linux-2.6.36-vs2.3 #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) -diff -NurpP --minimal linux-2.6.36/include/linux/devpts_fs.h linux-2.6.36-vs2.3.0.36.33/include/linux/devpts_fs.h +diff -NurpP --minimal linux-2.6.36/include/linux/devpts_fs.h linux-2.6.36-vs2.3.0.36.36/include/linux/devpts_fs.h --- linux-2.6.36/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/devpts_fs.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/devpts_fs.h 2010-10-21 13:09:36.000000000 +0200 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc #endif - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/ext2_fs.h linux-2.6.36-vs2.3.0.36.33/include/linux/ext2_fs.h +diff -NurpP --minimal linux-2.6.36/include/linux/ext2_fs.h linux-2.6.36-vs2.3.0.36.36/include/linux/ext2_fs.h --- linux-2.6.36/include/linux/ext2_fs.h 2010-02-25 11:52:07.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/ext2_fs.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/ext2_fs.h 2010-10-21 13:09:36.000000000 +0200 @@ -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) */ @@ -8563,9 +8579,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/ext2_fs.h linux-2.6.36-vs2.3.0. #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt -diff -NurpP --minimal linux-2.6.36/include/linux/ext3_fs.h linux-2.6.36-vs2.3.0.36.33/include/linux/ext3_fs.h +diff -NurpP --minimal linux-2.6.36/include/linux/ext3_fs.h linux-2.6.36-vs2.3.0.36.36/include/linux/ext3_fs.h --- linux-2.6.36/include/linux/ext3_fs.h 2010-10-21 13:07:53.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/ext3_fs.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/ext3_fs.h 2010-10-21 13:09:36.000000000 +0200 @@ -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) */ @@ -8617,9 +8633,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/ext3_fs.h linux-2.6.36-vs2.3.0. /* ioctl.c */ extern long ext3_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-2.6.36/include/linux/fs.h linux-2.6.36-vs2.3.0.36.33/include/linux/fs.h +diff -NurpP --minimal linux-2.6.36/include/linux/fs.h linux-2.6.36-vs2.3.0.36.36/include/linux/fs.h --- linux-2.6.36/include/linux/fs.h 2010-10-21 13:07:53.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/fs.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/fs.h 2010-10-21 13:09:36.000000000 +0200 @@ -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 */ @@ -8798,9 +8814,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/fs.h linux-2.6.36-vs2.3.0.36.33 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-2.6.36/include/linux/gfs2_ondisk.h linux-2.6.36-vs2.3.0.36.33/include/linux/gfs2_ondisk.h +diff -NurpP --minimal linux-2.6.36/include/linux/gfs2_ondisk.h linux-2.6.36-vs2.3.0.36.36/include/linux/gfs2_ondisk.h --- linux-2.6.36/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/gfs2_ondisk.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/gfs2_ondisk.h 2010-10-21 13:09:36.000000000 +0200 @@ -211,6 +211,9 @@ enum { gfs2fl_NoAtime = 7, gfs2fl_Sync = 8, @@ -8821,9 +8837,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/gfs2_ondisk.h linux-2.6.36-vs2. #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */ #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 #define GFS2_DIF_INHERIT_JDATA 0x80000000 -diff -NurpP --minimal linux-2.6.36/include/linux/if_tun.h linux-2.6.36-vs2.3.0.36.33/include/linux/if_tun.h +diff -NurpP --minimal linux-2.6.36/include/linux/if_tun.h linux-2.6.36-vs2.3.0.36.36/include/linux/if_tun.h --- linux-2.6.36/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/if_tun.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/if_tun.h 2010-10-21 13:09:36.000000000 +0200 @@ -53,6 +53,7 @@ #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog) #define TUNGETVNETHDRSZ _IOR('T', 215, int) @@ -8832,9 +8848,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/if_tun.h linux-2.6.36-vs2.3.0.3 /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-2.6.36/include/linux/init_task.h linux-2.6.36-vs2.3.0.36.33/include/linux/init_task.h +diff -NurpP --minimal linux-2.6.36/include/linux/init_task.h linux-2.6.36-vs2.3.0.36.36/include/linux/init_task.h --- linux-2.6.36/include/linux/init_task.h 2010-08-02 16:52:54.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/init_task.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/init_task.h 2010-10-21 13:09:36.000000000 +0200 @@ -172,6 +172,10 @@ extern struct cred init_cred; INIT_FTRACE_GRAPH \ INIT_TRACE_RECURSION \ @@ -8846,9 +8862,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/init_task.h linux-2.6.36-vs2.3. } -diff -NurpP --minimal linux-2.6.36/include/linux/ipc.h linux-2.6.36-vs2.3.0.36.33/include/linux/ipc.h +diff -NurpP --minimal linux-2.6.36/include/linux/ipc.h linux-2.6.36-vs2.3.0.36.36/include/linux/ipc.h --- linux-2.6.36/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/ipc.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/ipc.h 2010-10-21 13:09:36.000000000 +0200 @@ -91,6 +91,7 @@ struct kern_ipc_perm key_t key; uid_t uid; @@ -8857,9 +8873,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/ipc.h linux-2.6.36-vs2.3.0.36.3 uid_t cuid; gid_t cgid; mode_t mode; -diff -NurpP --minimal linux-2.6.36/include/linux/Kbuild linux-2.6.36-vs2.3.0.36.33/include/linux/Kbuild +diff -NurpP --minimal linux-2.6.36/include/linux/Kbuild linux-2.6.36-vs2.3.0.36.36/include/linux/Kbuild --- linux-2.6.36/include/linux/Kbuild 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/Kbuild 2010-10-21 14:12:01.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/Kbuild 2010-10-21 14:12:01.000000000 +0200 @@ -15,6 +15,7 @@ header-y += netfilter_bridge/ header-y += netfilter_ipv4/ header-y += netfilter_ipv6/ @@ -8868,9 +8884,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/Kbuild linux-2.6.36-vs2.3.0.36. header-y += wimax/ objhdr-y += version.h -diff -NurpP --minimal linux-2.6.36/include/linux/loop.h linux-2.6.36-vs2.3.0.36.33/include/linux/loop.h +diff -NurpP --minimal linux-2.6.36/include/linux/loop.h linux-2.6.36-vs2.3.0.36.36/include/linux/loop.h --- linux-2.6.36/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/loop.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/loop.h 2010-10-21 13:09:36.000000000 +0200 @@ -45,6 +45,7 @@ struct loop_device { struct loop_func_table *lo_encryption; __u32 lo_init[2]; @@ -8879,9 +8895,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/loop.h linux-2.6.36-vs2.3.0.36. int (*ioctl)(struct loop_device *, int cmd, unsigned long arg); -diff -NurpP --minimal linux-2.6.36/include/linux/magic.h linux-2.6.36-vs2.3.0.36.33/include/linux/magic.h +diff -NurpP --minimal linux-2.6.36/include/linux/magic.h linux-2.6.36-vs2.3.0.36.36/include/linux/magic.h --- linux-2.6.36/include/linux/magic.h 2010-07-07 18:31:55.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/magic.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/magic.h 2010-10-21 13:09:36.000000000 +0200 @@ -3,7 +3,7 @@ #define ADFS_SUPER_MAGIC 0xadf5 @@ -8899,9 +8915,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/magic.h linux-2.6.36-vs2.3.0.36 #define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */ #define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */ -diff -NurpP --minimal linux-2.6.36/include/linux/major.h linux-2.6.36-vs2.3.0.36.33/include/linux/major.h +diff -NurpP --minimal linux-2.6.36/include/linux/major.h linux-2.6.36-vs2.3.0.36.36/include/linux/major.h --- linux-2.6.36/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/major.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/major.h 2010-10-21 13:09:36.000000000 +0200 @@ -15,6 +15,7 @@ #define HD_MAJOR IDE0_MAJOR #define PTY_SLAVE_MAJOR 3 @@ -8910,9 +8926,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/major.h linux-2.6.36-vs2.3.0.36 #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-2.6.36/include/linux/memcontrol.h linux-2.6.36-vs2.3.0.36.33/include/linux/memcontrol.h +diff -NurpP --minimal linux-2.6.36/include/linux/memcontrol.h linux-2.6.36-vs2.3.0.36.36/include/linux/memcontrol.h --- linux-2.6.36/include/linux/memcontrol.h 2010-10-21 13:07:53.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/memcontrol.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/memcontrol.h 2010-10-21 13:09:36.000000000 +0200 @@ -77,6 +77,13 @@ int task_in_mem_cgroup(struct task_struc extern struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page); extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p); @@ -8927,9 +8943,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/memcontrol.h linux-2.6.36-vs2.3 static inline int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup) { -diff -NurpP --minimal linux-2.6.36/include/linux/mm_types.h linux-2.6.36-vs2.3.0.36.33/include/linux/mm_types.h +diff -NurpP --minimal linux-2.6.36/include/linux/mm_types.h linux-2.6.36-vs2.3.0.36.36/include/linux/mm_types.h --- linux-2.6.36/include/linux/mm_types.h 2010-10-21 13:07:53.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/mm_types.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/mm_types.h 2010-10-21 13:09:36.000000000 +0200 @@ -269,6 +269,7 @@ struct mm_struct { /* Architecture-specific MM context */ @@ -8938,9 +8954,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/mm_types.h linux-2.6.36-vs2.3.0 /* Swap token stuff */ /* -diff -NurpP --minimal linux-2.6.36/include/linux/mount.h linux-2.6.36-vs2.3.0.36.33/include/linux/mount.h +diff -NurpP --minimal linux-2.6.36/include/linux/mount.h linux-2.6.36-vs2.3.0.36.36/include/linux/mount.h --- linux-2.6.36/include/linux/mount.h 2010-10-21 13:07:53.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/mount.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/mount.h 2010-10-21 13:09:36.000000000 +0200 @@ -46,6 +46,9 @@ struct mnt_namespace; #define MNT_INTERNAL 0x4000 @@ -8959,9 +8975,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/mount.h linux-2.6.36-vs2.3.0.36 }; static inline int *get_mnt_writers_ptr(struct vfsmount *mnt) -diff -NurpP --minimal linux-2.6.36/include/linux/net.h linux-2.6.36-vs2.3.0.36.33/include/linux/net.h +diff -NurpP --minimal linux-2.6.36/include/linux/net.h linux-2.6.36-vs2.3.0.36.36/include/linux/net.h --- linux-2.6.36/include/linux/net.h 2010-08-02 16:52:55.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/net.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/net.h 2010-10-21 13:09:36.000000000 +0200 @@ -71,6 +71,7 @@ struct net; #define SOCK_NOSPACE 2 #define SOCK_PASSCRED 3 @@ -8970,9 +8986,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/net.h linux-2.6.36-vs2.3.0.36.3 #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-2.6.36/include/linux/nfs_mount.h linux-2.6.36-vs2.3.0.36.33/include/linux/nfs_mount.h +diff -NurpP --minimal linux-2.6.36/include/linux/nfs_mount.h linux-2.6.36-vs2.3.0.36.36/include/linux/nfs_mount.h --- linux-2.6.36/include/linux/nfs_mount.h 2010-10-21 13:07:54.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/nfs_mount.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/nfs_mount.h 2010-10-21 13:09:36.000000000 +0200 @@ -63,7 +63,8 @@ struct nfs_mount_data { #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ @@ -8983,9 +8999,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/nfs_mount.h linux-2.6.36-vs2.3. /* The following are for internal use only */ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-2.6.36/include/linux/nsproxy.h linux-2.6.36-vs2.3.0.36.33/include/linux/nsproxy.h +diff -NurpP --minimal linux-2.6.36/include/linux/nsproxy.h linux-2.6.36-vs2.3.0.36.36/include/linux/nsproxy.h --- linux-2.6.36/include/linux/nsproxy.h 2009-06-11 17:13:17.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/nsproxy.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/nsproxy.h 2010-10-21 13:09:36.000000000 +0200 @@ -3,6 +3,7 @@ #include <linux/spinlock.h> @@ -9034,9 +9050,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/nsproxy.h linux-2.6.36-vs2.3.0. } #ifdef CONFIG_CGROUP_NS -diff -NurpP --minimal linux-2.6.36/include/linux/pid.h linux-2.6.36-vs2.3.0.36.33/include/linux/pid.h +diff -NurpP --minimal linux-2.6.36/include/linux/pid.h linux-2.6.36-vs2.3.0.36.36/include/linux/pid.h --- linux-2.6.36/include/linux/pid.h 2009-03-24 14:22:43.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/pid.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/pid.h 2010-10-21 13:09:36.000000000 +0200 @@ -8,7 +8,8 @@ enum pid_type PIDTYPE_PID, PIDTYPE_PGID, @@ -9055,9 +9071,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/pid.h linux-2.6.36-vs2.3.0.36.3 pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-2.6.36/include/linux/proc_fs.h linux-2.6.36-vs2.3.0.36.33/include/linux/proc_fs.h +diff -NurpP --minimal linux-2.6.36/include/linux/proc_fs.h linux-2.6.36-vs2.3.0.36.36/include/linux/proc_fs.h --- linux-2.6.36/include/linux/proc_fs.h 2009-12-03 20:02:56.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/proc_fs.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/proc_fs.h 2010-10-21 13:09:36.000000000 +0200 @@ -56,6 +56,7 @@ struct proc_dir_entry { nlink_t nlink; uid_t uid; @@ -9093,9 +9109,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/proc_fs.h linux-2.6.36-vs2.3.0. int fd; union proc_op op; struct proc_dir_entry *pde; -diff -NurpP --minimal linux-2.6.36/include/linux/quotaops.h linux-2.6.36-vs2.3.0.36.33/include/linux/quotaops.h +diff -NurpP --minimal linux-2.6.36/include/linux/quotaops.h linux-2.6.36-vs2.3.0.36.36/include/linux/quotaops.h --- linux-2.6.36/include/linux/quotaops.h 2010-10-21 13:07:54.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/quotaops.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/quotaops.h 2010-10-21 13:09:36.000000000 +0200 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -9137,9 +9153,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/quotaops.h linux-2.6.36-vs2.3.0 } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-2.6.36/include/linux/reboot.h linux-2.6.36-vs2.3.0.36.33/include/linux/reboot.h +diff -NurpP --minimal linux-2.6.36/include/linux/reboot.h linux-2.6.36-vs2.3.0.36.36/include/linux/reboot.h --- linux-2.6.36/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/reboot.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/reboot.h 2010-10-21 13:09:36.000000000 +0200 @@ -33,6 +33,7 @@ #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 @@ -9148,9 +9164,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/reboot.h linux-2.6.36-vs2.3.0.3 #ifdef __KERNEL__ -diff -NurpP --minimal linux-2.6.36/include/linux/reiserfs_fs.h linux-2.6.36-vs2.3.0.36.33/include/linux/reiserfs_fs.h +diff -NurpP --minimal linux-2.6.36/include/linux/reiserfs_fs.h linux-2.6.36-vs2.3.0.36.36/include/linux/reiserfs_fs.h --- linux-2.6.36/include/linux/reiserfs_fs.h 2010-10-21 13:07:54.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/reiserfs_fs.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/reiserfs_fs.h 2010-10-21 13:09:36.000000000 +0200 @@ -977,6 +977,11 @@ struct stat_data_v1 { #define REISERFS_COMPR_FL FS_COMPR_FL #define REISERFS_NOTAIL_FL FS_NOTAIL_FL @@ -9181,9 +9197,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/reiserfs_fs.h linux-2.6.36-vs2. /* namei.c */ void set_de_name_and_namelen(struct reiserfs_dir_entry *de); -diff -NurpP --minimal linux-2.6.36/include/linux/reiserfs_fs_sb.h linux-2.6.36-vs2.3.0.36.33/include/linux/reiserfs_fs_sb.h +diff -NurpP --minimal linux-2.6.36/include/linux/reiserfs_fs_sb.h linux-2.6.36-vs2.3.0.36.36/include/linux/reiserfs_fs_sb.h --- linux-2.6.36/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/reiserfs_fs_sb.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/reiserfs_fs_sb.h 2010-10-21 13:09:36.000000000 +0200 @@ -476,6 +476,7 @@ enum reiserfs_mount_options { REISERFS_EXPOSE_PRIVROOT, REISERFS_BARRIER_NONE, @@ -9192,9 +9208,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/reiserfs_fs_sb.h linux-2.6.36-v /* Actions on error */ REISERFS_ERROR_PANIC, -diff -NurpP --minimal linux-2.6.36/include/linux/sched.h linux-2.6.36-vs2.3.0.36.33/include/linux/sched.h +diff -NurpP --minimal linux-2.6.36/include/linux/sched.h linux-2.6.36-vs2.3.0.36.36/include/linux/sched.h --- linux-2.6.36/include/linux/sched.h 2010-10-21 13:07:54.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/sched.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/sched.h 2010-10-21 13:09:36.000000000 +0200 @@ -1339,6 +1339,14 @@ struct task_struct { #endif seccomp_t seccomp; @@ -9241,9 +9257,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/sched.h linux-2.6.36-vs2.3.0.36 } -diff -NurpP --minimal linux-2.6.36/include/linux/shmem_fs.h linux-2.6.36-vs2.3.0.36.33/include/linux/shmem_fs.h +diff -NurpP --minimal linux-2.6.36/include/linux/shmem_fs.h linux-2.6.36-vs2.3.0.36.36/include/linux/shmem_fs.h --- linux-2.6.36/include/linux/shmem_fs.h 2010-10-21 13:07:55.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/shmem_fs.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/shmem_fs.h 2010-10-21 13:09:36.000000000 +0200 @@ -9,6 +9,9 @@ #define SHMEM_NR_DIRECT 16 @@ -9254,9 +9270,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/shmem_fs.h linux-2.6.36-vs2.3.0 struct shmem_inode_info { spinlock_t lock; unsigned long flags; -diff -NurpP --minimal linux-2.6.36/include/linux/stat.h linux-2.6.36-vs2.3.0.36.33/include/linux/stat.h +diff -NurpP --minimal linux-2.6.36/include/linux/stat.h linux-2.6.36-vs2.3.0.36.36/include/linux/stat.h --- linux-2.6.36/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/stat.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/stat.h 2010-10-21 13:09:36.000000000 +0200 @@ -66,6 +66,7 @@ struct kstat { unsigned int nlink; uid_t uid; @@ -9265,9 +9281,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/stat.h linux-2.6.36-vs2.3.0.36. dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-2.6.36/include/linux/sunrpc/auth.h linux-2.6.36-vs2.3.0.36.33/include/linux/sunrpc/auth.h +diff -NurpP --minimal linux-2.6.36/include/linux/sunrpc/auth.h linux-2.6.36-vs2.3.0.36.36/include/linux/sunrpc/auth.h --- linux-2.6.36/include/linux/sunrpc/auth.h 2010-10-21 13:07:55.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/sunrpc/auth.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/sunrpc/auth.h 2010-10-21 13:09:36.000000000 +0200 @@ -25,6 +25,7 @@ struct auth_cred { uid_t uid; @@ -9276,9 +9292,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/sunrpc/auth.h linux-2.6.36-vs2. struct group_info *group_info; unsigned char machine_cred : 1; }; -diff -NurpP --minimal linux-2.6.36/include/linux/sunrpc/clnt.h linux-2.6.36-vs2.3.0.36.33/include/linux/sunrpc/clnt.h +diff -NurpP --minimal linux-2.6.36/include/linux/sunrpc/clnt.h linux-2.6.36-vs2.3.0.36.36/include/linux/sunrpc/clnt.h --- linux-2.6.36/include/linux/sunrpc/clnt.h 2010-10-21 13:07:55.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/sunrpc/clnt.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/sunrpc/clnt.h 2010-10-21 13:09:36.000000000 +0200 @@ -49,7 +49,8 @@ struct rpc_clnt { unsigned int cl_softrtry : 1,/* soft timeouts */ cl_discrtry : 1,/* disconnect before retry */ @@ -9289,9 +9305,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/sunrpc/clnt.h linux-2.6.36-vs2. struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-2.6.36/include/linux/syscalls.h linux-2.6.36-vs2.3.0.36.33/include/linux/syscalls.h +diff -NurpP --minimal linux-2.6.36/include/linux/syscalls.h linux-2.6.36-vs2.3.0.36.36/include/linux/syscalls.h --- linux-2.6.36/include/linux/syscalls.h 2010-10-21 13:07:55.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/syscalls.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/syscalls.h 2010-10-21 13:09:36.000000000 +0200 @@ -478,6 +478,8 @@ asmlinkage long sys_symlink(const char _ asmlinkage long sys_unlink(const char __user *pathname); asmlinkage long sys_rename(const char __user *oldname, @@ -9301,9 +9317,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/syscalls.h linux-2.6.36-vs2.3.0 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-2.6.36/include/linux/sysctl.h linux-2.6.36-vs2.3.0.36.33/include/linux/sysctl.h +diff -NurpP --minimal linux-2.6.36/include/linux/sysctl.h linux-2.6.36-vs2.3.0.36.36/include/linux/sysctl.h --- linux-2.6.36/include/linux/sysctl.h 2010-08-02 16:52:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/sysctl.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/sysctl.h 2010-10-21 13:09:36.000000000 +0200 @@ -60,6 +60,7 @@ enum CTL_ABI=9, /* Binary emulation */ CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ @@ -9320,9 +9336,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/sysctl.h linux-2.6.36-vs2.3.0.3 KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-2.6.36/include/linux/sysfs.h linux-2.6.36-vs2.3.0.36.33/include/linux/sysfs.h +diff -NurpP --minimal linux-2.6.36/include/linux/sysfs.h linux-2.6.36-vs2.3.0.36.36/include/linux/sysfs.h --- linux-2.6.36/include/linux/sysfs.h 2010-10-21 13:07:55.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/sysfs.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/sysfs.h 2010-10-21 13:09:36.000000000 +0200 @@ -19,6 +19,8 @@ #include <linux/kobject_ns.h> #include <asm/atomic.h> @@ -9332,9 +9348,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/sysfs.h linux-2.6.36-vs2.3.0.36 struct kobject; struct module; enum kobj_ns_type; -diff -NurpP --minimal linux-2.6.36/include/linux/time.h linux-2.6.36-vs2.3.0.36.33/include/linux/time.h +diff -NurpP --minimal linux-2.6.36/include/linux/time.h linux-2.6.36-vs2.3.0.36.36/include/linux/time.h --- linux-2.6.36/include/linux/time.h 2010-10-21 13:07:55.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/time.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/time.h 2010-10-21 13:09:36.000000000 +0200 @@ -252,6 +252,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; @@ -9345,9 +9361,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/time.h linux-2.6.36-vs2.3.0.36. #endif /* __KERNEL__ */ #define NFDBITS __NFDBITS -diff -NurpP --minimal linux-2.6.36/include/linux/types.h linux-2.6.36-vs2.3.0.36.33/include/linux/types.h +diff -NurpP --minimal linux-2.6.36/include/linux/types.h linux-2.6.36-vs2.3.0.36.36/include/linux/types.h --- linux-2.6.36/include/linux/types.h 2010-10-21 13:07:55.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/types.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/types.h 2010-10-21 13:09:36.000000000 +0200 @@ -40,6 +40,9 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; @@ -9358,9 +9374,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/types.h linux-2.6.36-vs2.3.0.36 typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-2.6.36/include/linux/vroot.h linux-2.6.36-vs2.3.0.36.33/include/linux/vroot.h +diff -NurpP --minimal linux-2.6.36/include/linux/vroot.h linux-2.6.36-vs2.3.0.36.36/include/linux/vroot.h --- linux-2.6.36/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vroot.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vroot.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,51 @@ + +/* @@ -9413,9 +9429,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vroot.h linux-2.6.36-vs2.3.0.36 +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vs_base.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_base.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_base.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_base.h --- linux-2.6.36/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_base.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_base.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,10 @@ +#ifndef _VS_BASE_H +#define _VS_BASE_H @@ -9427,9 +9443,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_base.h linux-2.6.36-vs2.3.0. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vs_context.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_context.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_context.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_context.h --- linux-2.6.36/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_context.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_context.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,242 @@ +#ifndef _VS_CONTEXT_H +#define _VS_CONTEXT_H @@ -9673,9 +9689,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_context.h linux-2.6.36-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vs_cowbl.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_cowbl.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_cowbl.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_cowbl.h --- linux-2.6.36/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_cowbl.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_cowbl.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,48 @@ +#ifndef _VS_COWBL_H +#define _VS_COWBL_H @@ -9725,9 +9741,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_cowbl.h linux-2.6.36-vs2.3.0 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vs_cvirt.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_cvirt.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_cvirt.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_cvirt.h --- linux-2.6.36/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_cvirt.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_cvirt.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,50 @@ +#ifndef _VS_CVIRT_H +#define _VS_CVIRT_H @@ -9779,9 +9795,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_cvirt.h linux-2.6.36-vs2.3.0 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vs_device.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_device.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_device.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_device.h --- linux-2.6.36/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_device.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_device.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,45 @@ +#ifndef _VS_DEVICE_H +#define _VS_DEVICE_H @@ -9828,9 +9844,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_device.h linux-2.6.36-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vs_dlimit.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_dlimit.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_dlimit.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_dlimit.h --- linux-2.6.36/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_dlimit.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_dlimit.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,215 @@ +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H @@ -10047,9 +10063,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_dlimit.h linux-2.6.36-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/base.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/base.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/base.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/base.h --- linux-2.6.36/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/base.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/base.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,170 @@ +#ifndef _VX_BASE_H +#define _VX_BASE_H @@ -10221,9 +10237,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/base.h linux-2.6.36-vs2 +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cacct_cmd.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/cacct_cmd.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cacct_cmd.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/cacct_cmd.h --- linux-2.6.36/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/cacct_cmd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/cacct_cmd.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,23 @@ +#ifndef _VX_CACCT_CMD_H +#define _VX_CACCT_CMD_H @@ -10248,9 +10264,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cacct_cmd.h linux-2.6.3 + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_CMD_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cacct_def.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/cacct_def.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cacct_def.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/cacct_def.h --- linux-2.6.36/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/cacct_def.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/cacct_def.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,43 @@ +#ifndef _VX_CACCT_DEF_H +#define _VX_CACCT_DEF_H @@ -10295,9 +10311,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cacct_def.h linux-2.6.3 +#endif + +#endif /* _VX_CACCT_DEF_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cacct.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/cacct.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cacct.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/cacct.h --- linux-2.6.36/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/cacct.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/cacct.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,15 @@ +#ifndef _VX_CACCT_H +#define _VX_CACCT_H @@ -10314,9 +10330,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cacct.h linux-2.6.36-vs +}; + +#endif /* _VX_CACCT_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cacct_int.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/cacct_int.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cacct_int.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/cacct_int.h --- linux-2.6.36/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/cacct_int.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/cacct_int.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,21 @@ +#ifndef _VX_CACCT_INT_H +#define _VX_CACCT_INT_H @@ -10339,9 +10355,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cacct_int.h linux-2.6.3 + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_INT_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/check.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/check.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/check.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/check.h --- linux-2.6.36/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/check.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/check.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,89 @@ +#ifndef _VS_CHECK_H +#define _VS_CHECK_H @@ -10432,9 +10448,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/check.h linux-2.6.36-vs +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/context_cmd.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/context_cmd.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/context_cmd.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/context_cmd.h --- linux-2.6.36/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/context_cmd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/context_cmd.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,145 @@ +#ifndef _VX_CONTEXT_CMD_H +#define _VX_CONTEXT_CMD_H @@ -10581,9 +10597,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/context_cmd.h linux-2.6 + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/context.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/context.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/context.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/context.h --- linux-2.6.36/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/context.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/context.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,184 @@ +#ifndef _VX_CONTEXT_H +#define _VX_CONTEXT_H @@ -10769,9 +10785,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/context.h linux-2.6.36- + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cvirt_cmd.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/cvirt_cmd.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cvirt_cmd.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/cvirt_cmd.h --- linux-2.6.36/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/cvirt_cmd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/cvirt_cmd.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,53 @@ +#ifndef _VX_CVIRT_CMD_H +#define _VX_CVIRT_CMD_H @@ -10826,9 +10842,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cvirt_cmd.h linux-2.6.3 + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_CMD_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cvirt_def.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/cvirt_def.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cvirt_def.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/cvirt_def.h --- linux-2.6.36/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/cvirt_def.h 2010-10-21 14:26:47.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/cvirt_def.h 2010-10-21 14:26:47.000000000 +0200 @@ -0,0 +1,80 @@ +#ifndef _VX_CVIRT_DEF_H +#define _VX_CVIRT_DEF_H @@ -10910,9 +10926,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cvirt_def.h linux-2.6.3 +#endif + +#endif /* _VX_CVIRT_DEF_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cvirt.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/cvirt.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cvirt.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/cvirt.h --- linux-2.6.36/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/cvirt.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/cvirt.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,20 @@ +#ifndef _VX_CVIRT_H +#define _VX_CVIRT_H @@ -10934,9 +10950,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/cvirt.h linux-2.6.36-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/debug_cmd.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/debug_cmd.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/debug_cmd.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/debug_cmd.h --- linux-2.6.36/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/debug_cmd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/debug_cmd.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,58 @@ +#ifndef _VX_DEBUG_CMD_H +#define _VX_DEBUG_CMD_H @@ -10996,10 +11012,10 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/debug_cmd.h linux-2.6.3 + +#endif /* __KERNEL__ */ +#endif /* _VX_DEBUG_CMD_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/debug.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/debug.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/debug.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/debug.h --- linux-2.6.36/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/debug.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,127 @@ ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/debug.h 2010-10-21 18:35:25.000000000 +0200 +@@ -0,0 +1,140 @@ +#ifndef _VX_DEBUG_H +#define _VX_DEBUG_H + @@ -11012,6 +11028,19 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/debug.h linux-2.6.36-vs + imajor((d)->bd_inode), iminor((d)->bd_inode) +#define VXF_DEV "%p[%lu,%d:%d]" + ++#if defined(CONFIG_QUOTES_UTF8) ++#define VS_Q_LQM "\xc2\xbb" ++#define VS_Q_RQM "\xc2\xab" ++#elif defined(CONFIG_QUOTES_ASCII) ++#define VS_Q_LQM "\x27" ++#define VS_Q_RQM "\x27" ++#else ++#define VS_Q_LQM "\xbb" ++#define VS_Q_RQM "\xab" ++#endif ++ ++#define VS_Q(f) VS_Q_LQM f VS_Q_RQM ++ + +#define vxd_path(p) \ + ({ static char _buffer[PATH_MAX]; \ @@ -11088,7 +11117,7 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/debug.h linux-2.6.36-vs +#ifdef CONFIG_VSERVER_WARN + +#define VX_WARNLEVEL KERN_WARNING "vxW: " -+#define VX_WARN_TASK "[»%s«,%u:#%u|%u|%u] " ++#define VX_WARN_TASK "[" VS_Q("%s") ",%u:#%u|%u|%u] " +#define VX_WARN_XID "[xid #%u] " +#define VX_WARN_NID "[nid #%u] " +#define VX_WARN_TAG "[tag #%u] " @@ -11127,9 +11156,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/debug.h linux-2.6.36-vs + + +#endif /* _VX_DEBUG_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/device_cmd.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/device_cmd.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/device_cmd.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/device_cmd.h --- linux-2.6.36/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/device_cmd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/device_cmd.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,44 @@ +#ifndef _VX_DEVICE_CMD_H +#define _VX_DEVICE_CMD_H @@ -11175,9 +11204,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/device_cmd.h linux-2.6. + +#endif /* __KERNEL__ */ +#endif /* _VX_DEVICE_CMD_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/device_def.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/device_def.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/device_def.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/device_def.h --- linux-2.6.36/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/device_def.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/device_def.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,17 @@ +#ifndef _VX_DEVICE_DEF_H +#define _VX_DEVICE_DEF_H @@ -11196,9 +11225,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/device_def.h linux-2.6. +}; + +#endif /* _VX_DEVICE_DEF_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/device.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/device.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/device.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/device.h --- linux-2.6.36/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/device.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/device.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,15 @@ +#ifndef _VX_DEVICE_H +#define _VX_DEVICE_H @@ -11215,9 +11244,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/device.h linux-2.6.36-v +#else /* _VX_DEVICE_H */ +#warning duplicate inclusion +#endif /* _VX_DEVICE_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/dlimit_cmd.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/dlimit_cmd.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/dlimit_cmd.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/dlimit_cmd.h --- linux-2.6.36/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/dlimit_cmd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/dlimit_cmd.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,109 @@ +#ifndef _VX_DLIMIT_CMD_H +#define _VX_DLIMIT_CMD_H @@ -11328,9 +11357,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/dlimit_cmd.h linux-2.6. + +#endif /* __KERNEL__ */ +#endif /* _VX_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/dlimit.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/dlimit.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/dlimit.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/dlimit.h --- linux-2.6.36/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/dlimit.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/dlimit.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,54 @@ +#ifndef _VX_DLIMIT_H +#define _VX_DLIMIT_H @@ -11386,9 +11415,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/dlimit.h linux-2.6.36-v +#else /* _VX_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VX_DLIMIT_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/global.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/global.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/global.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/global.h --- linux-2.6.36/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/global.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/global.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,19 @@ +#ifndef _VX_GLOBAL_H +#define _VX_GLOBAL_H @@ -11409,9 +11438,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/global.h linux-2.6.36-v + + +#endif /* _VX_GLOBAL_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/history.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/history.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/history.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/history.h --- linux-2.6.36/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/history.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/history.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,197 @@ +#ifndef _VX_HISTORY_H +#define _VX_HISTORY_H @@ -11610,9 +11639,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/history.h linux-2.6.36- +#endif /* CONFIG_VSERVER_HISTORY */ + +#endif /* _VX_HISTORY_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/inode_cmd.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/inode_cmd.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/inode_cmd.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/inode_cmd.h --- linux-2.6.36/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/inode_cmd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/inode_cmd.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,59 @@ +#ifndef _VX_INODE_CMD_H +#define _VX_INODE_CMD_H @@ -11673,9 +11702,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/inode_cmd.h linux-2.6.3 + +#endif /* __KERNEL__ */ +#endif /* _VX_INODE_CMD_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/inode.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/inode.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/inode.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/inode.h --- linux-2.6.36/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/inode.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/inode.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,39 @@ +#ifndef _VX_INODE_H +#define _VX_INODE_H @@ -11716,9 +11745,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/inode.h linux-2.6.36-vs +#else /* _VX_INODE_H */ +#warning duplicate inclusion +#endif /* _VX_INODE_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/Kbuild linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/Kbuild +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/Kbuild linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/Kbuild --- linux-2.6.36/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/Kbuild 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/Kbuild 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,8 @@ + +unifdef-y += context_cmd.h network_cmd.h space_cmd.h \ @@ -11728,9 +11757,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/Kbuild linux-2.6.36-vs2 + +unifdef-y += switch.h network.h monitor.h inode.h device.h + -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/limit_cmd.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/limit_cmd.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/limit_cmd.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/limit_cmd.h --- linux-2.6.36/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/limit_cmd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/limit_cmd.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,71 @@ +#ifndef _VX_LIMIT_CMD_H +#define _VX_LIMIT_CMD_H @@ -11803,9 +11832,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/limit_cmd.h linux-2.6.3 + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_CMD_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/limit_def.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/limit_def.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/limit_def.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/limit_def.h --- linux-2.6.36/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/limit_def.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/limit_def.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,47 @@ +#ifndef _VX_LIMIT_DEF_H +#define _VX_LIMIT_DEF_H @@ -11854,9 +11883,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/limit_def.h linux-2.6.3 +#endif + +#endif /* _VX_LIMIT_DEF_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/limit.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/limit.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/limit.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/limit.h --- linux-2.6.36/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/limit.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/limit.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,71 @@ +#ifndef _VX_LIMIT_H +#define _VX_LIMIT_H @@ -11929,9 +11958,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/limit.h linux-2.6.36-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/limit_int.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/limit_int.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/limit_int.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/limit_int.h --- linux-2.6.36/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/limit_int.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/limit_int.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,198 @@ +#ifndef _VX_LIMIT_INT_H +#define _VX_LIMIT_INT_H @@ -12131,9 +12160,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/limit_int.h linux-2.6.3 + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_INT_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/monitor.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/monitor.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/monitor.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/monitor.h --- linux-2.6.36/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/monitor.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/monitor.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,96 @@ +#ifndef _VX_MONITOR_H +#define _VX_MONITOR_H @@ -12231,9 +12260,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/monitor.h linux-2.6.36- + + +#endif /* _VX_MONITOR_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/network_cmd.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/network_cmd.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/network_cmd.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/network_cmd.h --- linux-2.6.36/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/network_cmd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/network_cmd.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,150 @@ +#ifndef _VX_NETWORK_CMD_H +#define _VX_NETWORK_CMD_H @@ -12385,9 +12414,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/network_cmd.h linux-2.6 + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/network.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/network.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/network.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/network.h --- linux-2.6.36/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/network.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/network.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,146 @@ +#ifndef _VX_NETWORK_H +#define _VX_NETWORK_H @@ -12535,9 +12564,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/network.h linux-2.6.36- + +#endif /* __KERNEL__ */ +#endif /* _VX_NETWORK_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/percpu.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/percpu.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/percpu.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/percpu.h --- linux-2.6.36/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/percpu.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/percpu.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,14 @@ +#ifndef _VX_PERCPU_H +#define _VX_PERCPU_H @@ -12553,9 +12582,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/percpu.h linux-2.6.36-v +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + +#endif /* _VX_PERCPU_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/pid.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/pid.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/pid.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/pid.h --- linux-2.6.36/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/pid.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/pid.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,51 @@ +#ifndef _VSERVER_PID_H +#define _VSERVER_PID_H @@ -12608,9 +12637,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/pid.h linux-2.6.36-vs2. +} + +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/sched_cmd.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/sched_cmd.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/sched_cmd.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/sched_cmd.h --- linux-2.6.36/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/sched_cmd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/sched_cmd.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,108 @@ +#ifndef _VX_SCHED_CMD_H +#define _VX_SCHED_CMD_H @@ -12720,9 +12749,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/sched_cmd.h linux-2.6.3 + +#endif /* __KERNEL__ */ +#endif /* _VX_SCHED_CMD_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/sched_def.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/sched_def.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/sched_def.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/sched_def.h --- linux-2.6.36/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/sched_def.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/sched_def.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,68 @@ +#ifndef _VX_SCHED_DEF_H +#define _VX_SCHED_DEF_H @@ -12792,9 +12821,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/sched_def.h linux-2.6.3 +#endif + +#endif /* _VX_SCHED_DEF_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/sched.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/sched.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/sched.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/sched.h --- linux-2.6.36/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/sched.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/sched.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,26 @@ +#ifndef _VX_SCHED_H +#define _VX_SCHED_H @@ -12822,9 +12851,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/sched.h linux-2.6.36-vs +#else /* _VX_SCHED_H */ +#warning duplicate inclusion +#endif /* _VX_SCHED_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/signal_cmd.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/signal_cmd.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/signal_cmd.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/signal_cmd.h --- linux-2.6.36/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/signal_cmd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/signal_cmd.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,43 @@ +#ifndef _VX_SIGNAL_CMD_H +#define _VX_SIGNAL_CMD_H @@ -12869,9 +12898,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/signal_cmd.h linux-2.6. + +#endif /* __KERNEL__ */ +#endif /* _VX_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/signal.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/signal.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/signal.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/signal.h --- linux-2.6.36/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/signal.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/signal.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,14 @@ +#ifndef _VX_SIGNAL_H +#define _VX_SIGNAL_H @@ -12887,9 +12916,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/signal.h linux-2.6.36-v +#else /* _VX_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VX_SIGNAL_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/space_cmd.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/space_cmd.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/space_cmd.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/space_cmd.h --- linux-2.6.36/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/space_cmd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/space_cmd.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,38 @@ +#ifndef _VX_SPACE_CMD_H +#define _VX_SPACE_CMD_H @@ -12929,9 +12958,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/space_cmd.h linux-2.6.3 + +#endif /* __KERNEL__ */ +#endif /* _VX_SPACE_CMD_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/space.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/space.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/space.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/space.h --- linux-2.6.36/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/space.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/space.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,12 @@ +#ifndef _VX_SPACE_H +#define _VX_SPACE_H @@ -12945,9 +12974,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/space.h linux-2.6.36-vs +#else /* _VX_SPACE_H */ +#warning duplicate inclusion +#endif /* _VX_SPACE_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/switch.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/switch.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/switch.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/switch.h --- linux-2.6.36/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/switch.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/switch.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,98 @@ +#ifndef _VX_SWITCH_H +#define _VX_SWITCH_H @@ -13047,9 +13076,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/switch.h linux-2.6.36-v + +#endif /* _VX_SWITCH_H */ + -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/tag_cmd.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/tag_cmd.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/tag_cmd.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/tag_cmd.h --- linux-2.6.36/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/tag_cmd.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/tag_cmd.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,22 @@ +#ifndef _VX_TAG_CMD_H +#define _VX_TAG_CMD_H @@ -13073,9 +13102,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/tag_cmd.h linux-2.6.36- + +#endif /* __KERNEL__ */ +#endif /* _VX_TAG_CMD_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vserver/tag.h linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/tag.h +diff -NurpP --minimal linux-2.6.36/include/linux/vserver/tag.h linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/tag.h --- linux-2.6.36/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/tag.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vserver/tag.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,143 @@ +#ifndef _DX_TAG_H +#define _DX_TAG_H @@ -13220,9 +13249,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vserver/tag.h linux-2.6.36-vs2. +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-2.6.36/include/linux/vs_inet6.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_inet6.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_inet6.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_inet6.h --- linux-2.6.36/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_inet6.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_inet6.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,246 @@ +#ifndef _VS_INET6_H +#define _VS_INET6_H @@ -13470,10 +13499,10 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_inet6.h linux-2.6.36-vs2.3.0 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vs_inet.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_inet.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_inet.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_inet.h --- linux-2.6.36/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_inet.h 2010-10-21 14:48:51.000000000 +0200 -@@ -0,0 +1,350 @@ ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_inet.h 2010-10-21 17:41:35.000000000 +0200 +@@ -0,0 +1,351 @@ +#ifndef _VS_INET_H +#define _VS_INET_H + @@ -13664,7 +13693,8 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_inet.h linux-2.6.36-vs2.3.0. +static inline +int nx_dev_visible(struct nx_info *nxi, struct net_device *dev) +{ -+ vxdprintk(VXD_CBIT(net, 1), "nx_dev_visible(%p[#%u],%p »%s«) %d", ++ vxdprintk(VXD_CBIT(net, 1), ++ "nx_dev_visible(%p[#%u],%p " VS_Q("%s") ") %d", + nxi, nxi ? nxi->nx_id : 0, dev, dev->name, + nxi ? dev_in_nx_info(dev, nxi) : 0); + @@ -13824,9 +13854,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_inet.h linux-2.6.36-vs2.3.0. +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vs_limit.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_limit.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_limit.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_limit.h --- linux-2.6.36/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_limit.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_limit.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,140 @@ +#ifndef _VS_LIMIT_H +#define _VS_LIMIT_H @@ -13968,9 +13998,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_limit.h linux-2.6.36-vs2.3.0 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vs_memory.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_memory.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_memory.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_memory.h --- linux-2.6.36/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_memory.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_memory.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,58 @@ +#ifndef _VS_MEMORY_H +#define _VS_MEMORY_H @@ -14030,9 +14060,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_memory.h linux-2.6.36-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vs_network.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_network.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_network.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_network.h --- linux-2.6.36/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_network.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_network.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,169 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -14203,9 +14233,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_network.h linux-2.6.36-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vs_pid.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_pid.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_pid.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_pid.h --- linux-2.6.36/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_pid.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_pid.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,95 @@ +#ifndef _VS_PID_H +#define _VS_PID_H @@ -14302,9 +14332,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_pid.h linux-2.6.36-vs2.3.0.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vs_sched.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_sched.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_sched.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_sched.h --- linux-2.6.36/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_sched.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_sched.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,110 @@ +#ifndef _VS_SCHED_H +#define _VS_SCHED_H @@ -14416,9 +14446,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_sched.h linux-2.6.36-vs2.3.0 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vs_socket.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_socket.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_socket.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_socket.h --- linux-2.6.36/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_socket.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_socket.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,67 @@ +#ifndef _VS_SOCKET_H +#define _VS_SOCKET_H @@ -14487,9 +14517,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_socket.h linux-2.6.36-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vs_tag.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_tag.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_tag.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_tag.h --- linux-2.6.36/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_tag.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_tag.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,47 @@ +#ifndef _VS_TAG_H +#define _VS_TAG_H @@ -14538,9 +14568,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_tag.h linux-2.6.36-vs2.3.0.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/linux/vs_time.h linux-2.6.36-vs2.3.0.36.33/include/linux/vs_time.h +diff -NurpP --minimal linux-2.6.36/include/linux/vs_time.h linux-2.6.36-vs2.3.0.36.36/include/linux/vs_time.h --- linux-2.6.36/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/include/linux/vs_time.h 2010-10-21 14:25:37.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/linux/vs_time.h 2010-10-21 14:25:37.000000000 +0200 @@ -0,0 +1,19 @@ +#ifndef _VS_TIME_H +#define _VS_TIME_H @@ -14561,9 +14591,9 @@ diff -NurpP --minimal linux-2.6.36/include/linux/vs_time.h linux-2.6.36-vs2.3.0. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36/include/net/addrconf.h linux-2.6.36-vs2.3.0.36.33/include/net/addrconf.h +diff -NurpP --minimal linux-2.6.36/include/net/addrconf.h linux-2.6.36-vs2.3.0.36.36/include/net/addrconf.h --- linux-2.6.36/include/net/addrconf.h 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/net/addrconf.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/net/addrconf.h 2010-10-21 13:09:36.000000000 +0200 @@ -84,7 +84,8 @@ extern int ipv6_dev_get_saddr(struct n struct net_device *dev, const struct in6_addr *daddr, @@ -14574,9 +14604,9 @@ diff -NurpP --minimal linux-2.6.36/include/net/addrconf.h linux-2.6.36-vs2.3.0.3 extern int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags); -diff -NurpP --minimal linux-2.6.36/include/net/af_unix.h linux-2.6.36-vs2.3.0.36.33/include/net/af_unix.h +diff -NurpP --minimal linux-2.6.36/include/net/af_unix.h linux-2.6.36-vs2.3.0.36.36/include/net/af_unix.h --- linux-2.6.36/include/net/af_unix.h 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/net/af_unix.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/net/af_unix.h 2010-10-21 13:09:36.000000000 +0200 @@ -4,6 +4,7 @@ #include <linux/socket.h> #include <linux/un.h> @@ -14585,9 +14615,9 @@ diff -NurpP --minimal linux-2.6.36/include/net/af_unix.h linux-2.6.36-vs2.3.0.36 #include <net/sock.h> extern void unix_inflight(struct file *fp); -diff -NurpP --minimal linux-2.6.36/include/net/inet_timewait_sock.h linux-2.6.36-vs2.3.0.36.33/include/net/inet_timewait_sock.h +diff -NurpP --minimal linux-2.6.36/include/net/inet_timewait_sock.h linux-2.6.36-vs2.3.0.36.36/include/net/inet_timewait_sock.h --- linux-2.6.36/include/net/inet_timewait_sock.h 2010-08-02 16:52:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/net/inet_timewait_sock.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/net/inet_timewait_sock.h 2010-10-21 13:09:36.000000000 +0200 @@ -117,6 +117,10 @@ struct inet_timewait_sock { #define tw_hash __tw_common.skc_hash #define tw_prot __tw_common.skc_prot @@ -14599,9 +14629,9 @@ diff -NurpP --minimal linux-2.6.36/include/net/inet_timewait_sock.h linux-2.6.36 int tw_timeout; volatile unsigned char tw_substate; /* 3 bits hole, try to pack */ -diff -NurpP --minimal linux-2.6.36/include/net/route.h linux-2.6.36-vs2.3.0.36.33/include/net/route.h +diff -NurpP --minimal linux-2.6.36/include/net/route.h linux-2.6.36-vs2.3.0.36.36/include/net/route.h --- linux-2.6.36/include/net/route.h 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/net/route.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/net/route.h 2010-10-21 13:09:36.000000000 +0200 @@ -145,6 +145,9 @@ static inline void ip_rt_put(struct rtab dst_release(&rt->dst); } @@ -14648,9 +14678,9 @@ diff -NurpP --minimal linux-2.6.36/include/net/route.h linux-2.6.36-vs2.3.0.36.3 err = __ip_route_output_key(net, rp, &fl); if (err) return err; -diff -NurpP --minimal linux-2.6.36/include/net/sock.h linux-2.6.36-vs2.3.0.36.33/include/net/sock.h +diff -NurpP --minimal linux-2.6.36/include/net/sock.h linux-2.6.36-vs2.3.0.36.36/include/net/sock.h --- linux-2.6.36/include/net/sock.h 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/include/net/sock.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/include/net/sock.h 2010-10-21 13:09:36.000000000 +0200 @@ -150,6 +150,10 @@ struct sock_common { #ifdef CONFIG_NET_NS struct net *skc_net; @@ -14673,9 +14703,9 @@ diff -NurpP --minimal linux-2.6.36/include/net/sock.h linux-2.6.36-vs2.3.0.36.33 kmemcheck_bitfield_begin(flags); unsigned int sk_shutdown : 2, sk_no_check : 2, -diff -NurpP --minimal linux-2.6.36/init/Kconfig linux-2.6.36-vs2.3.0.36.33/init/Kconfig +diff -NurpP --minimal linux-2.6.36/init/Kconfig linux-2.6.36-vs2.3.0.36.36/init/Kconfig --- linux-2.6.36/init/Kconfig 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/init/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/init/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -476,6 +476,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK menuconfig CGROUPS boolean "Control Group support" @@ -14692,9 +14722,9 @@ diff -NurpP --minimal linux-2.6.36/init/Kconfig linux-2.6.36-vs2.3.0.36.33/init/ help Provides a simple namespace cgroup subsystem to provide hierarchical naming of sets of namespaces, -diff -NurpP --minimal linux-2.6.36/init/main.c linux-2.6.36-vs2.3.0.36.33/init/main.c +diff -NurpP --minimal linux-2.6.36/init/main.c linux-2.6.36-vs2.3.0.36.36/init/main.c --- linux-2.6.36/init/main.c 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/init/main.c 2010-10-21 13:10:12.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/init/main.c 2010-10-21 13:10:12.000000000 +0200 @@ -68,6 +68,7 @@ #include <linux/sfi.h> #include <linux/shmem_fs.h> @@ -14703,9 +14733,9 @@ diff -NurpP --minimal linux-2.6.36/init/main.c linux-2.6.36-vs2.3.0.36.33/init/m #include <asm/io.h> #include <asm/bugs.h> -diff -NurpP --minimal linux-2.6.36/ipc/mqueue.c linux-2.6.36-vs2.3.0.36.33/ipc/mqueue.c +diff -NurpP --minimal linux-2.6.36/ipc/mqueue.c linux-2.6.36-vs2.3.0.36.36/ipc/mqueue.c --- linux-2.6.36/ipc/mqueue.c 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/ipc/mqueue.c 2010-10-21 13:28:42.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/ipc/mqueue.c 2010-10-21 13:28:42.000000000 +0200 @@ -33,6 +33,8 @@ #include <linux/pid.h> #include <linux/ipc_namespace.h> @@ -14780,9 +14810,9 @@ diff -NurpP --minimal linux-2.6.36/ipc/mqueue.c linux-2.6.36-vs2.3.0.36.33/ipc/m free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-2.6.36/ipc/msg.c linux-2.6.36-vs2.3.0.36.33/ipc/msg.c +diff -NurpP --minimal linux-2.6.36/ipc/msg.c linux-2.6.36-vs2.3.0.36.36/ipc/msg.c --- linux-2.6.36/ipc/msg.c 2010-08-02 16:52:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/ipc/msg.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/ipc/msg.c 2010-10-21 13:09:36.000000000 +0200 @@ -37,6 +37,7 @@ #include <linux/rwsem.h> #include <linux/nsproxy.h> @@ -14799,9 +14829,9 @@ diff -NurpP --minimal linux-2.6.36/ipc/msg.c linux-2.6.36-vs2.3.0.36.33/ipc/msg. msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-2.6.36/ipc/namespace.c linux-2.6.36-vs2.3.0.36.33/ipc/namespace.c +diff -NurpP --minimal linux-2.6.36/ipc/namespace.c linux-2.6.36-vs2.3.0.36.36/ipc/namespace.c --- linux-2.6.36/ipc/namespace.c 2009-09-10 15:26:27.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/ipc/namespace.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/ipc/namespace.c 2010-10-21 13:09:36.000000000 +0200 @@ -11,6 +11,8 @@ #include <linux/slab.h> #include <linux/fs.h> @@ -14811,9 +14841,9 @@ diff -NurpP --minimal linux-2.6.36/ipc/namespace.c linux-2.6.36-vs2.3.0.36.33/ip #include "util.h" -diff -NurpP --minimal linux-2.6.36/ipc/sem.c linux-2.6.36-vs2.3.0.36.33/ipc/sem.c +diff -NurpP --minimal linux-2.6.36/ipc/sem.c linux-2.6.36-vs2.3.0.36.36/ipc/sem.c --- linux-2.6.36/ipc/sem.c 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/ipc/sem.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/ipc/sem.c 2010-10-21 13:09:36.000000000 +0200 @@ -86,6 +86,8 @@ #include <linux/rwsem.h> #include <linux/nsproxy.h> @@ -14851,9 +14881,9 @@ diff -NurpP --minimal linux-2.6.36/ipc/sem.c linux-2.6.36-vs2.3.0.36.33/ipc/sem. security_sem_free(sma); ipc_rcu_putref(sma); } -diff -NurpP --minimal linux-2.6.36/ipc/shm.c linux-2.6.36-vs2.3.0.36.33/ipc/shm.c +diff -NurpP --minimal linux-2.6.36/ipc/shm.c linux-2.6.36-vs2.3.0.36.36/ipc/shm.c --- linux-2.6.36/ipc/shm.c 2010-08-02 16:52:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/ipc/shm.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/ipc/shm.c 2010-10-21 13:09:36.000000000 +0200 @@ -39,6 +39,8 @@ #include <linux/nsproxy.h> #include <linux/mount.h> @@ -14909,9 +14939,9 @@ diff -NurpP --minimal linux-2.6.36/ipc/shm.c linux-2.6.36-vs2.3.0.36.33/ipc/shm. return error; no_id: -diff -NurpP --minimal linux-2.6.36/kernel/capability.c linux-2.6.36-vs2.3.0.36.33/kernel/capability.c +diff -NurpP --minimal linux-2.6.36/kernel/capability.c linux-2.6.36-vs2.3.0.36.36/kernel/capability.c --- linux-2.6.36/kernel/capability.c 2010-08-02 16:52:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/capability.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/capability.c 2010-10-21 13:09:36.000000000 +0200 @@ -14,6 +14,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -14947,9 +14977,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/capability.c linux-2.6.36-vs2.3.0.36.3 if (unlikely(!cap_valid(cap))) { printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap); BUG(); -diff -NurpP --minimal linux-2.6.36/kernel/compat.c linux-2.6.36-vs2.3.0.36.33/kernel/compat.c +diff -NurpP --minimal linux-2.6.36/kernel/compat.c linux-2.6.36-vs2.3.0.36.36/kernel/compat.c --- linux-2.6.36/kernel/compat.c 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/compat.c 2010-10-21 14:22:43.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/compat.c 2010-10-21 14:22:43.000000000 +0200 @@ -914,7 +914,7 @@ asmlinkage long compat_sys_stime(compat_ if (err) return err; @@ -14959,9 +14989,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/compat.c linux-2.6.36-vs2.3.0.36.33/ke return 0; } -diff -NurpP --minimal linux-2.6.36/kernel/exit.c linux-2.6.36-vs2.3.0.36.33/kernel/exit.c +diff -NurpP --minimal linux-2.6.36/kernel/exit.c linux-2.6.36-vs2.3.0.36.36/kernel/exit.c --- linux-2.6.36/kernel/exit.c 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/exit.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/exit.c 2010-10-21 13:09:36.000000000 +0200 @@ -48,6 +48,10 @@ #include <linux/fs_struct.h> #include <linux/init_task.h> @@ -15002,9 +15032,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/exit.c linux-2.6.36-vs2.3.0.36.33/kern BUG(); /* Avoid "noreturn function does return". */ for (;;) -diff -NurpP --minimal linux-2.6.36/kernel/fork.c linux-2.6.36-vs2.3.0.36.33/kernel/fork.c +diff -NurpP --minimal linux-2.6.36/kernel/fork.c linux-2.6.36-vs2.3.0.36.36/kernel/fork.c --- linux-2.6.36/kernel/fork.c 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/fork.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/fork.c 2010-10-21 13:09:36.000000000 +0200 @@ -65,6 +65,10 @@ #include <linux/perf_event.h> #include <linux/posix-timers.h> @@ -15098,9 +15128,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/fork.c linux-2.6.36-vs2.3.0.36.33/kern write_unlock_irq(&tasklist_lock); proc_fork_connector(p); cgroup_post_fork(p); -diff -NurpP --minimal linux-2.6.36/kernel/kthread.c linux-2.6.36-vs2.3.0.36.33/kernel/kthread.c +diff -NurpP --minimal linux-2.6.36/kernel/kthread.c linux-2.6.36-vs2.3.0.36.36/kernel/kthread.c --- linux-2.6.36/kernel/kthread.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/kthread.c 2010-10-21 13:42:40.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/kthread.c 2010-10-21 13:42:40.000000000 +0200 @@ -16,6 +16,7 @@ #include <linux/mutex.h> #include <linux/slab.h> @@ -15109,9 +15139,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/kthread.c linux-2.6.36-vs2.3.0.36.33/k #include <trace/events/sched.h> static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-2.6.36/kernel/Makefile linux-2.6.36-vs2.3.0.36.33/kernel/Makefile +diff -NurpP --minimal linux-2.6.36/kernel/Makefile linux-2.6.36-vs2.3.0.36.36/kernel/Makefile --- linux-2.6.36/kernel/Makefile 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/Makefile 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/Makefile 2010-10-21 13:09:36.000000000 +0200 @@ -25,6 +25,7 @@ CFLAGS_REMOVE_sched_clock.o = -pg CFLAGS_REMOVE_perf_event.o = -pg endif @@ -15120,9 +15150,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/Makefile linux-2.6.36-vs2.3.0.36.33/ke obj-$(CONFIG_FREEZER) += freezer.o obj-$(CONFIG_PROFILING) += profile.o obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o -diff -NurpP --minimal linux-2.6.36/kernel/nsproxy.c linux-2.6.36-vs2.3.0.36.33/kernel/nsproxy.c +diff -NurpP --minimal linux-2.6.36/kernel/nsproxy.c linux-2.6.36-vs2.3.0.36.36/kernel/nsproxy.c --- linux-2.6.36/kernel/nsproxy.c 2010-07-07 18:31:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/nsproxy.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/nsproxy.c 2010-10-21 13:09:36.000000000 +0200 @@ -20,6 +20,8 @@ #include <linux/mnt_namespace.h> #include <linux/utsname.h> @@ -15305,9 +15335,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/nsproxy.c linux-2.6.36-vs2.3.0.36.33/k return -EPERM; *new_nsp = create_new_namespaces(unshare_flags, current, -diff -NurpP --minimal linux-2.6.36/kernel/pid.c linux-2.6.36-vs2.3.0.36.33/kernel/pid.c +diff -NurpP --minimal linux-2.6.36/kernel/pid.c linux-2.6.36-vs2.3.0.36.36/kernel/pid.c --- linux-2.6.36/kernel/pid.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/pid.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/pid.c 2010-10-21 13:09:36.000000000 +0200 @@ -36,6 +36,7 @@ #include <linux/pid_namespace.h> #include <linux/init_task.h> @@ -15365,9 +15395,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/pid.c linux-2.6.36-vs2.3.0.36.33/kerne pid_t pid_vnr(struct pid *pid) { return pid_nr_ns(pid, current->nsproxy->pid_ns); -diff -NurpP --minimal linux-2.6.36/kernel/pid_namespace.c linux-2.6.36-vs2.3.0.36.33/kernel/pid_namespace.c +diff -NurpP --minimal linux-2.6.36/kernel/pid_namespace.c linux-2.6.36-vs2.3.0.36.36/kernel/pid_namespace.c --- linux-2.6.36/kernel/pid_namespace.c 2010-07-07 18:31:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/pid_namespace.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/pid_namespace.c 2010-10-21 13:09:36.000000000 +0200 @@ -14,6 +14,7 @@ #include <linux/err.h> #include <linux/acct.h> @@ -15392,9 +15422,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/pid_namespace.c linux-2.6.36-vs2.3.0.3 kmem_cache_free(pid_ns_cachep, ns); } -diff -NurpP --minimal linux-2.6.36/kernel/posix-timers.c linux-2.6.36-vs2.3.0.36.33/kernel/posix-timers.c +diff -NurpP --minimal linux-2.6.36/kernel/posix-timers.c linux-2.6.36-vs2.3.0.36.36/kernel/posix-timers.c --- linux-2.6.36/kernel/posix-timers.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/posix-timers.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/posix-timers.c 2010-10-21 13:09:36.000000000 +0200 @@ -46,6 +46,7 @@ #include <linux/wait.h> #include <linux/workqueue.h> @@ -15430,9 +15460,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/posix-timers.c linux-2.6.36-vs2.3.0.36 /* If we failed to send the signal the timer stops. */ return ret > 0; } -diff -NurpP --minimal linux-2.6.36/kernel/printk.c linux-2.6.36-vs2.3.0.36.33/kernel/printk.c +diff -NurpP --minimal linux-2.6.36/kernel/printk.c linux-2.6.36-vs2.3.0.36.36/kernel/printk.c --- linux-2.6.36/kernel/printk.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/printk.c 2010-10-21 13:43:06.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/printk.c 2010-10-21 13:43:06.000000000 +0200 @@ -39,6 +39,7 @@ #include <linux/syslog.h> #include <linux/cpu.h> @@ -15498,9 +15528,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/printk.c linux-2.6.36-vs2.3.0.36.33/ke count = len; if (count > log_buf_len) count = log_buf_len; -diff -NurpP --minimal linux-2.6.36/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.33/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.36/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.36/kernel/ptrace.c --- linux-2.6.36/kernel/ptrace.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 @@ -22,6 +22,7 @@ #include <linux/syscalls.h> #include <linux/uaccess.h> @@ -15532,9 +15562,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.33/ke if (request == PTRACE_ATTACH) { ret = ptrace_attach(child); /* -diff -NurpP --minimal linux-2.6.36/kernel/sched.c linux-2.6.36-vs2.3.0.36.33/kernel/sched.c +diff -NurpP --minimal linux-2.6.36/kernel/sched.c linux-2.6.36-vs2.3.0.36.36/kernel/sched.c --- linux-2.6.36/kernel/sched.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/sched.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/sched.c 2010-10-21 13:09:36.000000000 +0200 @@ -72,6 +72,8 @@ #include <linux/ctype.h> #include <linux/ftrace.h> @@ -15611,9 +15641,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/sched.c linux-2.6.36-vs2.3.0.36.33/ker retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-2.6.36/kernel/sched_fair.c linux-2.6.36-vs2.3.0.36.33/kernel/sched_fair.c +diff -NurpP --minimal linux-2.6.36/kernel/sched_fair.c linux-2.6.36-vs2.3.0.36.36/kernel/sched_fair.c --- linux-2.6.36/kernel/sched_fair.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/sched_fair.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/sched_fair.c 2010-10-21 13:09:36.000000000 +0200 @@ -782,6 +782,9 @@ enqueue_entity(struct cfs_rq *cfs_rq, st check_spread(cfs_rq, se); if (se != cfs_rq->curr) @@ -15633,9 +15663,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/sched_fair.c linux-2.6.36-vs2.3.0.36.3 account_entity_dequeue(cfs_rq, se); update_min_vruntime(cfs_rq); -diff -NurpP --minimal linux-2.6.36/kernel/signal.c linux-2.6.36-vs2.3.0.36.33/kernel/signal.c +diff -NurpP --minimal linux-2.6.36/kernel/signal.c linux-2.6.36-vs2.3.0.36.36/kernel/signal.c --- linux-2.6.36/kernel/signal.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/signal.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/signal.c 2010-10-21 13:09:36.000000000 +0200 @@ -28,6 +28,8 @@ #include <linux/freezer.h> #include <linux/pid_namespace.h> @@ -15728,9 +15758,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/signal.c linux-2.6.36-vs2.3.0.36.33/ke if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-2.6.36/kernel/softirq.c linux-2.6.36-vs2.3.0.36.33/kernel/softirq.c +diff -NurpP --minimal linux-2.6.36/kernel/softirq.c linux-2.6.36-vs2.3.0.36.36/kernel/softirq.c --- linux-2.6.36/kernel/softirq.c 2010-08-02 16:52:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/softirq.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/softirq.c 2010-10-21 13:09:36.000000000 +0200 @@ -24,6 +24,7 @@ #include <linux/ftrace.h> #include <linux/smp.h> @@ -15739,9 +15769,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/softirq.c linux-2.6.36-vs2.3.0.36.33/k #define CREATE_TRACE_POINTS #include <trace/events/irq.h> -diff -NurpP --minimal linux-2.6.36/kernel/sys.c linux-2.6.36-vs2.3.0.36.33/kernel/sys.c +diff -NurpP --minimal linux-2.6.36/kernel/sys.c linux-2.6.36-vs2.3.0.36.36/kernel/sys.c --- linux-2.6.36/kernel/sys.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/sys.c 2010-10-21 13:45:48.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/sys.c 2010-10-21 13:45:48.000000000 +0200 @@ -42,6 +42,7 @@ #include <linux/syscalls.h> #include <linux/kprobes.h> @@ -15835,9 +15865,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/sys.c linux-2.6.36-vs2.3.0.36.33/kerne return -EPERM; } -diff -NurpP --minimal linux-2.6.36/kernel/sysctl_binary.c linux-2.6.36-vs2.3.0.36.33/kernel/sysctl_binary.c +diff -NurpP --minimal linux-2.6.36/kernel/sysctl_binary.c linux-2.6.36-vs2.3.0.36.36/kernel/sysctl_binary.c --- linux-2.6.36/kernel/sysctl_binary.c 2010-08-02 16:52:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/sysctl_binary.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/sysctl_binary.c 2010-10-21 13:09:36.000000000 +0200 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t { CTL_INT, KERN_PANIC, "panic" }, @@ -15846,9 +15876,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/sysctl_binary.c linux-2.6.36-vs2.3.0.3 { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-2.6.36/kernel/sysctl.c linux-2.6.36-vs2.3.0.36.33/kernel/sysctl.c +diff -NurpP --minimal linux-2.6.36/kernel/sysctl.c linux-2.6.36-vs2.3.0.36.36/kernel/sysctl.c --- linux-2.6.36/kernel/sysctl.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/sysctl.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/sysctl.c 2010-10-21 13:09:36.000000000 +0200 @@ -73,6 +73,7 @@ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) #include <linux/lockdep.h> @@ -15871,9 +15901,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/sysctl.c linux-2.6.36-vs2.3.0.36.33/ke #ifdef CONFIG_CHR_DEV_SG { .procname = "sg-big-buff", -diff -NurpP --minimal linux-2.6.36/kernel/time/timekeeping.c linux-2.6.36-vs2.3.0.36.33/kernel/time/timekeeping.c +diff -NurpP --minimal linux-2.6.36/kernel/time/timekeeping.c linux-2.6.36-vs2.3.0.36.36/kernel/time/timekeeping.c --- linux-2.6.36/kernel/time/timekeeping.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/time/timekeeping.c 2010-10-21 14:17:59.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/time/timekeeping.c 2010-10-21 14:17:59.000000000 +0200 @@ -229,6 +229,7 @@ void getnstimeofday(struct timespec *ts) } while (read_seqretry(&xtime_lock, seq)); @@ -15882,9 +15912,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/time/timekeeping.c linux-2.6.36-vs2.3. } EXPORT_SYMBOL(getnstimeofday); -diff -NurpP --minimal linux-2.6.36/kernel/time.c linux-2.6.36-vs2.3.0.36.33/kernel/time.c +diff -NurpP --minimal linux-2.6.36/kernel/time.c linux-2.6.36-vs2.3.0.36.36/kernel/time.c --- linux-2.6.36/kernel/time.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/time.c 2010-10-21 14:22:43.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/time.c 2010-10-21 14:22:43.000000000 +0200 @@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, if (err) return err; @@ -15903,9 +15933,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/time.c linux-2.6.36-vs2.3.0.36.33/kern } return 0; } -diff -NurpP --minimal linux-2.6.36/kernel/timer.c linux-2.6.36-vs2.3.0.36.33/kernel/timer.c +diff -NurpP --minimal linux-2.6.36/kernel/timer.c linux-2.6.36-vs2.3.0.36.36/kernel/timer.c --- linux-2.6.36/kernel/timer.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/timer.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/timer.c 2010-10-21 13:09:36.000000000 +0200 @@ -40,6 +40,10 @@ #include <linux/perf_event.h> #include <linux/sched.h> @@ -15955,9 +15985,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/timer.c linux-2.6.36-vs2.3.0.36.33/ker SYSCALL_DEFINE0(getuid) { /* Only we change this so SMP safe */ -diff -NurpP --minimal linux-2.6.36/kernel/user_namespace.c linux-2.6.36-vs2.3.0.36.33/kernel/user_namespace.c +diff -NurpP --minimal linux-2.6.36/kernel/user_namespace.c linux-2.6.36-vs2.3.0.36.36/kernel/user_namespace.c --- linux-2.6.36/kernel/user_namespace.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/user_namespace.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/user_namespace.c 2010-10-21 13:09:36.000000000 +0200 @@ -11,6 +11,7 @@ #include <linux/user_namespace.h> #include <linux/highuid.h> @@ -15983,9 +16013,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/user_namespace.c linux-2.6.36-vs2.3.0. INIT_WORK(&ns->destroyer, free_user_ns_work); schedule_work(&ns->destroyer); } -diff -NurpP --minimal linux-2.6.36/kernel/utsname.c linux-2.6.36-vs2.3.0.36.33/kernel/utsname.c +diff -NurpP --minimal linux-2.6.36/kernel/utsname.c linux-2.6.36-vs2.3.0.36.36/kernel/utsname.c --- linux-2.6.36/kernel/utsname.c 2009-09-10 15:26:28.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/utsname.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/utsname.c 2010-10-21 13:09:36.000000000 +0200 @@ -14,14 +14,17 @@ #include <linux/utsname.h> #include <linux/err.h> @@ -16012,9 +16042,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/utsname.c linux-2.6.36-vs2.3.0.36.33/k + atomic_dec(&vs_global_uts_ns); kfree(ns); } -diff -NurpP --minimal linux-2.6.36/kernel/vserver/cacct.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/cacct.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/cacct.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/cacct.c --- linux-2.6.36/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/cacct.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/cacct.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,42 @@ +/* + * linux/kernel/vserver/cacct.c @@ -16058,9 +16088,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/cacct.c linux-2.6.36-vs2.3.0.3 + return 0; +} + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/cacct_init.h linux-2.6.36-vs2.3.0.36.33/kernel/vserver/cacct_init.h +diff -NurpP --minimal linux-2.6.36/kernel/vserver/cacct_init.h linux-2.6.36-vs2.3.0.36.36/kernel/vserver/cacct_init.h --- linux-2.6.36/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/cacct_init.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/cacct_init.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,25 @@ + + @@ -16087,9 +16117,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/cacct_init.h linux-2.6.36-vs2. + return; +} + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/cacct_proc.h linux-2.6.36-vs2.3.0.36.33/kernel/vserver/cacct_proc.h +diff -NurpP --minimal linux-2.6.36/kernel/vserver/cacct_proc.h linux-2.6.36-vs2.3.0.36.36/kernel/vserver/cacct_proc.h --- linux-2.6.36/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/cacct_proc.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/cacct_proc.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,53 @@ +#ifndef _VX_CACCT_PROC_H +#define _VX_CACCT_PROC_H @@ -16144,9 +16174,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/cacct_proc.h linux-2.6.36-vs2. +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-2.6.36/kernel/vserver/context.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/context.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/context.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/context.c --- linux-2.6.36/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/context.c 2010-10-21 14:39:59.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/context.c 2010-10-21 14:39:59.000000000 +0200 @@ -0,0 +1,1058 @@ +/* + * linux/kernel/vserver/context.c @@ -17206,9 +17236,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/context.c linux-2.6.36-vs2.3.0 + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/cvirt.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/cvirt.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/cvirt.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/cvirt.c --- linux-2.6.36/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/cvirt.c 2010-10-21 14:47:08.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/cvirt.c 2010-10-21 14:47:08.000000000 +0200 @@ -0,0 +1,303 @@ +/* + * linux/kernel/vserver/cvirt.c @@ -17513,9 +17543,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/cvirt.c linux-2.6.36-vs2.3.0.3 + +#endif + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/cvirt_init.h linux-2.6.36-vs2.3.0.36.33/kernel/vserver/cvirt_init.h +diff -NurpP --minimal linux-2.6.36/kernel/vserver/cvirt_init.h linux-2.6.36-vs2.3.0.36.36/kernel/vserver/cvirt_init.h --- linux-2.6.36/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/cvirt_init.h 2010-10-21 14:40:17.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/cvirt_init.h 2010-10-21 14:40:17.000000000 +0200 @@ -0,0 +1,69 @@ + + @@ -17586,9 +17616,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/cvirt_init.h linux-2.6.36-vs2. + return; +} + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/cvirt_proc.h linux-2.6.36-vs2.3.0.36.33/kernel/vserver/cvirt_proc.h +diff -NurpP --minimal linux-2.6.36/kernel/vserver/cvirt_proc.h linux-2.6.36-vs2.3.0.36.36/kernel/vserver/cvirt_proc.h --- linux-2.6.36/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/cvirt_proc.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/cvirt_proc.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,135 @@ +#ifndef _VX_CVIRT_PROC_H +#define _VX_CVIRT_PROC_H @@ -17725,9 +17755,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/cvirt_proc.h linux-2.6.36-vs2. +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-2.6.36/kernel/vserver/debug.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/debug.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/debug.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/debug.c --- linux-2.6.36/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/debug.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/debug.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,32 @@ +/* + * kernel/vserver/debug.c @@ -17761,9 +17791,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/debug.c linux-2.6.36-vs2.3.0.3 + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/device.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/device.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/device.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/device.c --- linux-2.6.36/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/device.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/device.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,443 @@ +/* + * linux/kernel/vserver/device.c @@ -18208,9 +18238,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/device.c linux-2.6.36-vs2.3.0. +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/dlimit.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/dlimit.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/dlimit.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/dlimit.c --- linux-2.6.36/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/dlimit.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/dlimit.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,531 @@ +/* + * linux/kernel/vserver/dlimit.c @@ -18743,9 +18773,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/dlimit.c linux-2.6.36-vs2.3.0. +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/helper.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/helper.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/helper.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/helper.c --- linux-2.6.36/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/helper.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/helper.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,223 @@ +/* + * linux/kernel/vserver/helper.c @@ -18970,9 +19000,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/helper.c linux-2.6.36-vs2.3.0. + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/history.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/history.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/history.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/history.c --- linux-2.6.36/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/history.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/history.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,258 @@ +/* + * kernel/vserver/history.c @@ -19232,9 +19262,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/history.c linux-2.6.36-vs2.3.0 + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/inet.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/inet.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/inet.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/inet.c --- linux-2.6.36/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/inet.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/inet.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,224 @@ + +#include <linux/in.h> @@ -19460,9 +19490,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/inet.c linux-2.6.36-vs2.3.0.36 + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/init.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/init.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/init.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/init.c --- linux-2.6.36/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/init.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/init.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,45 @@ +/* + * linux/kernel/init.c @@ -19509,9 +19539,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/init.c linux-2.6.36-vs2.3.0.36 +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/inode.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/inode.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/inode.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/inode.c --- linux-2.6.36/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/inode.c 2010-10-21 14:46:31.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/inode.c 2010-10-21 17:40:44.000000000 +0200 @@ -0,0 +1,435 @@ +/* + * linux/kernel/vserver/inode.c @@ -19873,7 +19903,7 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/inode.c linux-2.6.36-vs2.3.0.3 + token = match_token(p, tokens, args); + + vxdprintk(VXD_CBIT(tag, 7), -+ "dx_parse_tag(»%s«): %d:#%d", ++ "dx_parse_tag(" VS_Q("%s") "): %d:#%d", + p, token, option); + + switch (token) { @@ -19948,10 +19978,10 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/inode.c linux-2.6.36-vs2.3.0.3 + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/Kconfig linux-2.6.36-vs2.3.0.36.33/kernel/vserver/Kconfig +diff -NurpP --minimal linux-2.6.36/kernel/vserver/Kconfig linux-2.6.36-vs2.3.0.36.36/kernel/vserver/Kconfig --- linux-2.6.36/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,260 @@ ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/Kconfig 2010-10-21 21:49:28.000000000 +0200 +@@ -0,0 +1,265 @@ +# +# Linux VServer configuration +# @@ -20131,6 +20161,15 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/Kconfig linux-2.6.36-vs2.3.0.3 + resource shortage. It is generally considered to + be a good idea to have that enabled. + ++config VSERVER_WARN_DEVPTS ++ bool "VServer DevPTS Warnings" ++ depends on VSERVER_WARN ++ default y ++ help ++ This enables DevPTS related warnings, issued when a ++ process inside a context tries to lookup or access ++ a dynamic pts from the host or a different context. ++ +config VSERVER_DEBUG + bool "VServer Debugging Code" + default n @@ -20158,41 +20197,37 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/Kconfig linux-2.6.36-vs2.3.0.3 + This allows you to specify the number of entries in + the per-CPU history buffer. + -+config VSERVER_MONITOR -+ bool "VServer Scheduling Monitor" -+ depends on VSERVER_DISABLED ++config VSERVER_LEGACY_MEM ++ bool "Legacy Memory Limits" + default n + help -+ Set this to yes if you want to record the scheduling -+ decisions, so that they can be relayed to userspace -+ for detailed analysis. ++ This provides fake memory limits to keep ++ older tools happy in the face of memory ++ cgroups + -+config VSERVER_MONITOR_SIZE -+ int "Per-CPU Monitor Queue Size (32-65536)" -+ depends on VSERVER_MONITOR -+ range 32 65536 -+ default 1024 ++choice ++ prompt "Quotes used in debug and warn messages" ++ default QUOTES_ISO8859 ++ ++config QUOTES_ISO8859 ++ bool "Extended ASCII (ISO 8859) angle quotes" + help -+ This allows you to specify the number of entries in -+ the per-CPU scheduling monitor buffer. ++ This uses the extended ASCII characters \xbb ++ and \xab for quoting file and process names. + -+config VSERVER_MONITOR_SYNC -+ int "Per-CPU Monitor Sync Interval (0-65536)" -+ depends on VSERVER_MONITOR -+ range 0 65536 -+ default 256 ++config QUOTES_UTF8 ++ bool "UTF-8 angle quotes" + help -+ This allows you to specify the interval in ticks -+ when a time sync entry is inserted. ++ This uses the the UTF-8 sequences for angle ++ quotes to quote file and process names. + -+config VSERVER_LEGACY_MEM -+ bool "Legacy Memory Limits" -+ default n ++config QUOTES_ASCII ++ bool "ASCII single quotes" + help -+ This provides fake memory limits to keep -+ older tools happy in the face of memory -+ cgroups ++ This uses the ASCII single quote character ++ (\x27) to quote file and process names. + ++endchoice + +endmenu + @@ -20212,9 +20247,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/Kconfig linux-2.6.36-vs2.3.0.3 + default y + select SECURITY_CAPABILITIES + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/limit.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/limit.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/limit.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/limit.c --- linux-2.6.36/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/limit.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/limit.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,354 @@ +/* + * linux/kernel/vserver/limit.c @@ -20570,9 +20605,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/limit.c linux-2.6.36-vs2.3.0.3 + return points; +} + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/limit_init.h linux-2.6.36-vs2.3.0.36.33/kernel/vserver/limit_init.h +diff -NurpP --minimal linux-2.6.36/kernel/vserver/limit_init.h linux-2.6.36-vs2.3.0.36.36/kernel/vserver/limit_init.h --- linux-2.6.36/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/limit_init.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/limit_init.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,31 @@ + + @@ -20605,9 +20640,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/limit_init.h linux-2.6.36-vs2. + } +} + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/limit_proc.h linux-2.6.36-vs2.3.0.36.33/kernel/vserver/limit_proc.h +diff -NurpP --minimal linux-2.6.36/kernel/vserver/limit_proc.h linux-2.6.36-vs2.3.0.36.36/kernel/vserver/limit_proc.h --- linux-2.6.36/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/limit_proc.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/limit_proc.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,57 @@ +#ifndef _VX_LIMIT_PROC_H +#define _VX_LIMIT_PROC_H @@ -20666,9 +20701,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/limit_proc.h linux-2.6.36-vs2. +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/Makefile linux-2.6.36-vs2.3.0.36.33/kernel/vserver/Makefile +diff -NurpP --minimal linux-2.6.36/kernel/vserver/Makefile linux-2.6.36-vs2.3.0.36.36/kernel/vserver/Makefile --- linux-2.6.36/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/Makefile 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/Makefile 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,18 @@ +# +# Makefile for the Linux vserver routines. @@ -20688,151 +20723,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/Makefile linux-2.6.36-vs2.3.0. +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/monitor.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/monitor.c ---- linux-2.6.36/kernel/vserver/monitor.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/monitor.c 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,138 @@ -+/* -+ * kernel/vserver/monitor.c -+ * -+ * Virtual Context Scheduler Monitor -+ * -+ * Copyright (C) 2006-2007 Herbert Pötzl -+ * -+ * V0.01 basic design -+ * -+ */ -+ -+#include <linux/module.h> -+#include <linux/jiffies.h> -+#include <asm/uaccess.h> -+#include <asm/atomic.h> -+ -+#include <linux/vserver/monitor.h> -+#include <linux/vserver/debug_cmd.h> -+ -+ -+#ifdef CONFIG_VSERVER_MONITOR -+#define VXM_SIZE CONFIG_VSERVER_MONITOR_SIZE -+#else -+#define VXM_SIZE 64 -+#endif -+ -+struct _vx_monitor { -+ unsigned int counter; -+ -+ struct _vx_mon_entry entry[VXM_SIZE+1]; -+}; -+ -+ -+DEFINE_PER_CPU(struct _vx_monitor, vx_monitor_buffer); -+ -+unsigned volatile int vxm_active = 1; -+ -+static atomic_t sequence = ATOMIC_INIT(0); -+ -+ -+/* vxm_advance() -+ -+ * requires disabled preemption */ -+ -+struct _vx_mon_entry *vxm_advance(int cpu) -+{ -+ struct _vx_monitor *mon = &per_cpu(vx_monitor_buffer, cpu); -+ struct _vx_mon_entry *entry; -+ unsigned int index; -+ -+ index = vxm_active ? (mon->counter++ % VXM_SIZE) : VXM_SIZE; -+ entry = &mon->entry[index]; -+ -+ entry->ev.seq = atomic_inc_return(&sequence); -+ entry->ev.jif = jiffies; -+ return entry; -+} -+ -+EXPORT_SYMBOL_GPL(vxm_advance); -+ -+ -+int do_read_monitor(struct __user _vx_mon_entry *data, -+ int cpu, uint32_t *index, uint32_t *count) -+{ -+ int pos, ret = 0; -+ struct _vx_monitor *mon = &per_cpu(vx_monitor_buffer, cpu); -+ int end = mon->counter; -+ int start = end - VXM_SIZE + 2; -+ int idx = *index; -+ -+ /* special case: get current pos */ -+ if (!*count) { -+ *index = end; -+ return 0; -+ } -+ -+ /* have we lost some data? */ -+ if (idx < start) -+ idx = start; -+ -+ for (pos = 0; (pos < *count) && (idx < end); pos++, idx++) { -+ struct _vx_mon_entry *entry = -+ &mon->entry[idx % VXM_SIZE]; -+ -+ /* send entry to userspace */ -+ ret = copy_to_user(&data[pos], entry, sizeof(*entry)); -+ if (ret) -+ break; -+ } -+ /* save new index and count */ -+ *index = idx; -+ *count = pos; -+ return ret ? ret : (*index < end); -+} -+ -+int vc_read_monitor(uint32_t id, void __user *data) -+{ -+ struct vcmd_read_monitor_v0 vc_data; -+ int ret; -+ -+ if (id >= NR_CPUS) -+ return -EINVAL; -+ -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; -+ -+ ret = do_read_monitor((struct __user _vx_mon_entry *)vc_data.data, -+ id, &vc_data.index, &vc_data.count); -+ -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return ret; -+} -+ -+#ifdef CONFIG_COMPAT -+ -+int vc_read_monitor_x32(uint32_t id, void __user *data) -+{ -+ struct vcmd_read_monitor_v0_x32 vc_data; -+ int ret; -+ -+ if (id >= NR_CPUS) -+ return -EINVAL; -+ -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; -+ -+ ret = do_read_monitor((struct __user _vx_mon_entry *) -+ compat_ptr(vc_data.data_ptr), -+ id, &vc_data.index, &vc_data.count); -+ -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return ret; -+} -+ -+#endif /* CONFIG_COMPAT */ -+ -diff -NurpP --minimal linux-2.6.36/kernel/vserver/network.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/network.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/network.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/network.c --- linux-2.6.36/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/network.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/network.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,864 @@ +/* + * linux/kernel/vserver/network.c @@ -21698,9 +21591,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/network.c linux-2.6.36-vs2.3.0 +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/proc.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/proc.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/proc.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/proc.c --- linux-2.6.36/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/proc.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/proc.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,1098 @@ +/* + * linux/kernel/vserver/proc.c @@ -22800,9 +22693,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/proc.c linux-2.6.36-vs2.3.0.36 + return buffer - orig; +} + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/sched.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/sched.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/sched.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/sched.c --- linux-2.6.36/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/sched.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/sched.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,414 @@ +/* + * linux/kernel/vserver/sched.c @@ -23218,9 +23111,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/sched.c linux-2.6.36-vs2.3.0.3 + return 0; +} + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/sched_init.h linux-2.6.36-vs2.3.0.36.33/kernel/vserver/sched_init.h +diff -NurpP --minimal linux-2.6.36/kernel/vserver/sched_init.h linux-2.6.36-vs2.3.0.36.36/kernel/vserver/sched_init.h --- linux-2.6.36/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/sched_init.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/sched_init.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,50 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) @@ -23272,9 +23165,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/sched_init.h linux-2.6.36-vs2. +{ + return; +} -diff -NurpP --minimal linux-2.6.36/kernel/vserver/sched_proc.h linux-2.6.36-vs2.3.0.36.33/kernel/vserver/sched_proc.h +diff -NurpP --minimal linux-2.6.36/kernel/vserver/sched_proc.h linux-2.6.36-vs2.3.0.36.36/kernel/vserver/sched_proc.h --- linux-2.6.36/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/sched_proc.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/sched_proc.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,57 @@ +#ifndef _VX_SCHED_PROC_H +#define _VX_SCHED_PROC_H @@ -23333,9 +23226,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/sched_proc.h linux-2.6.36-vs2. +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-2.6.36/kernel/vserver/signal.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/signal.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/signal.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/signal.c --- linux-2.6.36/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/signal.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/signal.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,132 @@ +/* + * linux/kernel/vserver/signal.c @@ -23469,9 +23362,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/signal.c linux-2.6.36-vs2.3.0. + return ret; +} + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/space.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/space.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/space.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/space.c --- linux-2.6.36/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/space.c 2010-10-21 14:41:06.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/space.c 2010-10-21 14:41:06.000000000 +0200 @@ -0,0 +1,375 @@ +/* + * linux/kernel/vserver/space.c @@ -23848,10 +23741,10 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/space.c linux-2.6.36-vs2.3.0.3 + return 0; +} + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/switch.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/switch.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/switch.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/switch.c --- linux-2.6.36/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/switch.c 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,546 @@ ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/switch.c 2010-10-21 19:05:54.000000000 +0200 +@@ -0,0 +1,539 @@ +/* + * linux/kernel/vserver/switch.c + * @@ -24126,10 +24019,6 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/switch.c linux-2.6.36-vs2.3.0. + case VCMD_read_history: + return __COMPAT(vc_read_history, id, data, compat); +#endif -+#ifdef CONFIG_VSERVER_MONITOR -+ case VCMD_read_monitor: -+ return __COMPAT(vc_read_monitor, id, data, compat); -+#endif + default: + vxwprintk_task(1, "unimplemented VCMD_%02d_%d[%d]", + VC_CATEGORY(cmd), VC_COMMAND(cmd), VC_VERSION(cmd)); @@ -24260,9 +24149,6 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/switch.c linux-2.6.36-vs2.3.0. + __VCMD(dump_history, 9, VCA_NONE, 0); + __VCMD(read_history, 9, VCA_NONE, 0); +#endif -+#ifdef CONFIG_VSERVER_MONITOR -+ __VCMD(read_monitor, 9, VCA_NONE, 0); -+#endif + + default: + perm = -1; @@ -24398,9 +24284,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/switch.c linux-2.6.36-vs2.3.0. +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-2.6.36/kernel/vserver/sysctl.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/sysctl.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/sysctl.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/sysctl.c --- linux-2.6.36/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/sysctl.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/sysctl.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,241 @@ +/* + * kernel/vserver/sysctl.c @@ -24643,9 +24529,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/sysctl.c linux-2.6.36-vs2.3.0. +EXPORT_SYMBOL_GPL(vx_debug_space); +EXPORT_SYMBOL_GPL(vx_debug_misc); + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/tag.c linux-2.6.36-vs2.3.0.36.33/kernel/vserver/tag.c +diff -NurpP --minimal linux-2.6.36/kernel/vserver/tag.c linux-2.6.36-vs2.3.0.36.36/kernel/vserver/tag.c --- linux-2.6.36/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/tag.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/tag.c 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,63 @@ +/* + * linux/kernel/vserver/tag.c @@ -24710,9 +24596,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/tag.c linux-2.6.36-vs2.3.0.36. +} + + -diff -NurpP --minimal linux-2.6.36/kernel/vserver/vci_config.h linux-2.6.36-vs2.3.0.36.33/kernel/vserver/vci_config.h +diff -NurpP --minimal linux-2.6.36/kernel/vserver/vci_config.h linux-2.6.36-vs2.3.0.36.36/kernel/vserver/vci_config.h --- linux-2.6.36/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/kernel/vserver/vci_config.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/kernel/vserver/vci_config.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,85 @@ + +/* interface version */ @@ -24799,9 +24685,9 @@ diff -NurpP --minimal linux-2.6.36/kernel/vserver/vci_config.h linux-2.6.36-vs2. + 0; +} + -diff -NurpP --minimal linux-2.6.36/mm/filemap_xip.c linux-2.6.36-vs2.3.0.36.33/mm/filemap_xip.c +diff -NurpP --minimal linux-2.6.36/mm/filemap_xip.c linux-2.6.36-vs2.3.0.36.36/mm/filemap_xip.c --- linux-2.6.36/mm/filemap_xip.c 2010-07-07 18:31:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/mm/filemap_xip.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/mm/filemap_xip.c 2010-10-21 13:09:36.000000000 +0200 @@ -18,6 +18,7 @@ #include <linux/seqlock.h> #include <linux/mutex.h> @@ -24810,9 +24696,9 @@ diff -NurpP --minimal linux-2.6.36/mm/filemap_xip.c linux-2.6.36-vs2.3.0.36.33/m #include <asm/tlbflush.h> #include <asm/io.h> -diff -NurpP --minimal linux-2.6.36/mm/fremap.c linux-2.6.36-vs2.3.0.36.33/mm/fremap.c +diff -NurpP --minimal linux-2.6.36/mm/fremap.c linux-2.6.36-vs2.3.0.36.36/mm/fremap.c --- linux-2.6.36/mm/fremap.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/mm/fremap.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/mm/fremap.c 2010-10-21 13:09:36.000000000 +0200 @@ -16,6 +16,7 @@ #include <linux/module.h> #include <linux/syscalls.h> @@ -24821,9 +24707,9 @@ diff -NurpP --minimal linux-2.6.36/mm/fremap.c linux-2.6.36-vs2.3.0.36.33/mm/fre #include <asm/mmu_context.h> #include <asm/cacheflush.h> -diff -NurpP --minimal linux-2.6.36/mm/hugetlb.c linux-2.6.36-vs2.3.0.36.33/mm/hugetlb.c +diff -NurpP --minimal linux-2.6.36/mm/hugetlb.c linux-2.6.36-vs2.3.0.36.36/mm/hugetlb.c --- linux-2.6.36/mm/hugetlb.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/mm/hugetlb.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/mm/hugetlb.c 2010-10-21 13:09:36.000000000 +0200 @@ -28,6 +28,7 @@ #include <linux/hugetlb.h> @@ -24832,9 +24718,9 @@ diff -NurpP --minimal linux-2.6.36/mm/hugetlb.c linux-2.6.36-vs2.3.0.36.33/mm/hu #include "internal.h" const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL; -diff -NurpP --minimal linux-2.6.36/mm/memcontrol.c linux-2.6.36-vs2.3.0.36.33/mm/memcontrol.c +diff -NurpP --minimal linux-2.6.36/mm/memcontrol.c linux-2.6.36-vs2.3.0.36.36/mm/memcontrol.c --- linux-2.6.36/mm/memcontrol.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/mm/memcontrol.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/mm/memcontrol.c 2010-10-21 13:09:36.000000000 +0200 @@ -638,6 +638,31 @@ struct mem_cgroup *mem_cgroup_from_task( struct mem_cgroup, css); } @@ -24867,9 +24753,9 @@ diff -NurpP --minimal linux-2.6.36/mm/memcontrol.c linux-2.6.36-vs2.3.0.36.33/mm static struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) { struct mem_cgroup *mem = NULL; -diff -NurpP --minimal linux-2.6.36/mm/memory.c linux-2.6.36-vs2.3.0.36.33/mm/memory.c +diff -NurpP --minimal linux-2.6.36/mm/memory.c linux-2.6.36-vs2.3.0.36.36/mm/memory.c --- linux-2.6.36/mm/memory.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/mm/memory.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/mm/memory.c 2010-10-21 13:09:36.000000000 +0200 @@ -3145,6 +3145,7 @@ static inline int handle_pte_fault(struc { pte_t entry; @@ -24905,9 +24791,9 @@ diff -NurpP --minimal linux-2.6.36/mm/memory.c linux-2.6.36-vs2.3.0.36.33/mm/mem } /* -diff -NurpP --minimal linux-2.6.36/mm/mremap.c linux-2.6.36-vs2.3.0.36.33/mm/mremap.c +diff -NurpP --minimal linux-2.6.36/mm/mremap.c linux-2.6.36-vs2.3.0.36.36/mm/mremap.c --- linux-2.6.36/mm/mremap.c 2010-07-07 18:31:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/mm/mremap.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/mm/mremap.c 2010-10-21 13:09:36.000000000 +0200 @@ -19,6 +19,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -24916,9 +24802,9 @@ diff -NurpP --minimal linux-2.6.36/mm/mremap.c linux-2.6.36-vs2.3.0.36.33/mm/mre #include <asm/uaccess.h> #include <asm/cacheflush.h> -diff -NurpP --minimal linux-2.6.36/mm/oom_kill.c linux-2.6.36-vs2.3.0.36.33/mm/oom_kill.c +diff -NurpP --minimal linux-2.6.36/mm/oom_kill.c linux-2.6.36-vs2.3.0.36.36/mm/oom_kill.c --- linux-2.6.36/mm/oom_kill.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/mm/oom_kill.c 2010-10-21 14:57:29.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/mm/oom_kill.c 2010-10-21 14:57:29.000000000 +0200 @@ -31,6 +31,9 @@ #include <linux/memcontrol.h> #include <linux/mempolicy.h> @@ -25013,9 +24899,9 @@ diff -NurpP --minimal linux-2.6.36/mm/oom_kill.c linux-2.6.36-vs2.3.0.36.33/mm/o } if (oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, -diff -NurpP --minimal linux-2.6.36/mm/page_alloc.c linux-2.6.36-vs2.3.0.36.33/mm/page_alloc.c +diff -NurpP --minimal linux-2.6.36/mm/page_alloc.c linux-2.6.36-vs2.3.0.36.36/mm/page_alloc.c --- linux-2.6.36/mm/page_alloc.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/mm/page_alloc.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/mm/page_alloc.c 2010-10-21 13:09:36.000000000 +0200 @@ -52,6 +52,8 @@ #include <linux/compaction.h> #include <trace/events/kmem.h> @@ -25045,9 +24931,9 @@ diff -NurpP --minimal linux-2.6.36/mm/page_alloc.c linux-2.6.36-vs2.3.0.36.33/mm } #endif -diff -NurpP --minimal linux-2.6.36/mm/rmap.c linux-2.6.36-vs2.3.0.36.33/mm/rmap.c +diff -NurpP --minimal linux-2.6.36/mm/rmap.c linux-2.6.36-vs2.3.0.36.36/mm/rmap.c --- linux-2.6.36/mm/rmap.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/mm/rmap.c 2010-10-21 13:19:11.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/mm/rmap.c 2010-10-21 13:19:11.000000000 +0200 @@ -57,6 +57,7 @@ #include <linux/mmu_notifier.h> #include <linux/migrate.h> @@ -25056,9 +24942,9 @@ diff -NurpP --minimal linux-2.6.36/mm/rmap.c linux-2.6.36-vs2.3.0.36.33/mm/rmap. #include <asm/tlbflush.h> -diff -NurpP --minimal linux-2.6.36/mm/shmem.c linux-2.6.36-vs2.3.0.36.33/mm/shmem.c +diff -NurpP --minimal linux-2.6.36/mm/shmem.c linux-2.6.36-vs2.3.0.36.36/mm/shmem.c --- linux-2.6.36/mm/shmem.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/mm/shmem.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/mm/shmem.c 2010-10-21 13:09:36.000000000 +0200 @@ -1815,7 +1815,7 @@ static int shmem_statfs(struct dentry *d { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); @@ -25077,9 +24963,9 @@ diff -NurpP --minimal linux-2.6.36/mm/shmem.c linux-2.6.36-vs2.3.0.36.33/mm/shme sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_POSIX_ACL -diff -NurpP --minimal linux-2.6.36/mm/slab.c linux-2.6.36-vs2.3.0.36.33/mm/slab.c +diff -NurpP --minimal linux-2.6.36/mm/slab.c linux-2.6.36-vs2.3.0.36.36/mm/slab.c --- linux-2.6.36/mm/slab.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/mm/slab.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/mm/slab.c 2010-10-21 13:09:36.000000000 +0200 @@ -407,6 +407,8 @@ static void kmem_list3_init(struct kmem_ #define STATS_INC_FREEMISS(x) do { } while (0) #endif @@ -25113,9 +24999,9 @@ diff -NurpP --minimal linux-2.6.36/mm/slab.c linux-2.6.36-vs2.3.0.36.33/mm/slab. kmemcheck_slab_free(cachep, objp, obj_size(cachep)); -diff -NurpP --minimal linux-2.6.36/mm/slab_vs.h linux-2.6.36-vs2.3.0.36.33/mm/slab_vs.h +diff -NurpP --minimal linux-2.6.36/mm/slab_vs.h linux-2.6.36-vs2.3.0.36.36/mm/slab_vs.h --- linux-2.6.36/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/mm/slab_vs.h 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/mm/slab_vs.h 2010-10-21 13:09:36.000000000 +0200 @@ -0,0 +1,29 @@ + +#include <linux/vserver/context.h> @@ -25146,9 +25032,9 @@ diff -NurpP --minimal linux-2.6.36/mm/slab_vs.h linux-2.6.36-vs2.3.0.36.33/mm/sl + atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-2.6.36/mm/swapfile.c linux-2.6.36-vs2.3.0.36.33/mm/swapfile.c +diff -NurpP --minimal linux-2.6.36/mm/swapfile.c linux-2.6.36-vs2.3.0.36.36/mm/swapfile.c --- linux-2.6.36/mm/swapfile.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/mm/swapfile.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/mm/swapfile.c 2010-10-21 13:09:36.000000000 +0200 @@ -35,6 +35,8 @@ #include <asm/tlbflush.h> #include <linux/swapops.h> @@ -25184,9 +25070,9 @@ diff -NurpP --minimal linux-2.6.36/mm/swapfile.c linux-2.6.36-vs2.3.0.36.33/mm/s } /* -diff -NurpP --minimal linux-2.6.36/net/core/dev.c linux-2.6.36-vs2.3.0.36.33/net/core/dev.c +diff -NurpP --minimal linux-2.6.36/net/core/dev.c linux-2.6.36-vs2.3.0.36.36/net/core/dev.c --- linux-2.6.36/net/core/dev.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/core/dev.c 2010-10-21 14:12:56.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/core/dev.c 2010-10-21 14:12:56.000000000 +0200 @@ -127,6 +127,7 @@ #include <linux/in.h> #include <linux/jhash.h> @@ -25293,9 +25179,9 @@ diff -NurpP --minimal linux-2.6.36/net/core/dev.c linux-2.6.36-vs2.3.0.36.33/net 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-2.6.36/net/core/rtnetlink.c linux-2.6.36-vs2.3.0.36.33/net/core/rtnetlink.c +diff -NurpP --minimal linux-2.6.36/net/core/rtnetlink.c linux-2.6.36-vs2.3.0.36.36/net/core/rtnetlink.c --- linux-2.6.36/net/core/rtnetlink.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/core/rtnetlink.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/core/rtnetlink.c 2010-10-21 13:09:36.000000000 +0200 @@ -927,6 +927,8 @@ static int rtnl_dump_ifinfo(struct sk_bu hlist_for_each_entry(dev, node, head, index_hlist) { if (idx < s_idx) @@ -25315,9 +25201,9 @@ diff -NurpP --minimal linux-2.6.36/net/core/rtnetlink.c linux-2.6.36-vs2.3.0.36. skb = nlmsg_new(if_nlmsg_size(dev), GFP_KERNEL); if (skb == NULL) goto errout; -diff -NurpP --minimal linux-2.6.36/net/core/sock.c linux-2.6.36-vs2.3.0.36.33/net/core/sock.c +diff -NurpP --minimal linux-2.6.36/net/core/sock.c linux-2.6.36-vs2.3.0.36.36/net/core/sock.c --- linux-2.6.36/net/core/sock.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/core/sock.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/core/sock.c 2010-10-21 13:09:36.000000000 +0200 @@ -127,6 +127,10 @@ #include <net/cls_cgroup.h> @@ -25385,9 +25271,9 @@ diff -NurpP --minimal linux-2.6.36/net/core/sock.c linux-2.6.36-vs2.3.0.36.33/ne /* * Before updating sk_refcnt, we must commit prior changes to memory * (Documentation/RCU/rculist_nulls.txt for details) -diff -NurpP --minimal linux-2.6.36/net/ipv4/af_inet.c linux-2.6.36-vs2.3.0.36.33/net/ipv4/af_inet.c +diff -NurpP --minimal linux-2.6.36/net/ipv4/af_inet.c linux-2.6.36-vs2.3.0.36.36/net/ipv4/af_inet.c --- linux-2.6.36/net/ipv4/af_inet.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv4/af_inet.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv4/af_inet.c 2010-10-21 13:09:36.000000000 +0200 @@ -116,6 +116,7 @@ #ifdef CONFIG_IP_MROUTE #include <linux/mroute.h> @@ -25465,9 +25351,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv4/af_inet.c linux-2.6.36-vs2.3.0.36.33 sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; } -diff -NurpP --minimal linux-2.6.36/net/ipv4/devinet.c linux-2.6.36-vs2.3.0.36.33/net/ipv4/devinet.c +diff -NurpP --minimal linux-2.6.36/net/ipv4/devinet.c linux-2.6.36-vs2.3.0.36.36/net/ipv4/devinet.c --- linux-2.6.36/net/ipv4/devinet.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv4/devinet.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv4/devinet.c 2010-10-21 13:09:36.000000000 +0200 @@ -417,6 +417,7 @@ struct in_device *inetdev_by_index(struc } EXPORT_SYMBOL(inetdev_by_index); @@ -25534,9 +25420,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv4/devinet.c linux-2.6.36-vs2.3.0.36.33 if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-2.6.36/net/ipv4/fib_hash.c linux-2.6.36-vs2.3.0.36.33/net/ipv4/fib_hash.c +diff -NurpP --minimal linux-2.6.36/net/ipv4/fib_hash.c linux-2.6.36-vs2.3.0.36.36/net/ipv4/fib_hash.c --- linux-2.6.36/net/ipv4/fib_hash.c 2010-07-07 18:31:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv4/fib_hash.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv4/fib_hash.c 2010-10-21 13:09:36.000000000 +0200 @@ -1017,7 +1017,7 @@ static int fib_seq_show(struct seq_file prefix = f->fn_key; mask = FZ_MASK(iter->zone); @@ -25546,9 +25432,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv4/fib_hash.c linux-2.6.36-vs2.3.0.36.3 seq_printf(seq, "%s\t%08X\t%08X\t%04X\t%d\t%u\t%d\t%08X\t%d\t%u\t%u%n", fi->fib_dev ? fi->fib_dev->name : "*", prefix, -diff -NurpP --minimal linux-2.6.36/net/ipv4/inet_connection_sock.c linux-2.6.36-vs2.3.0.36.33/net/ipv4/inet_connection_sock.c +diff -NurpP --minimal linux-2.6.36/net/ipv4/inet_connection_sock.c linux-2.6.36-vs2.3.0.36.36/net/ipv4/inet_connection_sock.c --- linux-2.6.36/net/ipv4/inet_connection_sock.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv4/inet_connection_sock.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv4/inet_connection_sock.c 2010-10-21 13:09:36.000000000 +0200 @@ -52,10 +52,40 @@ void inet_get_local_port_range(int *low, } EXPORT_SYMBOL(inet_get_local_port_range); @@ -25602,9 +25488,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv4/inet_connection_sock.c linux-2.6.36- break; } } -diff -NurpP --minimal linux-2.6.36/net/ipv4/inet_diag.c linux-2.6.36-vs2.3.0.36.33/net/ipv4/inet_diag.c +diff -NurpP --minimal linux-2.6.36/net/ipv4/inet_diag.c linux-2.6.36-vs2.3.0.36.36/net/ipv4/inet_diag.c --- linux-2.6.36/net/ipv4/inet_diag.c 2010-07-07 18:31:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv4/inet_diag.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv4/inet_diag.c 2010-10-21 13:09:36.000000000 +0200 @@ -33,6 +33,8 @@ #include <linux/stddef.h> @@ -25708,9 +25594,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv4/inet_diag.c linux-2.6.36-vs2.3.0.36. if (num < s_num) goto next_dying; if (r->id.idiag_sport != tw->tw_sport && -diff -NurpP --minimal linux-2.6.36/net/ipv4/inet_hashtables.c linux-2.6.36-vs2.3.0.36.33/net/ipv4/inet_hashtables.c +diff -NurpP --minimal linux-2.6.36/net/ipv4/inet_hashtables.c linux-2.6.36-vs2.3.0.36.36/net/ipv4/inet_hashtables.c --- linux-2.6.36/net/ipv4/inet_hashtables.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv4/inet_hashtables.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv4/inet_hashtables.c 2010-10-21 13:09:36.000000000 +0200 @@ -21,6 +21,7 @@ #include <net/inet_connection_sock.h> @@ -25747,9 +25633,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv4/inet_hashtables.c linux-2.6.36-vs2.3 /* * if the nulls value we got at the end of this lookup is * not the expected one, we must restart lookup. -diff -NurpP --minimal linux-2.6.36/net/ipv4/netfilter/nf_nat_helper.c linux-2.6.36-vs2.3.0.36.33/net/ipv4/netfilter/nf_nat_helper.c +diff -NurpP --minimal linux-2.6.36/net/ipv4/netfilter/nf_nat_helper.c linux-2.6.36-vs2.3.0.36.36/net/ipv4/netfilter/nf_nat_helper.c --- linux-2.6.36/net/ipv4/netfilter/nf_nat_helper.c 2010-07-07 18:31:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv4/netfilter/nf_nat_helper.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv4/netfilter/nf_nat_helper.c 2010-10-21 13:09:36.000000000 +0200 @@ -20,6 +20,7 @@ #include <net/route.h> @@ -25758,9 +25644,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv4/netfilter/nf_nat_helper.c linux-2.6. #include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_ecache.h> -diff -NurpP --minimal linux-2.6.36/net/ipv4/netfilter.c linux-2.6.36-vs2.3.0.36.33/net/ipv4/netfilter.c +diff -NurpP --minimal linux-2.6.36/net/ipv4/netfilter.c linux-2.6.36-vs2.3.0.36.36/net/ipv4/netfilter.c --- linux-2.6.36/net/ipv4/netfilter.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv4/netfilter.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv4/netfilter.c 2010-10-21 13:09:36.000000000 +0200 @@ -5,7 +5,7 @@ #include <linux/ip.h> #include <linux/skbuff.h> @@ -25770,9 +25656,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv4/netfilter.c linux-2.6.36-vs2.3.0.36. #include <net/xfrm.h> #include <net/ip.h> #include <net/netfilter/nf_queue.h> -diff -NurpP --minimal linux-2.6.36/net/ipv4/raw.c linux-2.6.36-vs2.3.0.36.33/net/ipv4/raw.c +diff -NurpP --minimal linux-2.6.36/net/ipv4/raw.c linux-2.6.36-vs2.3.0.36.36/net/ipv4/raw.c --- linux-2.6.36/net/ipv4/raw.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv4/raw.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv4/raw.c 2010-10-21 13:09:36.000000000 +0200 @@ -116,7 +116,7 @@ static struct sock *__raw_v4_lookup(stru if (net_eq(sock_net(sk), net) && inet->inet_num == num && @@ -25874,9 +25760,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv4/raw.c linux-2.6.36-vs2.3.0.36.33/net sk_wmem_alloc_get(sp), sk_rmem_alloc_get(sp), 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp), -diff -NurpP --minimal linux-2.6.36/net/ipv4/tcp.c linux-2.6.36-vs2.3.0.36.33/net/ipv4/tcp.c +diff -NurpP --minimal linux-2.6.36/net/ipv4/tcp.c linux-2.6.36-vs2.3.0.36.36/net/ipv4/tcp.c --- linux-2.6.36/net/ipv4/tcp.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv4/tcp.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv4/tcp.c 2010-10-21 13:09:36.000000000 +0200 @@ -266,6 +266,7 @@ #include <linux/crypto.h> #include <linux/time.h> @@ -25885,9 +25771,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv4/tcp.c linux-2.6.36-vs2.3.0.36.33/net #include <net/icmp.h> #include <net/tcp.h> -diff -NurpP --minimal linux-2.6.36/net/ipv4/tcp_ipv4.c linux-2.6.36-vs2.3.0.36.33/net/ipv4/tcp_ipv4.c +diff -NurpP --minimal linux-2.6.36/net/ipv4/tcp_ipv4.c linux-2.6.36-vs2.3.0.36.36/net/ipv4/tcp_ipv4.c --- linux-2.6.36/net/ipv4/tcp_ipv4.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv4/tcp_ipv4.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv4/tcp_ipv4.c 2010-10-21 13:09:36.000000000 +0200 @@ -2016,6 +2016,12 @@ static void *listening_get_next(struct s req = req->dl_next; while (1) { @@ -25995,9 +25881,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv4/tcp_ipv4.c linux-2.6.36-vs2.3.0.36.3 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0, atomic_read(&tw->tw_refcnt), tw, len); } -diff -NurpP --minimal linux-2.6.36/net/ipv4/tcp_minisocks.c linux-2.6.36-vs2.3.0.36.33/net/ipv4/tcp_minisocks.c +diff -NurpP --minimal linux-2.6.36/net/ipv4/tcp_minisocks.c linux-2.6.36-vs2.3.0.36.36/net/ipv4/tcp_minisocks.c --- linux-2.6.36/net/ipv4/tcp_minisocks.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv4/tcp_minisocks.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv4/tcp_minisocks.c 2010-10-21 13:09:36.000000000 +0200 @@ -23,6 +23,9 @@ #include <linux/slab.h> #include <linux/sysctl.h> @@ -26020,9 +25906,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv4/tcp_minisocks.c linux-2.6.36-vs2.3.0 #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-2.6.36/net/ipv4/udp.c linux-2.6.36-vs2.3.0.36.33/net/ipv4/udp.c +diff -NurpP --minimal linux-2.6.36/net/ipv4/udp.c linux-2.6.36-vs2.3.0.36.36/net/ipv4/udp.c --- linux-2.6.36/net/ipv4/udp.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv4/udp.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv4/udp.c 2010-10-21 13:09:36.000000000 +0200 @@ -296,14 +296,7 @@ fail: } EXPORT_SYMBOL(udp_lib_get_port); @@ -26153,9 +26039,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv4/udp.c linux-2.6.36-vs2.3.0.36.33/net sk_wmem_alloc_get(sp), sk_rmem_alloc_get(sp), 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp), -diff -NurpP --minimal linux-2.6.36/net/ipv6/addrconf.c linux-2.6.36-vs2.3.0.36.33/net/ipv6/addrconf.c +diff -NurpP --minimal linux-2.6.36/net/ipv6/addrconf.c linux-2.6.36-vs2.3.0.36.36/net/ipv6/addrconf.c --- linux-2.6.36/net/ipv6/addrconf.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv6/addrconf.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv6/addrconf.c 2010-10-21 13:09:36.000000000 +0200 @@ -87,6 +87,8 @@ #include <linux/proc_fs.h> @@ -26255,9 +26141,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv6/addrconf.c linux-2.6.36-vs2.3.0.36.3 idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-2.6.36/net/ipv6/af_inet6.c linux-2.6.36-vs2.3.0.36.33/net/ipv6/af_inet6.c +diff -NurpP --minimal linux-2.6.36/net/ipv6/af_inet6.c linux-2.6.36-vs2.3.0.36.36/net/ipv6/af_inet6.c --- linux-2.6.36/net/ipv6/af_inet6.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv6/af_inet6.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv6/af_inet6.c 2010-10-21 13:09:36.000000000 +0200 @@ -42,6 +42,8 @@ #include <linux/netdevice.h> #include <linux/icmpv6.h> @@ -26354,9 +26240,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv6/af_inet6.c linux-2.6.36-vs2.3.0.36.3 if (ipv6_addr_any(&np->rcv_saddr)) ipv6_addr_copy(&sin->sin6_addr, &np->saddr); else -diff -NurpP --minimal linux-2.6.36/net/ipv6/fib6_rules.c linux-2.6.36-vs2.3.0.36.33/net/ipv6/fib6_rules.c +diff -NurpP --minimal linux-2.6.36/net/ipv6/fib6_rules.c linux-2.6.36-vs2.3.0.36.36/net/ipv6/fib6_rules.c --- linux-2.6.36/net/ipv6/fib6_rules.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv6/fib6_rules.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv6/fib6_rules.c 2010-10-21 13:09:36.000000000 +0200 @@ -89,7 +89,7 @@ static int fib6_rule_action(struct fib_r ip6_dst_idev(&rt->dst)->dev, &flp->fl6_dst, @@ -26366,9 +26252,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv6/fib6_rules.c linux-2.6.36-vs2.3.0.36 goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-2.6.36/net/ipv6/inet6_hashtables.c linux-2.6.36-vs2.3.0.36.33/net/ipv6/inet6_hashtables.c +diff -NurpP --minimal linux-2.6.36/net/ipv6/inet6_hashtables.c linux-2.6.36-vs2.3.0.36.36/net/ipv6/inet6_hashtables.c --- linux-2.6.36/net/ipv6/inet6_hashtables.c 2010-02-25 11:52:10.000000000 +0100 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv6/inet6_hashtables.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv6/inet6_hashtables.c 2010-10-21 13:09:36.000000000 +0200 @@ -16,6 +16,7 @@ #include <linux/module.h> @@ -26404,9 +26290,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv6/inet6_hashtables.c linux-2.6.36-vs2. } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-2.6.36/net/ipv6/ip6_output.c linux-2.6.36-vs2.3.0.36.33/net/ipv6/ip6_output.c +diff -NurpP --minimal linux-2.6.36/net/ipv6/ip6_output.c linux-2.6.36-vs2.3.0.36.36/net/ipv6/ip6_output.c --- linux-2.6.36/net/ipv6/ip6_output.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv6/ip6_output.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv6/ip6_output.c 2010-10-21 13:09:36.000000000 +0200 @@ -938,7 +938,7 @@ static int ip6_dst_lookup_tail(struct so err = ipv6_dev_get_saddr(net, ip6_dst_idev(*dst)->dev, &fl->fl6_dst, @@ -26416,9 +26302,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv6/ip6_output.c linux-2.6.36-vs2.3.0.36 if (err) goto out_err_release; } -diff -NurpP --minimal linux-2.6.36/net/ipv6/Kconfig linux-2.6.36-vs2.3.0.36.33/net/ipv6/Kconfig +diff -NurpP --minimal linux-2.6.36/net/ipv6/Kconfig linux-2.6.36-vs2.3.0.36.36/net/ipv6/Kconfig --- linux-2.6.36/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv6/Kconfig 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv6/Kconfig 2010-10-21 13:09:36.000000000 +0200 @@ -4,8 +4,8 @@ # IPv6 as module will cause a CRASH if you try to unload it @@ -26430,9 +26316,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv6/Kconfig linux-2.6.36-vs2.3.0.36.33/n ---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-2.6.36/net/ipv6/ndisc.c linux-2.6.36-vs2.3.0.36.33/net/ipv6/ndisc.c +diff -NurpP --minimal linux-2.6.36/net/ipv6/ndisc.c linux-2.6.36-vs2.3.0.36.36/net/ipv6/ndisc.c --- linux-2.6.36/net/ipv6/ndisc.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv6/ndisc.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv6/ndisc.c 2010-10-21 13:09:36.000000000 +0200 @@ -591,7 +591,7 @@ static void ndisc_send_na(struct net_dev } else { if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, @@ -26442,9 +26328,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv6/ndisc.c linux-2.6.36-vs2.3.0.36.33/n return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-2.6.36/net/ipv6/raw.c linux-2.6.36-vs2.3.0.36.33/net/ipv6/raw.c +diff -NurpP --minimal linux-2.6.36/net/ipv6/raw.c linux-2.6.36-vs2.3.0.36.36/net/ipv6/raw.c --- linux-2.6.36/net/ipv6/raw.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv6/raw.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv6/raw.c 2010-10-21 13:09:36.000000000 +0200 @@ -30,6 +30,7 @@ #include <linux/icmpv6.h> #include <linux/netfilter.h> @@ -26467,9 +26353,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv6/raw.c linux-2.6.36-vs2.3.0.36.33/net /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -diff -NurpP --minimal linux-2.6.36/net/ipv6/route.c linux-2.6.36-vs2.3.0.36.33/net/ipv6/route.c +diff -NurpP --minimal linux-2.6.36/net/ipv6/route.c linux-2.6.36-vs2.3.0.36.36/net/ipv6/route.c --- linux-2.6.36/net/ipv6/route.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv6/route.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv6/route.c 2010-10-21 13:09:36.000000000 +0200 @@ -2272,7 +2272,8 @@ static int rt6_fill_node(struct net *net struct inet6_dev *idev = ip6_dst_idev(&rt->dst); struct in6_addr saddr_buf; @@ -26480,9 +26366,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv6/route.c linux-2.6.36-vs2.3.0.36.33/n NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf); } -diff -NurpP --minimal linux-2.6.36/net/ipv6/tcp_ipv6.c linux-2.6.36-vs2.3.0.36.33/net/ipv6/tcp_ipv6.c +diff -NurpP --minimal linux-2.6.36/net/ipv6/tcp_ipv6.c linux-2.6.36-vs2.3.0.36.36/net/ipv6/tcp_ipv6.c --- linux-2.6.36/net/ipv6/tcp_ipv6.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv6/tcp_ipv6.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv6/tcp_ipv6.c 2010-10-21 13:09:36.000000000 +0200 @@ -69,6 +69,7 @@ #include <linux/crypto.h> @@ -26509,9 +26395,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv6/tcp_ipv6.c linux-2.6.36-vs2.3.0.36.3 addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-2.6.36/net/ipv6/udp.c linux-2.6.36-vs2.3.0.36.33/net/ipv6/udp.c +diff -NurpP --minimal linux-2.6.36/net/ipv6/udp.c linux-2.6.36-vs2.3.0.36.36/net/ipv6/udp.c --- linux-2.6.36/net/ipv6/udp.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv6/udp.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv6/udp.c 2010-10-21 13:09:36.000000000 +0200 @@ -48,13 +48,14 @@ #include <linux/proc_fs.h> @@ -26596,9 +26482,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv6/udp.c linux-2.6.36-vs2.3.0.36.33/net } if (!ipv6_addr_any(&np->daddr)) { if (!ipv6_addr_equal(&np->daddr, saddr)) -diff -NurpP --minimal linux-2.6.36/net/ipv6/xfrm6_policy.c linux-2.6.36-vs2.3.0.36.33/net/ipv6/xfrm6_policy.c +diff -NurpP --minimal linux-2.6.36/net/ipv6/xfrm6_policy.c linux-2.6.36-vs2.3.0.36.36/net/ipv6/xfrm6_policy.c --- linux-2.6.36/net/ipv6/xfrm6_policy.c 2010-08-02 16:53:00.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/ipv6/xfrm6_policy.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/ipv6/xfrm6_policy.c 2010-10-21 13:09:36.000000000 +0200 @@ -62,7 +62,7 @@ static int xfrm6_get_saddr(struct net *n dev = ip6_dst_idev(dst)->dev; ipv6_dev_get_saddr(dev_net(dev), dev, @@ -26608,9 +26494,9 @@ diff -NurpP --minimal linux-2.6.36/net/ipv6/xfrm6_policy.c linux-2.6.36-vs2.3.0. dst_release(dst); return 0; } -diff -NurpP --minimal linux-2.6.36/net/netlink/af_netlink.c linux-2.6.36-vs2.3.0.36.33/net/netlink/af_netlink.c +diff -NurpP --minimal linux-2.6.36/net/netlink/af_netlink.c linux-2.6.36-vs2.3.0.36.36/net/netlink/af_netlink.c --- linux-2.6.36/net/netlink/af_netlink.c 2010-10-21 13:08:01.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/netlink/af_netlink.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/netlink/af_netlink.c 2010-10-21 13:09:36.000000000 +0200 @@ -55,6 +55,9 @@ #include <linux/types.h> #include <linux/audit.h> @@ -26650,9 +26536,9 @@ diff -NurpP --minimal linux-2.6.36/net/netlink/af_netlink.c linux-2.6.36-vs2.3.0 s = sk_next(s); if (s) { iter->link = i; -diff -NurpP --minimal linux-2.6.36/net/sctp/ipv6.c linux-2.6.36-vs2.3.0.36.33/net/sctp/ipv6.c +diff -NurpP --minimal linux-2.6.36/net/sctp/ipv6.c linux-2.6.36-vs2.3.0.36.36/net/sctp/ipv6.c --- linux-2.6.36/net/sctp/ipv6.c 2010-08-02 16:53:01.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/sctp/ipv6.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/sctp/ipv6.c 2010-10-21 13:09:36.000000000 +0200 @@ -304,7 +304,8 @@ static void sctp_v6_get_saddr(struct sct dst ? ip6_dst_idev(dst)->dev : NULL, &daddr->v6.sin6_addr, @@ -26663,9 +26549,9 @@ diff -NurpP --minimal linux-2.6.36/net/sctp/ipv6.c linux-2.6.36-vs2.3.0.36.33/ne SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: %pI6\n", &saddr->v6.sin6_addr); return; -diff -NurpP --minimal linux-2.6.36/net/socket.c linux-2.6.36-vs2.3.0.36.33/net/socket.c +diff -NurpP --minimal linux-2.6.36/net/socket.c linux-2.6.36-vs2.3.0.36.36/net/socket.c --- linux-2.6.36/net/socket.c 2010-10-21 13:08:01.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/socket.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/socket.c 2010-10-21 13:09:36.000000000 +0200 @@ -98,6 +98,10 @@ #include <net/sock.h> @@ -26773,9 +26659,9 @@ diff -NurpP --minimal linux-2.6.36/net/socket.c linux-2.6.36-vs2.3.0.36.33/net/s err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-2.6.36/net/sunrpc/auth.c linux-2.6.36-vs2.3.0.36.33/net/sunrpc/auth.c +diff -NurpP --minimal linux-2.6.36/net/sunrpc/auth.c linux-2.6.36-vs2.3.0.36.36/net/sunrpc/auth.c --- linux-2.6.36/net/sunrpc/auth.c 2010-10-21 13:08:01.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/sunrpc/auth.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/sunrpc/auth.c 2010-10-21 13:09:36.000000000 +0200 @@ -14,6 +14,7 @@ #include <linux/hash.h> #include <linux/sunrpc/clnt.h> @@ -26800,9 +26686,9 @@ diff -NurpP --minimal linux-2.6.36/net/sunrpc/auth.c linux-2.6.36-vs2.3.0.36.33/ }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-2.6.36/net/sunrpc/auth_unix.c linux-2.6.36-vs2.3.0.36.33/net/sunrpc/auth_unix.c +diff -NurpP --minimal linux-2.6.36/net/sunrpc/auth_unix.c linux-2.6.36-vs2.3.0.36.36/net/sunrpc/auth_unix.c --- linux-2.6.36/net/sunrpc/auth_unix.c 2010-10-21 13:08:01.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/sunrpc/auth_unix.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/sunrpc/auth_unix.c 2010-10-21 13:09:36.000000000 +0200 @@ -12,12 +12,14 @@ #include <linux/module.h> #include <linux/sunrpc/clnt.h> @@ -26861,9 +26747,9 @@ diff -NurpP --minimal linux-2.6.36/net/sunrpc/auth_unix.c linux-2.6.36-vs2.3.0.3 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-2.6.36/net/sunrpc/clnt.c linux-2.6.36-vs2.3.0.36.33/net/sunrpc/clnt.c +diff -NurpP --minimal linux-2.6.36/net/sunrpc/clnt.c linux-2.6.36-vs2.3.0.36.36/net/sunrpc/clnt.c --- linux-2.6.36/net/sunrpc/clnt.c 2010-10-21 13:08:01.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/sunrpc/clnt.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/sunrpc/clnt.c 2010-10-21 13:09:36.000000000 +0200 @@ -33,6 +33,7 @@ #include <linux/utsname.h> #include <linux/workqueue.h> @@ -26882,9 +26768,9 @@ diff -NurpP --minimal linux-2.6.36/net/sunrpc/clnt.c linux-2.6.36-vs2.3.0.36.33/ return clnt; } EXPORT_SYMBOL_GPL(rpc_create); -diff -NurpP --minimal linux-2.6.36/net/unix/af_unix.c linux-2.6.36-vs2.3.0.36.33/net/unix/af_unix.c +diff -NurpP --minimal linux-2.6.36/net/unix/af_unix.c linux-2.6.36-vs2.3.0.36.36/net/unix/af_unix.c --- linux-2.6.36/net/unix/af_unix.c 2010-10-21 13:08:01.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/net/unix/af_unix.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/net/unix/af_unix.c 2010-10-21 13:09:36.000000000 +0200 @@ -114,6 +114,8 @@ #include <linux/mount.h> #include <net/checksum.h> @@ -26922,9 +26808,9 @@ diff -NurpP --minimal linux-2.6.36/net/unix/af_unix.c linux-2.6.36-vs2.3.0.36.33 sk = next_unix_socket(&iter->i, sk); return sk; } -diff -NurpP --minimal linux-2.6.36/scripts/checksyscalls.sh linux-2.6.36-vs2.3.0.36.33/scripts/checksyscalls.sh +diff -NurpP --minimal linux-2.6.36/scripts/checksyscalls.sh linux-2.6.36-vs2.3.0.36.36/scripts/checksyscalls.sh --- linux-2.6.36/scripts/checksyscalls.sh 2010-10-21 13:08:01.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/scripts/checksyscalls.sh 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/scripts/checksyscalls.sh 2010-10-21 13:09:36.000000000 +0200 @@ -193,7 +193,6 @@ cat << EOF #define __IGNORE_afs_syscall #define __IGNORE_getpmsg @@ -26933,9 +26819,9 @@ diff -NurpP --minimal linux-2.6.36/scripts/checksyscalls.sh linux-2.6.36-vs2.3.0 EOF } -diff -NurpP --minimal linux-2.6.36/security/commoncap.c linux-2.6.36-vs2.3.0.36.33/security/commoncap.c +diff -NurpP --minimal linux-2.6.36/security/commoncap.c linux-2.6.36-vs2.3.0.36.36/security/commoncap.c --- linux-2.6.36/security/commoncap.c 2010-10-21 13:08:02.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/security/commoncap.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/security/commoncap.c 2010-10-21 13:09:36.000000000 +0200 @@ -28,6 +28,7 @@ #include <linux/prctl.h> #include <linux/securebits.h> @@ -27018,9 +26904,9 @@ diff -NurpP --minimal linux-2.6.36/security/commoncap.c linux-2.6.36-vs2.3.0.36. return ret; } + -diff -NurpP --minimal linux-2.6.36/security/selinux/hooks.c linux-2.6.36-vs2.3.0.36.33/security/selinux/hooks.c +diff -NurpP --minimal linux-2.6.36/security/selinux/hooks.c linux-2.6.36-vs2.3.0.36.36/security/selinux/hooks.c --- linux-2.6.36/security/selinux/hooks.c 2010-10-21 13:08:02.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.33/security/selinux/hooks.c 2010-10-21 13:09:36.000000000 +0200 ++++ linux-2.6.36-vs2.3.0.36.36/security/selinux/hooks.c 2010-10-21 13:09:36.000000000 +0200 @@ -64,7 +64,6 @@ #include <linux/dccp.h> #include <linux/quota.h> @@ -27029,367 +26915,3 @@ diff -NurpP --minimal linux-2.6.36/security/selinux/hooks.c linux-2.6.36-vs2.3.0 #include <linux/parser.h> #include <linux/nfs_mount.h> #include <net/ipv6.h> -diff -NurpP --minimal linux-2.6.36-vs2.3.0.36.33/fs/namei.c linux-2.6.36-vs2.3.0.36.34/fs/namei.c ---- linux-2.6.36-vs2.3.0.36.33/fs/namei.c 2010-10-21 14:45:53.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.34/fs/namei.c 2010-10-21 17:45:49.000000000 +0200 -@@ -848,7 +848,8 @@ done: - return 0; - - hidden: -- vxwprintk_task(1, "did lookup hidden %s:%p[#%d,%lu] »%s/%.*s«.", -+ vxwprintk_task(1, -+ "did lookup hidden %s:%p[#%d,%lu] " VS_Q("%s/%.*s") ".", - inode->i_sb->s_id, inode, inode->i_tag, inode->i_ino, - vxd_path(&nd->path), name->len, name->name); - dput(dentry); -@@ -2968,7 +2969,8 @@ struct dentry *cow_break_link(const char - char *to, *path, pad='\251'; - loff_t size; - -- vxdprintk(VXD_CBIT(misc, 1), "cow_break_link(»%s«)", pathname); -+ vxdprintk(VXD_CBIT(misc, 1), -+ "cow_break_link(" VS_Q("%s") ")", pathname); - path = kmalloc(PATH_MAX, GFP_KERNEL); - ret = -ENOMEM; - if (!path) -@@ -2985,7 +2987,8 @@ struct dentry *cow_break_link(const char - - to = d_path(&old_path, path, PATH_MAX-2); - pathlen = strlen(to); -- vxdprintk(VXD_CBIT(misc, 2), "old path »%s« [»%.*s«:%d]", to, -+ vxdprintk(VXD_CBIT(misc, 2), -+ "old path " VS_Q("%s") " [" VS_Q("%.*s") ":%d]", to, - old_path.dentry->d_name.len, old_path.dentry->d_name.name, - old_path.dentry->d_name.len); - -@@ -2996,7 +2999,7 @@ retry: - if (pad <= '\240') - goto out_rel_old; - -- vxdprintk(VXD_CBIT(misc, 1), "temp copy »%s«", to); -+ vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to); - /* dir_nd will have refs to dentry and mnt */ - ret = path_lookup(to, - LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &dir_nd); -@@ -3015,7 +3018,8 @@ retry: - goto retry; - } - vxdprintk(VXD_CBIT(misc, 2), -- "lookup_create(new): %p [»%.*s«:%d]", new_path.dentry, -+ "lookup_create(new): %p [" VS_Q("%.*s") ":%d]", -+ new_path.dentry, - new_path.dentry->d_name.len, new_path.dentry->d_name.name, - new_path.dentry->d_name.len); - dir = dir_nd.path.dentry; -@@ -3091,7 +3095,7 @@ retry: - goto out_unlock; - - vxdprintk(VXD_CBIT(misc, 2), -- "vfs_rename: [»%*s«:%d] -> [»%*s«:%d]", -+ "vfs_rename: [" VS_Q("%*s") ":%d] -> [" VS_Q("%*s") ":%d]", - new_path.dentry->d_name.len, new_path.dentry->d_name.name, - new_path.dentry->d_name.len, - old_path.dentry->d_name.len, old_path.dentry->d_name.name, -@@ -3136,7 +3140,8 @@ out_redo: - - new_path.dentry = old_nd.path.dentry; - vxdprintk(VXD_CBIT(misc, 2), -- "path_lookup(redo): %p [»%.*s«:%d]", new_path.dentry, -+ "path_lookup(redo): %p [" VS_Q("%.*s") ":%d]", -+ new_path.dentry, - new_path.dentry->d_name.len, new_path.dentry->d_name.name, - new_path.dentry->d_name.len); - dget(new_path.dentry); -diff -NurpP --minimal linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/debug.h linux-2.6.36-vs2.3.0.36.34/include/linux/vserver/debug.h ---- linux-2.6.36-vs2.3.0.36.33/include/linux/vserver/debug.h 2010-10-21 13:09:36.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.34/include/linux/vserver/debug.h 2010-10-21 18:35:25.000000000 +0200 -@@ -10,6 +10,19 @@ - imajor((d)->bd_inode), iminor((d)->bd_inode) - #define VXF_DEV "%p[%lu,%d:%d]" - -+#if defined(CONFIG_QUOTES_UTF8) -+#define VS_Q_LQM "\xc2\xbb" -+#define VS_Q_RQM "\xc2\xab" -+#elif defined(CONFIG_QUOTES_ASCII) -+#define VS_Q_LQM "\x27" -+#define VS_Q_RQM "\x27" -+#else -+#define VS_Q_LQM "\xbb" -+#define VS_Q_RQM "\xab" -+#endif -+ -+#define VS_Q(f) VS_Q_LQM f VS_Q_RQM -+ - - #define vxd_path(p) \ - ({ static char _buffer[PATH_MAX]; \ -@@ -86,7 +99,7 @@ void dump_vx_info_inactive(int); - #ifdef CONFIG_VSERVER_WARN - - #define VX_WARNLEVEL KERN_WARNING "vxW: " --#define VX_WARN_TASK "[»%s«,%u:#%u|%u|%u] " -+#define VX_WARN_TASK "[" VS_Q("%s") ",%u:#%u|%u|%u] " - #define VX_WARN_XID "[xid #%u] " - #define VX_WARN_NID "[nid #%u] " - #define VX_WARN_TAG "[tag #%u] " -diff -NurpP --minimal linux-2.6.36-vs2.3.0.36.33/include/linux/vs_inet.h linux-2.6.36-vs2.3.0.36.34/include/linux/vs_inet.h ---- linux-2.6.36-vs2.3.0.36.33/include/linux/vs_inet.h 2010-10-21 14:48:51.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.34/include/linux/vs_inet.h 2010-10-21 17:41:35.000000000 +0200 -@@ -188,7 +188,8 @@ int __v4_addr_match_socket(const struct - static inline - int nx_dev_visible(struct nx_info *nxi, struct net_device *dev) - { -- vxdprintk(VXD_CBIT(net, 1), "nx_dev_visible(%p[#%u],%p »%s«) %d", -+ vxdprintk(VXD_CBIT(net, 1), -+ "nx_dev_visible(%p[#%u],%p " VS_Q("%s") ") %d", - nxi, nxi ? nxi->nx_id : 0, dev, dev->name, - nxi ? dev_in_nx_info(dev, nxi) : 0); - -diff -NurpP --minimal linux-2.6.36-vs2.3.0.36.33/kernel/vserver/inode.c linux-2.6.36-vs2.3.0.36.34/kernel/vserver/inode.c ---- linux-2.6.36-vs2.3.0.36.33/kernel/vserver/inode.c 2010-10-21 14:46:31.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.34/kernel/vserver/inode.c 2010-10-21 17:40:44.000000000 +0200 -@@ -358,7 +358,7 @@ int dx_parse_tag(char *string, tag_t *ta - token = match_token(p, tokens, args); - - vxdprintk(VXD_CBIT(tag, 7), -- "dx_parse_tag(»%s«): %d:#%d", -+ "dx_parse_tag(" VS_Q("%s") "): %d:#%d", - p, token, option); - - switch (token) { -diff -NurpP --minimal linux-2.6.36-vs2.3.0.36.33/kernel/vserver/Kconfig linux-2.6.36-vs2.3.0.36.34/kernel/vserver/Kconfig ---- linux-2.6.36-vs2.3.0.36.33/kernel/vserver/Kconfig 2010-10-21 13:09:36.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.34/kernel/vserver/Kconfig 2010-10-21 18:34:45.000000000 +0200 -@@ -239,6 +239,29 @@ config VSERVER_LEGACY_MEM - older tools happy in the face of memory - cgroups - -+choice -+ prompt "Quotes used in debug and warn messages" -+ default QUOTES_ISO8859 -+ -+config QUOTES_ISO8859 -+ bool "Extended ASCII (ISO 8859) angle quotes" -+ help -+ This uses the extended ASCII characters \xbb -+ and \xab for quoting file and process names. -+ -+config QUOTES_UTF8 -+ bool "UTF-8 angle quotes" -+ help -+ This uses the the UTF-8 sequences for angle -+ quotes to quote file and process names. -+ -+config QUOTES_ASCII -+ bool "ASCII single quotes" -+ help -+ This uses the ASCII single quote character -+ (\x27) to quote file and process names. -+ -+endchoice - - endmenu - -diff -NurpP --minimal linux-2.6.36-vs2.3.0.36.34/kernel/vserver/Kconfig linux-2.6.36-vs2.3.0.36.35/kernel/vserver/Kconfig ---- linux-2.6.36-vs2.3.0.36.34/kernel/vserver/Kconfig 2010-10-21 18:34:45.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.35/kernel/vserver/Kconfig 2010-10-21 19:04:20.000000000 +0200 -@@ -204,33 +204,6 @@ config VSERVER_HISTORY_SIZE - This allows you to specify the number of entries in - the per-CPU history buffer. - --config VSERVER_MONITOR -- bool "VServer Scheduling Monitor" -- depends on VSERVER_DISABLED -- default n -- help -- Set this to yes if you want to record the scheduling -- decisions, so that they can be relayed to userspace -- for detailed analysis. -- --config VSERVER_MONITOR_SIZE -- int "Per-CPU Monitor Queue Size (32-65536)" -- depends on VSERVER_MONITOR -- range 32 65536 -- default 1024 -- help -- This allows you to specify the number of entries in -- the per-CPU scheduling monitor buffer. -- --config VSERVER_MONITOR_SYNC -- int "Per-CPU Monitor Sync Interval (0-65536)" -- depends on VSERVER_MONITOR -- range 0 65536 -- default 256 -- help -- This allows you to specify the interval in ticks -- when a time sync entry is inserted. -- - config VSERVER_LEGACY_MEM - bool "Legacy Memory Limits" - default n -diff -NurpP --minimal linux-2.6.36-vs2.3.0.36.34/kernel/vserver/monitor.c linux-2.6.36-vs2.3.0.36.35/kernel/vserver/monitor.c ---- linux-2.6.36-vs2.3.0.36.34/kernel/vserver/monitor.c 2010-10-21 13:09:36.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.35/kernel/vserver/monitor.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,138 +0,0 @@ --/* -- * kernel/vserver/monitor.c -- * -- * Virtual Context Scheduler Monitor -- * -- * Copyright (C) 2006-2007 Herbert Pötzl -- * -- * V0.01 basic design -- * -- */ -- --#include <linux/module.h> --#include <linux/jiffies.h> --#include <asm/uaccess.h> --#include <asm/atomic.h> -- --#include <linux/vserver/monitor.h> --#include <linux/vserver/debug_cmd.h> -- -- --#ifdef CONFIG_VSERVER_MONITOR --#define VXM_SIZE CONFIG_VSERVER_MONITOR_SIZE --#else --#define VXM_SIZE 64 --#endif -- --struct _vx_monitor { -- unsigned int counter; -- -- struct _vx_mon_entry entry[VXM_SIZE+1]; --}; -- -- --DEFINE_PER_CPU(struct _vx_monitor, vx_monitor_buffer); -- --unsigned volatile int vxm_active = 1; -- --static atomic_t sequence = ATOMIC_INIT(0); -- -- --/* vxm_advance() -- -- * requires disabled preemption */ -- --struct _vx_mon_entry *vxm_advance(int cpu) --{ -- struct _vx_monitor *mon = &per_cpu(vx_monitor_buffer, cpu); -- struct _vx_mon_entry *entry; -- unsigned int index; -- -- index = vxm_active ? (mon->counter++ % VXM_SIZE) : VXM_SIZE; -- entry = &mon->entry[index]; -- -- entry->ev.seq = atomic_inc_return(&sequence); -- entry->ev.jif = jiffies; -- return entry; --} -- --EXPORT_SYMBOL_GPL(vxm_advance); -- -- --int do_read_monitor(struct __user _vx_mon_entry *data, -- int cpu, uint32_t *index, uint32_t *count) --{ -- int pos, ret = 0; -- struct _vx_monitor *mon = &per_cpu(vx_monitor_buffer, cpu); -- int end = mon->counter; -- int start = end - VXM_SIZE + 2; -- int idx = *index; -- -- /* special case: get current pos */ -- if (!*count) { -- *index = end; -- return 0; -- } -- -- /* have we lost some data? */ -- if (idx < start) -- idx = start; -- -- for (pos = 0; (pos < *count) && (idx < end); pos++, idx++) { -- struct _vx_mon_entry *entry = -- &mon->entry[idx % VXM_SIZE]; -- -- /* send entry to userspace */ -- ret = copy_to_user(&data[pos], entry, sizeof(*entry)); -- if (ret) -- break; -- } -- /* save new index and count */ -- *index = idx; -- *count = pos; -- return ret ? ret : (*index < end); --} -- --int vc_read_monitor(uint32_t id, void __user *data) --{ -- struct vcmd_read_monitor_v0 vc_data; -- int ret; -- -- if (id >= NR_CPUS) -- return -EINVAL; -- -- if (copy_from_user(&vc_data, data, sizeof(vc_data))) -- return -EFAULT; -- -- ret = do_read_monitor((struct __user _vx_mon_entry *)vc_data.data, -- id, &vc_data.index, &vc_data.count); -- -- if (copy_to_user(data, &vc_data, sizeof(vc_data))) -- return -EFAULT; -- return ret; --} -- --#ifdef CONFIG_COMPAT -- --int vc_read_monitor_x32(uint32_t id, void __user *data) --{ -- struct vcmd_read_monitor_v0_x32 vc_data; -- int ret; -- -- if (id >= NR_CPUS) -- return -EINVAL; -- -- if (copy_from_user(&vc_data, data, sizeof(vc_data))) -- return -EFAULT; -- -- ret = do_read_monitor((struct __user _vx_mon_entry *) -- compat_ptr(vc_data.data_ptr), -- id, &vc_data.index, &vc_data.count); -- -- if (copy_to_user(data, &vc_data, sizeof(vc_data))) -- return -EFAULT; -- return ret; --} -- --#endif /* CONFIG_COMPAT */ -- -diff -NurpP --minimal linux-2.6.36-vs2.3.0.36.34/kernel/vserver/switch.c linux-2.6.36-vs2.3.0.36.35/kernel/vserver/switch.c ---- linux-2.6.36-vs2.3.0.36.34/kernel/vserver/switch.c 2010-10-21 13:09:36.000000000 +0200 -+++ linux-2.6.36-vs2.3.0.36.35/kernel/vserver/switch.c 2010-10-21 19:05:54.000000000 +0200 -@@ -272,10 +272,6 @@ long do_vcmd(uint32_t cmd, uint32_t id, - case VCMD_read_history: - return __COMPAT(vc_read_history, id, data, compat); - #endif --#ifdef CONFIG_VSERVER_MONITOR -- case VCMD_read_monitor: -- return __COMPAT(vc_read_monitor, id, data, compat); --#endif - default: - vxwprintk_task(1, "unimplemented VCMD_%02d_%d[%d]", - VC_CATEGORY(cmd), VC_COMMAND(cmd), VC_VERSION(cmd)); -@@ -406,9 +402,6 @@ long do_vserver(uint32_t cmd, uint32_t i - __VCMD(dump_history, 9, VCA_NONE, 0); - __VCMD(read_history, 9, VCA_NONE, 0); - #endif --#ifdef CONFIG_VSERVER_MONITOR -- __VCMD(read_monitor, 9, VCA_NONE, 0); --#endif - - default: - perm = -1; diff --git a/kernel.spec b/kernel.spec index 79712d1..9b4617a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -265,7 +265,7 @@ Patch70: kernel-tuxonice-headers.patch # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch Patch85: kernel-hostap.patch -# http://vserver.13thfloor.at/Experimental/patch-2.6.36-vs2.3.0.36.33.diff +# http://vserver.13thfloor.at/Experimental/patch-2.6.36-vs2.3.0.36.36.diff Patch100: kernel-vserver-2.3.patch Patch101: kernel-vserver-fixes.patch |