diff options
| author | Frederik Schüler <fs@debian.org> | 2006-11-01 22:45:00 +0000 |
|---|---|---|
| committer | Frederik Schüler <fs@debian.org> | 2006-11-01 22:45:00 +0000 |
| commit | d946f6a129168b126711bc448913db2826ce0832 (patch) | |
| tree | 3c2c6cbc1c6de82b7be7223f78a613d8deabe889 | |
| parent | 81634067e51cf01ce13a7232dcbb475165b2d8bd (diff) | |
| download | kernel_replicant_linux-d946f6a129168b126711bc448913db2826ce0832.tar.gz kernel_replicant_linux-d946f6a129168b126711bc448913db2826ce0832.tar.bz2 kernel_replicant_linux-d946f6a129168b126711bc448913db2826ce0832.zip | |
Update vserver patch to 2.0.2.2-rc4.
svn path=/dists/trunk/linux-2.6/; revision=7680
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/patches/features/all/vserver/vs2.0.2.2-rc4.patch (renamed from debian/patches/features/all/vserver/vs2.0.2.2-rc3.patch) | 1889 | ||||
| -rw-r--r-- | debian/patches/series/3-extra | 4 | ||||
| -rw-r--r-- | debian/patches/series/4-extra | 4 |
4 files changed, 1025 insertions, 877 deletions
diff --git a/debian/changelog b/debian/changelog index 547ca716711e..c231fcb6084d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-2.6 (2.6.18-4) UNRELEASED; urgency=high +linux-2.6 (2.6.18-4) UNRELEASED; urgency=low [ Norbert Tretkowski ] * [alpha] Switched to gcc-4.1. @@ -52,8 +52,9 @@ linux-2.6 (2.6.18-4) UNRELEASED; urgency=high [ Frederik Schüler ] * Bump ABI to 2. + * Update vserver patch to 2.0.2.2-rc4. - -- maximilian attems <maks@sternwelten.at> Wed, 1 Nov 2006 22:42:06 +0100 + -- Frederik Schüler <fs@debian.org> Wed, 1 Nov 2006 23:44:06 +0100 linux-2.6 (2.6.18-3) unstable; urgency=low diff --git a/debian/patches/features/all/vserver/vs2.0.2.2-rc3.patch b/debian/patches/features/all/vserver/vs2.0.2.2-rc4.patch index 3982e569d109..dbacb8b98e89 100644 --- a/debian/patches/features/all/vserver/vs2.0.2.2-rc3.patch +++ b/debian/patches/features/all/vserver/vs2.0.2.2-rc4.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-2.6.18.1/arch/alpha/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/alpha/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/alpha/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/Kconfig --- linux-2.6.18.1/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/alpha/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/Kconfig 2006-09-20 17:01:44 +0200 @@ -632,6 +632,8 @@ source "arch/alpha/oprofile/Kconfig" source "arch/alpha/Kconfig.debug" @@ -10,9 +10,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/alpha/Kconfig linux-2.6.18.1-vs2.0.2.2 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/entry.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/alpha/kernel/entry.S +diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/entry.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/entry.S --- linux-2.6.18.1/arch/alpha/kernel/entry.S 2006-09-20 16:57:57 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/alpha/kernel/entry.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/entry.S 2006-09-20 17:01:44 +0200 @@ -873,24 +873,15 @@ sys_getxgid: .globl sys_getxpid .ent sys_getxpid @@ -45,9 +45,37 @@ diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/entry.S linux-2.6.18.1-vs ret .end sys_getxpid -diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/osf_sys.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/alpha/kernel/osf_sys.c +diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/irq.c +--- linux-2.6.18.1/arch/alpha/kernel/irq.c 2006-09-20 16:57:57 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/irq.c 2006-10-25 03:42:52 +0200 +@@ -26,6 +26,7 @@ + #include <linux/seq_file.h> + #include <linux/profile.h> + #include <linux/bitops.h> ++#include <linux/vs_context.h> + + #include <asm/system.h> + #include <asm/io.h> +@@ -140,6 +141,7 @@ handle_irq(int irq, struct pt_regs * reg + * handled by some other CPU. (or is disabled) + */ + static unsigned int illegal_count=0; ++ struct vx_info_save vxis; + + if ((unsigned) irq > ACTUAL_NR_IRQS && illegal_count < MAX_ILLEGAL_IRQS ) { + irq_err_count++; +@@ -157,6 +159,8 @@ handle_irq(int irq, struct pt_regs * reg + * at IPL 0. + */ + local_irq_disable(); ++ __enter_vx_admin(&vxis); + __do_IRQ(irq, regs); ++ __leave_vx_admin(&vxis); + irq_exit(); + } +diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/osf_sys.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/osf_sys.c --- linux-2.6.18.1/arch/alpha/kernel/osf_sys.c 2006-09-20 16:57:57 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/alpha/kernel/osf_sys.c 2006-09-20 20:11:48 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/osf_sys.c 2006-09-20 20:11:48 +0200 @@ -38,6 +38,7 @@ #include <linux/uio.h> #include <linux/vfs.h> @@ -147,9 +175,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/osf_sys.c linux-2.6.18.1- len = strlen(res)+1; if (len > count) len = count; -diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/alpha/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/ptrace.c --- linux-2.6.18.1/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/alpha/kernel/ptrace.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/ptrace.c 2006-09-20 17:01:44 +0200 @@ -283,6 +283,11 @@ do_sys_ptrace(long request, long pid, lo goto out_notsk; } @@ -162,9 +190,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/ptrace.c linux-2.6.18.1-v if (request == PTRACE_ATTACH) { ret = ptrace_attach(child); goto out; -diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/systbls.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/alpha/kernel/systbls.S +diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/systbls.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/systbls.S --- linux-2.6.18.1/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/alpha/kernel/systbls.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/systbls.S 2006-09-20 17:01:44 +0200 @@ -447,7 +447,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -174,9 +202,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/systbls.S linux-2.6.18.1- .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.18.1/arch/alpha/mm/init.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/alpha/mm/init.c +diff -NurpP --minimal linux-2.6.18.1/arch/alpha/mm/init.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/mm/init.c --- linux-2.6.18.1/arch/alpha/mm/init.c 2006-09-20 16:57:57 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/alpha/mm/init.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/mm/init.c 2006-09-20 17:01:44 +0200 @@ -20,6 +20,7 @@ #include <linux/init.h> #include <linux/bootmem.h> /* max_low_pfn */ @@ -185,9 +213,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/alpha/mm/init.c linux-2.6.18.1-vs2.0.2 #include <asm/system.h> #include <asm/uaccess.h> -diff -NurpP --minimal linux-2.6.18.1/arch/arm/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/arm/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/arm/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm/Kconfig --- linux-2.6.18.1/arch/arm/Kconfig 2006-09-20 16:57:57 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/arm/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm/Kconfig 2006-09-20 17:01:44 +0200 @@ -907,6 +907,8 @@ source "arch/arm/oprofile/Kconfig" source "arch/arm/Kconfig.debug" @@ -197,9 +225,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/arm/Kconfig linux-2.6.18.1-vs2.0.2.2-r source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/arm/kernel/calls.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/arm/kernel/calls.S +diff -NurpP --minimal linux-2.6.18.1/arch/arm/kernel/calls.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm/kernel/calls.S --- linux-2.6.18.1/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/arm/kernel/calls.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm/kernel/calls.S 2006-09-20 17:01:44 +0200 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -209,9 +237,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/arm/kernel/calls.S linux-2.6.18.1-vs2. CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-2.6.18.1/arch/arm26/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/arm26/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/arm26/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm26/Kconfig --- linux-2.6.18.1/arch/arm26/Kconfig 2006-09-20 16:57:57 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/arm26/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm26/Kconfig 2006-09-20 17:01:44 +0200 @@ -234,6 +234,8 @@ source "drivers/usb/Kconfig" source "arch/arm26/Kconfig.debug" @@ -221,9 +249,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/arm26/Kconfig linux-2.6.18.1-vs2.0.2.2 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/arm26/kernel/calls.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/arm26/kernel/calls.S +diff -NurpP --minimal linux-2.6.18.1/arch/arm26/kernel/calls.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm26/kernel/calls.S --- linux-2.6.18.1/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/arm26/kernel/calls.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm26/kernel/calls.S 2006-09-20 17:01:44 +0200 @@ -257,6 +257,11 @@ __syscall_start: .long sys_lremovexattr .long sys_fremovexattr @@ -236,9 +264,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/arm26/kernel/calls.S linux-2.6.18.1-vs __syscall_end: .rept NR_syscalls - (__syscall_end - __syscall_start) / 4 -diff -NurpP --minimal linux-2.6.18.1/arch/arm26/kernel/traps.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/arm26/kernel/traps.c +diff -NurpP --minimal linux-2.6.18.1/arch/arm26/kernel/traps.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm26/kernel/traps.c --- linux-2.6.18.1/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/arm26/kernel/traps.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm26/kernel/traps.c 2006-09-20 17:01:44 +0200 @@ -185,8 +185,9 @@ NORET_TYPE void die(const char *str, str printk("Internal error: %s: %x\n", str, err); printk("CPU: %d\n", smp_processor_id()); @@ -251,9 +279,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/arm26/kernel/traps.c linux-2.6.18.1-vs if (!user_mode(regs) || in_interrupt()) { __dump_stack(tsk, (unsigned long)(regs + 1)); -diff -NurpP --minimal linux-2.6.18.1/arch/cris/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/cris/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/cris/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/cris/Kconfig --- linux-2.6.18.1/arch/cris/Kconfig 2006-09-20 16:57:57 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/cris/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/cris/Kconfig 2006-09-20 17:01:44 +0200 @@ -185,6 +185,8 @@ source "drivers/usb/Kconfig" source "arch/cris/Kconfig.debug" @@ -263,9 +291,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/cris/Kconfig linux-2.6.18.1-vs2.0.2.2- source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/cris/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/cris/kernel/irq.c +diff -NurpP --minimal linux-2.6.18.1/arch/cris/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/cris/kernel/irq.c --- linux-2.6.18.1/arch/cris/kernel/irq.c 2006-09-20 16:57:57 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/cris/kernel/irq.c 2006-10-17 02:35:27 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/cris/kernel/irq.c 2006-10-17 02:35:27 +0200 @@ -35,6 +35,7 @@ #include <linux/seq_file.h> #include <linux/errno.h> @@ -292,9 +320,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/cris/kernel/irq.c linux-2.6.18.1-vs2.0 irq_exit(); } -diff -NurpP --minimal linux-2.6.18.1/arch/frv/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/frv/kernel/irq.c +diff -NurpP --minimal linux-2.6.18.1/arch/frv/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/frv/kernel/irq.c --- linux-2.6.18.1/arch/frv/kernel/irq.c 2006-09-20 16:57:57 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/frv/kernel/irq.c 2006-10-17 02:35:27 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/frv/kernel/irq.c 2006-10-17 02:35:27 +0200 @@ -32,6 +32,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> @@ -322,9 +350,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/frv/kernel/irq.c linux-2.6.18.1-vs2.0. __clr_MASK(level); -diff -NurpP --minimal linux-2.6.18.1/arch/h8300/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/h8300/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/h8300/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/h8300/Kconfig --- linux-2.6.18.1/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/h8300/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/h8300/Kconfig 2006-09-20 17:01:44 +0200 @@ -199,6 +199,8 @@ source "fs/Kconfig" source "arch/h8300/Kconfig.debug" @@ -334,9 +362,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/h8300/Kconfig linux-2.6.18.1-vs2.0.2.2 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/i386/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/i386/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/i386/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/Kconfig --- linux-2.6.18.1/arch/i386/Kconfig 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/i386/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/Kconfig 2006-09-20 17:01:44 +0200 @@ -1142,6 +1142,8 @@ endmenu source "arch/i386/Kconfig.debug" @@ -346,9 +374,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/i386/Kconfig linux-2.6.18.1-vs2.0.2.2- source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/i386/kernel/irq.c +diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/irq.c --- linux-2.6.18.1/arch/i386/kernel/irq.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/i386/kernel/irq.c 2006-10-17 02:35:27 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/irq.c 2006-10-17 02:35:27 +0200 @@ -18,6 +18,7 @@ #include <linux/notifier.h> #include <linux/cpu.h> @@ -382,9 +410,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/irq.c linux-2.6.18.1-vs2.0 irq_exit(); -diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/sys_i386.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/i386/kernel/sys_i386.c +diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/sys_i386.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/sys_i386.c --- linux-2.6.18.1/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/i386/kernel/sys_i386.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/sys_i386.c 2006-09-20 17:01:44 +0200 @@ -19,6 +19,7 @@ #include <linux/mman.h> #include <linux/file.h> @@ -432,9 +460,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/sys_i386.c linux-2.6.18.1- error |= __put_user(0,name->machine+__OLD_UTS_LEN); up_read(&uts_sem); -diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/syscall_table.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/i386/kernel/syscall_table.S +diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/syscall_table.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/syscall_table.S --- linux-2.6.18.1/arch/i386/kernel/syscall_table.S 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/i386/kernel/syscall_table.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/syscall_table.S 2006-09-20 17:01:44 +0200 @@ -272,7 +272,7 @@ ENTRY(sys_call_table) .long sys_tgkill /* 270 */ .long sys_utimes @@ -444,9 +472,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/syscall_table.S linux-2.6. .long sys_mbind .long sys_get_mempolicy .long sys_set_mempolicy -diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/sysenter.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/i386/kernel/sysenter.c +diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/sysenter.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/sysenter.c --- linux-2.6.18.1/arch/i386/kernel/sysenter.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/i386/kernel/sysenter.c 2006-09-20 21:46:26 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/sysenter.c 2006-09-20 21:46:26 +0200 @@ -17,6 +17,7 @@ #include <linux/elf.h> #include <linux/mm.h> @@ -464,9 +492,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/sysenter.c linux-2.6.18.1- up_fail: up_write(&mm->mmap_sem); return ret; -diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/traps.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/i386/kernel/traps.c +diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/traps.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/traps.c --- linux-2.6.18.1/arch/i386/kernel/traps.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/i386/kernel/traps.c 2006-09-20 20:10:14 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/traps.c 2006-09-20 20:10:14 +0200 @@ -53,6 +53,7 @@ #include <asm/kdebug.h> @@ -507,9 +535,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/traps.c linux-2.6.18.1-vs2 /* Executive summary in case the oops scrolled away */ esp = (unsigned long) (®s->esp); savesegment(ss, ss); -diff -NurpP --minimal linux-2.6.18.1/arch/ia64/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/ia64/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/Kconfig --- linux-2.6.18.1/arch/ia64/Kconfig 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/Kconfig 2006-09-20 17:01:44 +0200 @@ -525,6 +525,8 @@ endmenu source "arch/ia64/Kconfig.debug" @@ -519,9 +547,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/ia64/Kconfig linux-2.6.18.1-vs2.0.2.2- source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/ia64/ia32/binfmt_elf32.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/ia32/binfmt_elf32.c +diff -NurpP --minimal linux-2.6.18.1/arch/ia64/ia32/binfmt_elf32.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/ia32/binfmt_elf32.c --- linux-2.6.18.1/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 17:01:44 +0200 @@ -238,7 +238,8 @@ ia32_setup_arg_pages (struct linux_binpr kmem_cache_free(vm_area_cachep, mpnt); return ret; @@ -532,9 +560,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/ia64/ia32/binfmt_elf32.c linux-2.6.18. } for (i = 0 ; i < MAX_ARG_PAGES ; i++) { -diff -NurpP --minimal linux-2.6.18.1/arch/ia64/ia32/ia32_entry.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/ia32/ia32_entry.S +diff -NurpP --minimal linux-2.6.18.1/arch/ia64/ia32/ia32_entry.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/ia32/ia32_entry.S --- linux-2.6.18.1/arch/ia64/ia32/ia32_entry.S 2006-06-18 04:51:55 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/ia32/ia32_entry.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/ia32/ia32_entry.S 2006-09-20 17:01:44 +0200 @@ -483,7 +483,7 @@ ia32_syscall_table: data8 sys_tgkill /* 270 */ data8 compat_sys_utimes @@ -544,9 +572,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/ia64/ia32/ia32_entry.S linux-2.6.18.1- data8 sys_ni_syscall data8 sys_ni_syscall /* 275 */ data8 sys_ni_syscall -diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/entry.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/kernel/entry.S +diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/entry.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/kernel/entry.S --- linux-2.6.18.1/arch/ia64/kernel/entry.S 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/kernel/entry.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/kernel/entry.S 2006-09-20 17:01:44 +0200 @@ -1576,7 +1576,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr @@ -556,9 +584,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/entry.S linux-2.6.18.1-vs2 data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/perfmon.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/kernel/perfmon.c +diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/perfmon.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/kernel/perfmon.c --- linux-2.6.18.1/arch/ia64/kernel/perfmon.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/kernel/perfmon.c 2006-10-18 01:19:40 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/kernel/perfmon.c 2006-10-18 01:19:40 +0200 @@ -40,6 +40,7 @@ #include <linux/capability.h> #include <linux/rcupdate.h> @@ -576,9 +604,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/perfmon.c linux-2.6.18.1-v vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, vma_pages(vma)); up_write(&task->mm->mmap_sem); -diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/kernel/ptrace.c --- linux-2.6.18.1/arch/ia64/kernel/ptrace.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/kernel/ptrace.c 2006-10-18 01:19:40 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/kernel/ptrace.c 2006-10-18 01:19:40 +0200 @@ -1442,6 +1442,9 @@ sys_ptrace (long request, pid_t pid, uns read_unlock(&tasklist_lock); if (!child) @@ -589,9 +617,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/ptrace.c linux-2.6.18.1-vs ret = -EPERM; if (pid == 1) /* no messing around with init! */ goto out_tsk; -diff -NurpP --minimal linux-2.6.18.1/arch/ia64/mm/fault.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/mm/fault.c +diff -NurpP --minimal linux-2.6.18.1/arch/ia64/mm/fault.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/mm/fault.c --- linux-2.6.18.1/arch/ia64/mm/fault.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/mm/fault.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/mm/fault.c 2006-09-20 17:01:44 +0200 @@ -10,6 +10,7 @@ #include <linux/smp_lock.h> #include <linux/interrupt.h> @@ -600,9 +628,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/ia64/mm/fault.c linux-2.6.18.1-vs2.0.2 #include <asm/pgtable.h> #include <asm/processor.h> -diff -NurpP --minimal linux-2.6.18.1/arch/ia64/sn/kernel/xpc_main.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/sn/kernel/xpc_main.c +diff -NurpP --minimal linux-2.6.18.1/arch/ia64/sn/kernel/xpc_main.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/sn/kernel/xpc_main.c --- linux-2.6.18.1/arch/ia64/sn/kernel/xpc_main.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/ia64/sn/kernel/xpc_main.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/sn/kernel/xpc_main.c 2006-09-20 17:01:44 +0200 @@ -108,6 +108,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = 0644, NULL, @@ -627,9 +655,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/ia64/sn/kernel/xpc_main.c linux-2.6.18 &sysctl_intvec, NULL, &xpc_disengage_request_min_timelimit, -diff -NurpP --minimal linux-2.6.18.1/arch/m32r/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/m32r/kernel/irq.c +diff -NurpP --minimal linux-2.6.18.1/arch/m32r/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/m32r/kernel/irq.c --- linux-2.6.18.1/arch/m32r/kernel/irq.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/m32r/kernel/irq.c 2006-10-17 02:35:27 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/m32r/kernel/irq.c 2006-10-17 02:35:27 +0200 @@ -20,6 +20,7 @@ #include <linux/interrupt.h> #include <linux/seq_file.h> @@ -655,9 +683,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/m32r/kernel/irq.c linux-2.6.18.1-vs2.0 irq_exit(); return 1; -diff -NurpP --minimal linux-2.6.18.1/arch/m32r/kernel/sys_m32r.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/m32r/kernel/sys_m32r.c +diff -NurpP --minimal linux-2.6.18.1/arch/m32r/kernel/sys_m32r.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/m32r/kernel/sys_m32r.c --- linux-2.6.18.1/arch/m32r/kernel/sys_m32r.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/m32r/kernel/sys_m32r.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/m32r/kernel/sys_m32r.c 2006-09-20 17:01:44 +0200 @@ -20,6 +20,7 @@ #include <linux/mman.h> #include <linux/file.h> @@ -675,9 +703,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/m32r/kernel/sys_m32r.c linux-2.6.18.1- up_read(&uts_sem); return err?-EFAULT:0; } -diff -NurpP --minimal linux-2.6.18.1/arch/m68k/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/m68k/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/m68k/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/m68k/Kconfig --- linux-2.6.18.1/arch/m68k/Kconfig 2006-06-18 04:51:57 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/m68k/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/m68k/Kconfig 2006-09-20 17:01:44 +0200 @@ -654,6 +654,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -687,9 +715,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/m68k/Kconfig linux-2.6.18.1-vs2.0.2.2- source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/m68k/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/m68k/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.18.1/arch/m68k/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/m68k/kernel/ptrace.c --- linux-2.6.18.1/arch/m68k/kernel/ptrace.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/m68k/kernel/ptrace.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/m68k/kernel/ptrace.c 2006-09-20 17:01:44 +0200 @@ -279,6 +279,8 @@ long arch_ptrace(struct task_struct *chi ret = ptrace_request(child, request, addr, data); break; @@ -699,9 +727,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/m68k/kernel/ptrace.c linux-2.6.18.1-vs return ret; out_eio: -diff -NurpP --minimal linux-2.6.18.1/arch/m68knommu/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/m68knommu/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/m68knommu/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/m68knommu/Kconfig --- linux-2.6.18.1/arch/m68knommu/Kconfig 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/m68knommu/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/m68knommu/Kconfig 2006-09-20 17:01:44 +0200 @@ -663,6 +663,8 @@ source "fs/Kconfig" source "arch/m68knommu/Kconfig.debug" @@ -711,9 +739,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/m68knommu/Kconfig linux-2.6.18.1-vs2.0 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/mips/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/mips/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/Kconfig --- linux-2.6.18.1/arch/mips/Kconfig 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/Kconfig 2006-09-20 17:01:44 +0200 @@ -2057,6 +2057,8 @@ source "arch/mips/oprofile/Kconfig" source "arch/mips/Kconfig.debug" @@ -723,9 +751,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/mips/Kconfig linux-2.6.18.1-vs2.0.2.2- source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/irq.c +diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/irq.c --- linux-2.6.18.1/arch/mips/kernel/irq.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/irq.c 2006-10-17 02:35:27 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/irq.c 2006-10-17 02:35:27 +0200 @@ -21,6 +21,7 @@ #include <linux/sched.h> #include <linux/seq_file.h> @@ -749,9 +777,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/irq.c linux-2.6.18.1-vs2.0 irq_exit(); -diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/linux32.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/linux32.c +diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/linux32.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/linux32.c --- linux-2.6.18.1/arch/mips/kernel/linux32.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/linux32.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/linux32.c 2006-09-20 17:01:44 +0200 @@ -35,6 +35,7 @@ #include <linux/security.h> #include <linux/compat.h> @@ -769,21 +797,22 @@ diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/linux32.c linux-2.6.18.1-v ret = -EFAULT; up_read(&uts_sem); -diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/ptrace.c --- linux-2.6.18.1/arch/mips/kernel/ptrace.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/ptrace.c 2006-09-20 17:01:44 +0200 -@@ -479,6 +479,8 @@ asmlinkage void do_syscall_trace(struct - goto out; - if (!test_thread_flag(TIF_SYSCALL_TRACE)) - goto out; -+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT)) -+ goto out_tsk; ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/ptrace.c 2006-10-29 03:01:48 +0100 +@@ -171,6 +171,9 @@ long arch_ptrace(struct task_struct *chi + { + int ret; - /* The 0x80 provides a way for the tracing parent to distinguish - between a syscall stop and SIGTRAP delivery */ -diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/scall32-o32.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/scall32-o32.S ++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT)) ++ goto out; ++ + 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.18.1/arch/mips/kernel/scall32-o32.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall32-o32.S --- linux-2.6.18.1/arch/mips/kernel/scall32-o32.S 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/scall32-o32.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall32-o32.S 2006-09-20 17:01:44 +0200 @@ -630,7 +630,7 @@ einval: li v0, -EINVAL sys sys_mq_timedreceive 5 sys sys_mq_notify 2 /* 4275 */ @@ -793,9 +822,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/scall32-o32.S linux-2.6.18 sys sys_waitid 5 sys sys_ni_syscall 0 /* available, was setaltroot */ sys sys_add_key 5 /* 4280 */ -diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/scall64-64.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/scall64-64.S +diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/scall64-64.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall64-64.S --- linux-2.6.18.1/arch/mips/kernel/scall64-64.S 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/scall64-64.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall64-64.S 2006-09-20 17:01:44 +0200 @@ -434,7 +434,7 @@ sys_call_table: PTR sys_mq_timedreceive PTR sys_mq_notify @@ -805,9 +834,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/scall64-64.S linux-2.6.18. PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/scall64-n32.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/scall64-n32.S +diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/scall64-n32.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall64-n32.S --- linux-2.6.18.1/arch/mips/kernel/scall64-n32.S 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/scall64-n32.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall64-n32.S 2006-09-20 17:01:44 +0200 @@ -360,7 +360,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify @@ -817,9 +846,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/scall64-n32.S linux-2.6.18 PTR sysn32_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/scall64-o32.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/scall64-o32.S +diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/scall64-o32.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall64-o32.S --- linux-2.6.18.1/arch/mips/kernel/scall64-o32.S 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/scall64-o32.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall64-o32.S 2006-09-20 17:01:44 +0200 @@ -482,7 +482,7 @@ sys_call_table: PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ @@ -829,9 +858,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/scall64-o32.S linux-2.6.18 PTR sys32_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/syscall.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/syscall.c +diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/syscall.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/syscall.c --- linux-2.6.18.1/arch/mips/kernel/syscall.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/syscall.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/syscall.c 2006-09-20 17:01:44 +0200 @@ -28,6 +28,7 @@ #include <linux/shm.h> #include <linux/compiler.h> @@ -878,9 +907,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/syscall.c linux-2.6.18.1-v error = __put_user(0,name->machine+__OLD_UTS_LEN); error = error ? -EFAULT : 0; -diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/sysirix.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/sysirix.c +diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/sysirix.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/sysirix.c --- linux-2.6.18.1/arch/mips/kernel/sysirix.c 2006-09-20 16:57:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/mips/kernel/sysirix.c 2006-09-20 20:02:24 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/sysirix.c 2006-09-20 20:02:24 +0200 @@ -32,6 +32,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -915,9 +944,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/sysirix.c linux-2.6.18.1-v return -EFAULT; } up_read(&uts_sem); -diff -NurpP --minimal linux-2.6.18.1/arch/parisc/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/parisc/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/parisc/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/Kconfig --- linux-2.6.18.1/arch/parisc/Kconfig 2006-09-20 16:58:00 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/parisc/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/Kconfig 2006-09-20 17:01:44 +0200 @@ -257,6 +257,8 @@ source "arch/parisc/oprofile/Kconfig" source "arch/parisc/Kconfig.debug" @@ -927,9 +956,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/parisc/Kconfig linux-2.6.18.1-vs2.0.2. source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/parisc/hpux/sys_hpux.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/parisc/hpux/sys_hpux.c +diff -NurpP --minimal linux-2.6.18.1/arch/parisc/hpux/sys_hpux.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/hpux/sys_hpux.c --- linux-2.6.18.1/arch/parisc/hpux/sys_hpux.c 2006-09-20 16:58:01 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/parisc/hpux/sys_hpux.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/hpux/sys_hpux.c 2006-09-20 17:01:44 +0200 @@ -33,6 +33,7 @@ #include <linux/utsname.h> #include <linux/vfs.h> @@ -997,9 +1026,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/parisc/hpux/sys_hpux.c linux-2.6.18.1- goto done; err = 0; done: -diff -NurpP --minimal linux-2.6.18.1/arch/parisc/kernel/sys_parisc32.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/parisc/kernel/sys_parisc32.c +diff -NurpP --minimal linux-2.6.18.1/arch/parisc/kernel/sys_parisc32.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/kernel/sys_parisc32.c --- linux-2.6.18.1/arch/parisc/kernel/sys_parisc32.c 2006-09-20 16:58:01 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/parisc/kernel/sys_parisc32.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/kernel/sys_parisc32.c 2006-09-20 17:01:44 +0200 @@ -598,6 +598,7 @@ asmlinkage int sys32_sysinfo(struct sysi do { @@ -1008,9 +1037,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/parisc/kernel/sys_parisc32.c linux-2.6 val.uptime = jiffies / HZ; val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT); -diff -NurpP --minimal linux-2.6.18.1/arch/parisc/kernel/syscall_table.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/parisc/kernel/syscall_table.S +diff -NurpP --minimal linux-2.6.18.1/arch/parisc/kernel/syscall_table.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/kernel/syscall_table.S --- linux-2.6.18.1/arch/parisc/kernel/syscall_table.S 2006-06-18 04:52:15 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/parisc/kernel/syscall_table.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/kernel/syscall_table.S 2006-09-20 17:01:44 +0200 @@ -368,7 +368,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) @@ -1020,9 +1049,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/parisc/kernel/syscall_table.S linux-2. ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/powerpc/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/Kconfig --- linux-2.6.18.1/arch/powerpc/Kconfig 2006-09-20 16:58:01 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/powerpc/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/Kconfig 2006-09-20 17:01:44 +0200 @@ -1069,6 +1069,8 @@ endmenu source "arch/powerpc/Kconfig.debug" @@ -1032,9 +1061,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/Kconfig linux-2.6.18.1-vs2.0.2 source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/powerpc/kernel/irq.c +diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/irq.c --- linux-2.6.18.1/arch/powerpc/kernel/irq.c 2006-09-20 16:58:01 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/powerpc/kernel/irq.c 2006-10-17 02:35:27 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/irq.c 2006-10-17 02:35:27 +0200 @@ -52,6 +52,7 @@ #include <linux/radix-tree.h> #include <linux/mutex.h> @@ -1075,9 +1104,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/irq.c linux-2.6.18.1-vs } #endif } -diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/process.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/powerpc/kernel/process.c +diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/process.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/process.c --- linux-2.6.18.1/arch/powerpc/kernel/process.c 2006-09-20 16:58:01 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/powerpc/kernel/process.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/process.c 2006-09-20 17:01:44 +0200 @@ -431,8 +431,9 @@ void show_regs(struct pt_regs * regs) trap = TRAP(regs); if (trap == 0x300 || trap == 0x600) @@ -1090,9 +1119,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/process.c linux-2.6.18. #ifdef CONFIG_SMP printk(" CPU: %d", smp_processor_id()); -diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/syscalls.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/powerpc/kernel/syscalls.c +diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/syscalls.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/syscalls.c --- linux-2.6.18.1/arch/powerpc/kernel/syscalls.c 2006-06-18 04:52:17 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/powerpc/kernel/syscalls.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/syscalls.c 2006-09-20 17:01:44 +0200 @@ -36,6 +36,7 @@ #include <linux/file.h> #include <linux/init.h> @@ -1152,9 +1181,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/syscalls.c linux-2.6.18 error |= override_machine(name->machine); up_read(&uts_sem); -diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/vdso.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/powerpc/kernel/vdso.c +diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/vdso.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/vdso.c --- linux-2.6.18.1/arch/powerpc/kernel/vdso.c 2006-09-20 16:58:01 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/powerpc/kernel/vdso.c 2006-09-20 19:58:24 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/vdso.c 2006-09-20 19:58:24 +0200 @@ -22,6 +22,7 @@ #include <linux/elf.h> #include <linux/security.h> @@ -1172,9 +1201,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/vdso.c linux-2.6.18.1-v up_write(&mm->mmap_sem); return 0; -diff -NurpP --minimal linux-2.6.18.1/arch/ppc/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/ppc/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/ppc/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/ppc/Kconfig --- linux-2.6.18.1/arch/ppc/Kconfig 2006-09-20 16:58:01 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/ppc/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ppc/Kconfig 2006-09-20 17:01:44 +0200 @@ -1418,6 +1418,8 @@ source "arch/powerpc/oprofile/Kconfig" source "arch/ppc/Kconfig.debug" @@ -1184,9 +1213,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/ppc/Kconfig linux-2.6.18.1-vs2.0.2.2-r source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/s390/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/s390/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/s390/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/Kconfig --- linux-2.6.18.1/arch/s390/Kconfig 2006-09-20 16:58:01 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/s390/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/Kconfig 2006-09-20 17:01:44 +0200 @@ -491,6 +491,8 @@ source "arch/s390/oprofile/Kconfig" source "arch/s390/Kconfig.debug" @@ -1196,9 +1225,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/s390/Kconfig linux-2.6.18.1-vs2.0.2.2- source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/s390/kernel/process.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/s390/kernel/process.c +diff -NurpP --minimal linux-2.6.18.1/arch/s390/kernel/process.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/kernel/process.c --- linux-2.6.18.1/arch/s390/kernel/process.c 2006-09-20 16:58:01 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/s390/kernel/process.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/kernel/process.c 2006-09-20 17:01:44 +0200 @@ -165,9 +165,9 @@ void show_regs(struct pt_regs *regs) struct task_struct *tsk = current; @@ -1212,9 +1241,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/s390/kernel/process.c linux-2.6.18.1-v show_registers(regs); /* Show stack backtrace if pt_regs is from kernel mode */ -diff -NurpP --minimal linux-2.6.18.1/arch/s390/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/s390/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.18.1/arch/s390/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/kernel/ptrace.c --- linux-2.6.18.1/arch/s390/kernel/ptrace.c 2006-06-18 04:52:33 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/s390/kernel/ptrace.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/kernel/ptrace.c 2006-09-20 17:01:44 +0200 @@ -723,7 +723,13 @@ sys_ptrace(long request, long pid, long goto out; } @@ -1229,9 +1258,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/s390/kernel/ptrace.c linux-2.6.18.1-vs put_task_struct(child); out: unlock_kernel(); -diff -NurpP --minimal linux-2.6.18.1/arch/s390/kernel/syscalls.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/s390/kernel/syscalls.S +diff -NurpP --minimal linux-2.6.18.1/arch/s390/kernel/syscalls.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/kernel/syscalls.S --- linux-2.6.18.1/arch/s390/kernel/syscalls.S 2006-06-18 04:52:33 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/s390/kernel/syscalls.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/kernel/syscalls.S 2006-09-20 17:01:44 +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) @@ -1241,9 +1270,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/s390/kernel/syscalls.S linux-2.6.18.1- SYSCALL(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.18.1/arch/sh/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/sh/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/sh/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/Kconfig --- linux-2.6.18.1/arch/sh/Kconfig 2006-09-20 16:58:01 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sh/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/Kconfig 2006-09-20 17:01:44 +0200 @@ -646,6 +646,8 @@ source "arch/sh/oprofile/Kconfig" source "arch/sh/Kconfig.debug" @@ -1253,9 +1282,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sh/Kconfig linux-2.6.18.1-vs2.0.2.2-rc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sh/kernel/irq.c +diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/irq.c --- linux-2.6.18.1/arch/sh/kernel/irq.c 2006-09-20 16:58:01 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sh/kernel/irq.c 2006-10-17 02:35:27 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/irq.c 2006-10-17 02:35:27 +0200 @@ -12,6 +12,7 @@ #include <linux/interrupt.h> #include <linux/kernel_stat.h> @@ -1282,9 +1311,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/irq.c linux-2.6.18.1-vs2.0.2 irq_exit(); return 1; } -diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/kgdb_stub.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sh/kernel/kgdb_stub.c +diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/kgdb_stub.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/kgdb_stub.c --- linux-2.6.18.1/arch/sh/kernel/kgdb_stub.c 2004-08-14 12:54:51 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sh/kernel/kgdb_stub.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/kgdb_stub.c 2006-09-20 17:01:44 +0200 @@ -412,7 +412,7 @@ static struct task_struct *get_thread(in if (pid == PID_MAX) pid = 0; @@ -1294,9 +1323,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/kgdb_stub.c linux-2.6.18.1-v if (thread) return thread; -diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/setup.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sh/kernel/setup.c +diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/setup.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/setup.c --- linux-2.6.18.1/arch/sh/kernel/setup.c 2006-09-20 16:58:01 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sh/kernel/setup.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/setup.c 2006-09-20 17:01:44 +0200 @@ -21,6 +21,7 @@ #include <linux/utsname.h> #include <linux/cpu.h> @@ -1314,9 +1343,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/setup.c linux-2.6.18.1-vs2.0 seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype()); show_cpuflags(m); -diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/sys_sh.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sh/kernel/sys_sh.c +diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/sys_sh.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/sys_sh.c --- linux-2.6.18.1/arch/sh/kernel/sys_sh.c 2005-08-29 22:24:55 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sh/kernel/sys_sh.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/sys_sh.c 2006-09-20 17:01:44 +0200 @@ -21,6 +21,7 @@ #include <linux/mman.h> #include <linux/file.h> @@ -1334,9 +1363,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/sys_sh.c linux-2.6.18.1-vs2. up_read(&uts_sem); return err?-EFAULT:0; } -diff -NurpP --minimal linux-2.6.18.1/arch/sh64/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sh64/kernel/irq.c +diff -NurpP --minimal linux-2.6.18.1/arch/sh64/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh64/kernel/irq.c --- linux-2.6.18.1/arch/sh64/kernel/irq.c 2006-09-20 16:58:01 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sh64/kernel/irq.c 2006-10-17 02:35:27 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh64/kernel/irq.c 2006-10-17 02:35:27 +0200 @@ -37,6 +37,7 @@ #include <asm/delay.h> #include <asm/irq.h> @@ -1357,9 +1386,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sh64/kernel/irq.c linux-2.6.18.1-vs2.0 } else { printk("unexpected IRQ trap at vector %03lx\n", vector_num); } -diff -NurpP --minimal linux-2.6.18.1/arch/sh64/kernel/sys_sh64.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sh64/kernel/sys_sh64.c +diff -NurpP --minimal linux-2.6.18.1/arch/sh64/kernel/sys_sh64.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh64/kernel/sys_sh64.c --- linux-2.6.18.1/arch/sh64/kernel/sys_sh64.c 2005-06-22 02:37:59 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sh64/kernel/sys_sh64.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh64/kernel/sys_sh64.c 2006-09-20 17:01:44 +0200 @@ -29,6 +29,7 @@ #include <linux/file.h> #include <linux/utsname.h> @@ -1377,9 +1406,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sh64/kernel/sys_sh64.c linux-2.6.18.1- up_read(&uts_sem); return err?-EFAULT:0; } -diff -NurpP --minimal linux-2.6.18.1/arch/sparc/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/sparc/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/Kconfig --- linux-2.6.18.1/arch/sparc/Kconfig 2006-06-18 04:52:33 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/Kconfig 2006-09-20 17:01:44 +0200 @@ -291,6 +291,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -1389,9 +1418,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sparc/Kconfig linux-2.6.18.1-vs2.0.2.2 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/ptrace.c --- linux-2.6.18.1/arch/sparc/kernel/ptrace.c 2006-04-09 13:49:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc/kernel/ptrace.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/ptrace.c 2006-09-20 17:01:44 +0200 @@ -299,6 +299,10 @@ asmlinkage void do_ptrace(struct pt_regs pt_error_return(regs, -ret); goto out; @@ -1403,9 +1432,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/ptrace.c linux-2.6.18.1-v if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH) || (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) { -diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/sys_sparc.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc/kernel/sys_sparc.c +diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/sys_sparc.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/sys_sparc.c --- linux-2.6.18.1/arch/sparc/kernel/sys_sparc.c 2006-09-20 16:58:04 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc/kernel/sys_sparc.c 2006-09-20 19:57:58 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/sys_sparc.c 2006-09-20 19:57:58 +0200 @@ -21,6 +21,7 @@ #include <linux/utsname.h> #include <linux/smp.h> @@ -1430,9 +1459,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/sys_sparc.c linux-2.6.18. err = 0; out: -diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/sys_sunos.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc/kernel/sys_sunos.c +diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/sys_sunos.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/sys_sunos.c --- linux-2.6.18.1/arch/sparc/kernel/sys_sunos.c 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc/kernel/sys_sunos.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/sys_sunos.c 2006-09-20 17:01:44 +0200 @@ -35,6 +35,7 @@ #include <linux/smp.h> #include <linux/smp_lock.h> @@ -1463,9 +1492,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/sys_sunos.c linux-2.6.18. } up_read(&uts_sem); return ret ? -EFAULT : 0; -diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/systbls.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc/kernel/systbls.S +diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/systbls.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/systbls.S --- linux-2.6.18.1/arch/sparc/kernel/systbls.S 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc/kernel/systbls.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/systbls.S 2006-09-20 17:01:44 +0200 @@ -71,7 +71,7 @@ sys_call_table: /*250*/ .long sparc_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 @@ -1475,9 +1504,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/systbls.S linux-2.6.18.1- /*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.18.1/arch/sparc64/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/Kconfig --- linux-2.6.18.1/arch/sparc64/Kconfig 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/Kconfig 2006-09-20 17:01:44 +0200 @@ -431,6 +431,8 @@ endmenu source "arch/sparc64/Kconfig.debug" @@ -1487,9 +1516,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/Kconfig linux-2.6.18.1-vs2.0.2 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/binfmt_aout32.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/kernel/binfmt_aout32.c +diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/binfmt_aout32.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/binfmt_aout32.c --- linux-2.6.18.1/arch/sparc64/kernel/binfmt_aout32.c 2006-06-18 04:52:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/kernel/binfmt_aout32.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/binfmt_aout32.c 2006-09-20 17:01:44 +0200 @@ -27,6 +27,7 @@ #include <linux/binfmts.h> #include <linux/personality.h> @@ -1498,9 +1527,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/binfmt_aout32.c linux-2 #include <asm/system.h> #include <asm/uaccess.h> -diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/ptrace.c --- linux-2.6.18.1/arch/sparc64/kernel/ptrace.c 2006-06-18 04:52:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/kernel/ptrace.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/ptrace.c 2006-09-20 17:01:44 +0200 @@ -212,6 +212,10 @@ asmlinkage void do_ptrace(struct pt_regs pt_error_return(regs, -ret); goto out; @@ -1512,9 +1541,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/ptrace.c linux-2.6.18.1 if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH) || (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) { -diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/sys_sparc.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/kernel/sys_sparc.c +diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/sys_sparc.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/sys_sparc.c --- linux-2.6.18.1/arch/sparc64/kernel/sys_sparc.c 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/kernel/sys_sparc.c 2006-09-20 19:57:05 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/sys_sparc.c 2006-09-20 19:57:05 +0200 @@ -25,6 +25,7 @@ #include <linux/ipc.h> #include <linux/personality.h> @@ -1539,9 +1568,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/sys_sparc.c linux-2.6.1 err = 0; out: -diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/sys_sunos32.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/kernel/sys_sunos32.c +diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/sys_sunos32.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/sys_sunos32.c --- linux-2.6.18.1/arch/sparc64/kernel/sys_sunos32.c 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/kernel/sys_sunos32.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/sys_sunos32.c 2006-09-20 17:01:44 +0200 @@ -35,6 +35,7 @@ #include <linux/smp.h> #include <linux/smp_lock.h> @@ -1576,9 +1605,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/sys_sunos32.c linux-2.6 sizeof(name->mach) - 1); up_read(&uts_sem); return (ret ? -EFAULT : 0); -diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/systbls.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/kernel/systbls.S +diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/systbls.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/systbls.S --- linux-2.6.18.1/arch/sparc64/kernel/systbls.S 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/kernel/systbls.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/systbls.S 2006-09-20 17:01:44 +0200 @@ -72,7 +72,7 @@ sys_call_table32: /*250*/ .word sys32_mremap, sys32_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 @@ -1597,9 +1626,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/systbls.S linux-2.6.18. /*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.18.1/arch/sparc64/solaris/fs.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/solaris/fs.c +diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/solaris/fs.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/solaris/fs.c --- linux-2.6.18.1/arch/sparc64/solaris/fs.c 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/solaris/fs.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/solaris/fs.c 2006-09-20 17:01:44 +0200 @@ -363,7 +363,7 @@ static int report_statvfs(struct vfsmoun int j = strlen (p); @@ -1618,9 +1647,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/solaris/fs.c linux-2.6.18.1-vs if (mnt->mnt_flags & MNT_NOSUID) i |= 2; if (!sysv_valid_dev(inode->i_sb->s_dev)) return -EOVERFLOW; -diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/solaris/misc.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/solaris/misc.c +diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/solaris/misc.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/solaris/misc.c --- linux-2.6.18.1/arch/sparc64/solaris/misc.c 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/sparc64/solaris/misc.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/solaris/misc.c 2006-09-20 17:01:44 +0200 @@ -16,6 +16,7 @@ #include <linux/timex.h> #include <linux/major.h> @@ -1656,9 +1685,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/solaris/misc.c linux-2.6.18.1- q < r && *p && *p != '.'; *q++ = *p++); up_read(&uts_sem); *q = 0; -diff -NurpP --minimal linux-2.6.18.1/arch/um/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/um/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/um/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/Kconfig --- linux-2.6.18.1/arch/um/Kconfig 2006-10-17 03:21:13 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/um/Kconfig 2006-10-16 18:56:10 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/Kconfig 2006-10-16 18:56:10 +0200 @@ -284,6 +284,8 @@ source "drivers/connector/Kconfig" source "fs/Kconfig" @@ -1668,9 +1697,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/um/Kconfig linux-2.6.18.1-vs2.0.2.2-rc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/um/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/um/kernel/irq.c +diff -NurpP --minimal linux-2.6.18.1/arch/um/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/kernel/irq.c --- linux-2.6.18.1/arch/um/kernel/irq.c 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/um/kernel/irq.c 2006-10-17 02:35:27 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/kernel/irq.c 2006-10-17 02:35:27 +0200 @@ -19,6 +19,7 @@ #include "linux/seq_file.h" #include "linux/profile.h" @@ -1699,9 +1728,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/um/kernel/irq.c linux-2.6.18.1-vs2.0.2 } int um_request_irq(unsigned int irq, int fd, int type, -diff -NurpP --minimal linux-2.6.18.1/arch/um/kernel/syscall.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/um/kernel/syscall.c +diff -NurpP --minimal linux-2.6.18.1/arch/um/kernel/syscall.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/kernel/syscall.c --- linux-2.6.18.1/arch/um/kernel/syscall.c 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/um/kernel/syscall.c 2006-09-21 16:41:49 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/kernel/syscall.c 2006-09-21 16:41:49 +0200 @@ -15,6 +15,8 @@ #include "linux/unistd.h" #include "linux/slab.h" @@ -1754,9 +1783,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/um/kernel/syscall.c linux-2.6.18.1-vs2 __OLD_UTS_LEN); error |= __put_user(0,name->machine+__OLD_UTS_LEN); -diff -NurpP --minimal linux-2.6.18.1/arch/um/sys-x86_64/syscalls.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/um/sys-x86_64/syscalls.c +diff -NurpP --minimal linux-2.6.18.1/arch/um/sys-x86_64/syscalls.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/sys-x86_64/syscalls.c --- linux-2.6.18.1/arch/um/sys-x86_64/syscalls.c 2006-06-18 04:52:42 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/um/sys-x86_64/syscalls.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/sys-x86_64/syscalls.c 2006-09-20 17:01:44 +0200 @@ -9,6 +9,7 @@ #include "linux/shm.h" #include "linux/utsname.h" @@ -1774,9 +1803,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/um/sys-x86_64/syscalls.c linux-2.6.18. up_read(&uts_sem); if (personality(current->personality) == PER_LINUX32) err |= copy_to_user(&name->machine, "i686", 5); -diff -NurpP --minimal linux-2.6.18.1/arch/v850/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/v850/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/v850/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/v850/Kconfig --- linux-2.6.18.1/arch/v850/Kconfig 2006-06-18 04:52:42 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/v850/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/v850/Kconfig 2006-09-20 17:01:44 +0200 @@ -326,6 +326,8 @@ source "drivers/usb/Kconfig" source "arch/v850/Kconfig.debug" @@ -1786,9 +1815,33 @@ diff -NurpP --minimal linux-2.6.18.1/arch/v850/Kconfig linux-2.6.18.1-vs2.0.2.2- source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/v850/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/v850/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.18.1/arch/v850/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/v850/kernel/irq.c +--- linux-2.6.18.1/arch/v850/kernel/irq.c 2006-09-20 16:58:06 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/v850/kernel/irq.c 2006-10-25 03:42:52 +0200 +@@ -23,6 +23,7 @@ + #include <linux/mm.h> + #include <linux/random.h> + #include <linux/seq_file.h> ++#include <linux/vs_context.h> + + #include <asm/system.h> + +@@ -100,8 +101,12 @@ int show_interrupts(struct seq_file *p, + interrupt. */ + unsigned int handle_irq (int irq, struct pt_regs *regs) + { ++ struct vx_info_save vxis; ++ + irq_enter(); ++ __enter_vx_admin(&vxis); + __do_IRQ(irq, regs); ++ __leave_vx_admin(&vxis); + irq_exit(); + return 1; + } +diff -NurpP --minimal linux-2.6.18.1/arch/v850/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/v850/kernel/ptrace.c --- linux-2.6.18.1/arch/v850/kernel/ptrace.c 2006-04-09 13:49:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/v850/kernel/ptrace.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/v850/kernel/ptrace.c 2006-09-20 17:01:44 +0200 @@ -117,6 +117,9 @@ long arch_ptrace(struct task_struct *chi { int rval; @@ -1799,9 +1852,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/v850/kernel/ptrace.c linux-2.6.18.1-vs switch (request) { unsigned long val, copied; -diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/Kconfig +diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/Kconfig --- linux-2.6.18.1/arch/x86_64/Kconfig 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/Kconfig 2006-09-20 17:01:44 +0200 @@ -654,6 +654,8 @@ endmenu source "arch/x86_64/Kconfig.debug" @@ -1811,9 +1864,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/Kconfig linux-2.6.18.1-vs2.0.2. source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/ia32_aout.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/ia32/ia32_aout.c +diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/ia32_aout.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/ia32_aout.c --- linux-2.6.18.1/arch/x86_64/ia32/ia32_aout.c 2006-01-03 17:29:20 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/ia32/ia32_aout.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/ia32_aout.c 2006-09-20 17:01:44 +0200 @@ -25,6 +25,7 @@ #include <linux/binfmts.h> #include <linux/personality.h> @@ -1822,9 +1875,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/ia32_aout.c linux-2.6.18.1 #include <asm/system.h> #include <asm/uaccess.h> -diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/ia32/ia32_binfmt.c +diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/ia32_binfmt.c --- linux-2.6.18.1/arch/x86_64/ia32/ia32_binfmt.c 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/ia32/ia32_binfmt.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/ia32_binfmt.c 2006-09-20 17:01:44 +0200 @@ -376,7 +376,8 @@ int ia32_setup_arg_pages(struct linux_bi kmem_cache_free(vm_area_cachep, mpnt); return ret; @@ -1835,9 +1888,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.18 } for (i = 0 ; i < MAX_ARG_PAGES ; i++) { -diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/ia32entry.S linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/ia32/ia32entry.S +diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/ia32entry.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/ia32entry.S --- linux-2.6.18.1/arch/x86_64/ia32/ia32entry.S 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/ia32/ia32entry.S 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/ia32entry.S 2006-09-20 17:01:44 +0200 @@ -668,7 +668,7 @@ ia32_sys_call_table: .quad sys_tgkill /* 270 */ .quad compat_sys_utimes @@ -1847,9 +1900,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/ia32entry.S linux-2.6.18.1 .quad sys_mbind .quad compat_sys_get_mempolicy /* 275 */ .quad sys_set_mempolicy -diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/sys_ia32.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/ia32/sys_ia32.c +diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/sys_ia32.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/sys_ia32.c --- linux-2.6.18.1/arch/x86_64/ia32/sys_ia32.c 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/ia32/sys_ia32.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/sys_ia32.c 2006-09-20 17:01:44 +0200 @@ -60,6 +60,7 @@ #include <linux/highuid.h> #include <linux/vmalloc.h> @@ -1894,9 +1947,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/sys_ia32.c linux-2.6.18.1- up_read(&uts_sem); if (personality(current->personality) == PER_LINUX32) err |= copy_to_user(&name->machine, "i686", 5); -diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/syscall32.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/ia32/syscall32.c +diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/syscall32.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/syscall32.c --- linux-2.6.18.1/arch/x86_64/ia32/syscall32.c 2005-10-28 20:49:18 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/ia32/syscall32.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/syscall32.c 2006-09-20 17:01:44 +0200 @@ -10,6 +10,7 @@ #include <linux/init.h> #include <linux/stringify.h> @@ -1914,9 +1967,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/syscall32.c linux-2.6.18.1 up_write(&mm->mmap_sem); return 0; } -diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/kernel/irq.c +diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/kernel/irq.c --- linux-2.6.18.1/arch/x86_64/kernel/irq.c 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/kernel/irq.c 2006-10-17 02:35:27 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/kernel/irq.c 2006-10-17 02:35:27 +0200 @@ -15,6 +15,7 @@ #include <linux/seq_file.h> #include <linux/module.h> @@ -1943,9 +1996,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/kernel/irq.c linux-2.6.18.1-vs2 irq_exit(); return 1; -diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/kernel/sys_x86_64.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/kernel/sys_x86_64.c +diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/kernel/sys_x86_64.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/kernel/sys_x86_64.c --- linux-2.6.18.1/arch/x86_64/kernel/sys_x86_64.c 2006-01-03 17:29:20 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/kernel/sys_x86_64.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/kernel/sys_x86_64.c 2006-09-20 17:01:44 +0200 @@ -16,6 +16,7 @@ #include <linux/file.h> #include <linux/utsname.h> @@ -1963,9 +2016,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/kernel/sys_x86_64.c linux-2.6.1 up_read(&uts_sem); if (personality(current->personality) == PER_LINUX32) err |= copy_to_user(&name->machine, "i686", 5); -diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/kernel/traps.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/kernel/traps.c +diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/kernel/traps.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/kernel/traps.c --- linux-2.6.18.1/arch/x86_64/kernel/traps.c 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/x86_64/kernel/traps.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/kernel/traps.c 2006-09-20 17:01:44 +0200 @@ -435,8 +435,9 @@ void show_registers(struct pt_regs *regs printk("CPU %d ", cpu); @@ -1978,9 +2031,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/kernel/traps.c linux-2.6.18.1-v /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-2.6.18.1/arch/xtensa/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/xtensa/kernel/irq.c +diff -NurpP --minimal linux-2.6.18.1/arch/xtensa/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/xtensa/kernel/irq.c --- linux-2.6.18.1/arch/xtensa/kernel/irq.c 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/xtensa/kernel/irq.c 2006-10-17 02:35:27 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/xtensa/kernel/irq.c 2006-10-17 02:35:27 +0200 @@ -18,6 +18,7 @@ #include <linux/interrupt.h> #include <linux/irq.h> @@ -2010,9 +2063,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/xtensa/kernel/irq.c linux-2.6.18.1-vs2 irq_exit(); return 1; -diff -NurpP --minimal linux-2.6.18.1/arch/xtensa/kernel/syscalls.c linux-2.6.18.1-vs2.0.2.2-rc3/arch/xtensa/kernel/syscalls.c +diff -NurpP --minimal linux-2.6.18.1/arch/xtensa/kernel/syscalls.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/xtensa/kernel/syscalls.c --- linux-2.6.18.1/arch/xtensa/kernel/syscalls.c 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/arch/xtensa/kernel/syscalls.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/xtensa/kernel/syscalls.c 2006-09-20 17:01:44 +0200 @@ -34,6 +34,7 @@ #include <linux/msg.h> #include <linux/shm.h> @@ -2030,9 +2083,9 @@ diff -NurpP --minimal linux-2.6.18.1/arch/xtensa/kernel/syscalls.c linux-2.6.18. return 0; return -EFAULT; } -diff -NurpP --minimal linux-2.6.18.1/block/cfq-iosched.c linux-2.6.18.1-vs2.0.2.2-rc3/block/cfq-iosched.c +diff -NurpP --minimal linux-2.6.18.1/block/cfq-iosched.c linux-2.6.18.1-vs2.0.2.2-rc4/block/cfq-iosched.c --- linux-2.6.18.1/block/cfq-iosched.c 2006-09-20 16:58:06 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/block/cfq-iosched.c 2006-10-17 01:20:07 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/block/cfq-iosched.c 2006-10-17 01:20:07 +0200 @@ -326,6 +326,8 @@ static int cfq_queue_empty(request_queue static inline pid_t cfq_queue_pid(struct task_struct *task, int rw) @@ -2042,9 +2095,9 @@ diff -NurpP --minimal linux-2.6.18.1/block/cfq-iosched.c linux-2.6.18.1-vs2.0.2. if (rw == READ || rw == WRITE_SYNC) return task->pid; -diff -NurpP --minimal linux-2.6.18.1/drivers/block/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/drivers/block/Kconfig +diff -NurpP --minimal linux-2.6.18.1/drivers/block/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/Kconfig --- linux-2.6.18.1/drivers/block/Kconfig 2006-09-20 16:58:07 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/drivers/block/Kconfig 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/Kconfig 2006-09-20 17:01:44 +0200 @@ -315,6 +315,13 @@ config BLK_DEV_CRYPTOLOOP instead, which can be configured to be on-disk compatible with the cryptoloop device. @@ -2059,18 +2112,18 @@ diff -NurpP --minimal linux-2.6.18.1/drivers/block/Kconfig linux-2.6.18.1-vs2.0. config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-2.6.18.1/drivers/block/Makefile linux-2.6.18.1-vs2.0.2.2-rc3/drivers/block/Makefile +diff -NurpP --minimal linux-2.6.18.1/drivers/block/Makefile linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/Makefile --- linux-2.6.18.1/drivers/block/Makefile 2006-06-18 04:52:46 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/drivers/block/Makefile 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/Makefile 2006-09-20 17:01:44 +0200 @@ -29,4 +29,5 @@ obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryp obj-$(CONFIG_VIODASD) += viodasd.o obj-$(CONFIG_BLK_DEV_SX8) += sx8.o obj-$(CONFIG_BLK_DEV_UB) += ub.o +obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o -diff -NurpP --minimal linux-2.6.18.1/drivers/block/loop.c linux-2.6.18.1-vs2.0.2.2-rc3/drivers/block/loop.c +diff -NurpP --minimal linux-2.6.18.1/drivers/block/loop.c linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/loop.c --- linux-2.6.18.1/drivers/block/loop.c 2006-09-20 16:58:07 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/drivers/block/loop.c 2006-10-17 02:40:33 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/loop.c 2006-10-17 02:40:33 +0200 @@ -72,6 +72,7 @@ #include <linux/completion.h> #include <linux/highmem.h> @@ -2097,9 +2150,9 @@ diff -NurpP --minimal linux-2.6.18.1/drivers/block/loop.c linux-2.6.18.1-vs2.0.2 if (error < 0) goto out_putf; wait_for_completion(&lo->lo_done); -diff -NurpP --minimal linux-2.6.18.1/drivers/block/vroot.c linux-2.6.18.1-vs2.0.2.2-rc3/drivers/block/vroot.c +diff -NurpP --minimal linux-2.6.18.1/drivers/block/vroot.c linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/vroot.c --- linux-2.6.18.1/drivers/block/vroot.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/drivers/block/vroot.c 2006-09-21 01:26:54 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/vroot.c 2006-09-21 01:26:54 +0200 @@ -0,0 +1,281 @@ +/* + * linux/drivers/block/vroot.c @@ -2382,9 +2435,9 @@ diff -NurpP --minimal linux-2.6.18.1/drivers/block/vroot.c linux-2.6.18.1-vs2.0. + +#endif + -diff -NurpP --minimal linux-2.6.18.1/drivers/char/random.c linux-2.6.18.1-vs2.0.2.2-rc3/drivers/char/random.c +diff -NurpP --minimal linux-2.6.18.1/drivers/char/random.c linux-2.6.18.1-vs2.0.2.2-rc4/drivers/char/random.c --- linux-2.6.18.1/drivers/char/random.c 2006-09-20 16:58:13 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/drivers/char/random.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/char/random.c 2006-09-20 17:01:44 +0200 @@ -1173,7 +1173,7 @@ static char sysctl_bootid[16]; static int proc_do_uuid(ctl_table *table, int write, struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos) @@ -2394,9 +2447,9 @@ diff -NurpP --minimal linux-2.6.18.1/drivers/char/random.c linux-2.6.18.1-vs2.0. unsigned char buf[64], tmp_uuid[16], *uuid; uuid = table->data; -diff -NurpP --minimal linux-2.6.18.1/drivers/char/tty_io.c linux-2.6.18.1-vs2.0.2.2-rc3/drivers/char/tty_io.c +diff -NurpP --minimal linux-2.6.18.1/drivers/char/tty_io.c linux-2.6.18.1-vs2.0.2.2-rc4/drivers/char/tty_io.c --- linux-2.6.18.1/drivers/char/tty_io.c 2006-09-20 16:58:13 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/drivers/char/tty_io.c 2006-09-20 19:55:41 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/char/tty_io.c 2006-09-20 19:55:41 +0200 @@ -103,6 +103,7 @@ #include <linux/selection.h> @@ -2432,9 +2485,9 @@ diff -NurpP --minimal linux-2.6.18.1/drivers/char/tty_io.c linux-2.6.18.1-vs2.0. if (pgrp < 0) return -EINVAL; if (session_of_pgrp(pgrp) != current->signal->session) -diff -NurpP --minimal linux-2.6.18.1/drivers/infiniband/core/uverbs_mem.c linux-2.6.18.1-vs2.0.2.2-rc3/drivers/infiniband/core/uverbs_mem.c +diff -NurpP --minimal linux-2.6.18.1/drivers/infiniband/core/uverbs_mem.c linux-2.6.18.1-vs2.0.2.2-rc4/drivers/infiniband/core/uverbs_mem.c --- linux-2.6.18.1/drivers/infiniband/core/uverbs_mem.c 2006-06-18 04:53:04 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/drivers/infiniband/core/uverbs_mem.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/infiniband/core/uverbs_mem.c 2006-09-20 17:01:44 +0200 @@ -36,6 +36,7 @@ #include <linux/mm.h> @@ -2472,9 +2525,9 @@ diff -NurpP --minimal linux-2.6.18.1/drivers/infiniband/core/uverbs_mem.c linux- up_write(&work->mm->mmap_sem); mmput(work->mm); kfree(work); -diff -NurpP --minimal linux-2.6.18.1/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.18.1-vs2.0.2.2-rc3/drivers/infiniband/hw/ipath/ipath_user_pages.c +diff -NurpP --minimal linux-2.6.18.1/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.18.1-vs2.0.2.2-rc4/drivers/infiniband/hw/ipath/ipath_user_pages.c --- linux-2.6.18.1/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 16:58:14 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 17:01:44 +0200 @@ -33,6 +33,7 @@ #include <linux/mm.h> @@ -2520,9 +2573,9 @@ diff -NurpP --minimal linux-2.6.18.1/drivers/infiniband/hw/ipath/ipath_user_page up_write(&work->mm->mmap_sem); mmput(work->mm); kfree(work); -diff -NurpP --minimal linux-2.6.18.1/drivers/s390/cio/cio.c linux-2.6.18.1-vs2.0.2.2-rc3/drivers/s390/cio/cio.c +diff -NurpP --minimal linux-2.6.18.1/drivers/s390/cio/cio.c linux-2.6.18.1-vs2.0.2.2-rc4/drivers/s390/cio/cio.c --- linux-2.6.18.1/drivers/s390/cio/cio.c 2006-09-20 16:58:27 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/drivers/s390/cio/cio.c 2006-10-17 01:58:48 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/s390/cio/cio.c 2006-10-17 01:58:48 +0200 @@ -639,12 +639,16 @@ do_IRQ (struct pt_regs *regs) spin_lock(&sch->lock); /* Store interrupt response block to lowcore. */ @@ -2540,9 +2593,9 @@ diff -NurpP --minimal linux-2.6.18.1/drivers/s390/cio/cio.c linux-2.6.18.1-vs2.0 } if (sch) spin_unlock(&sch->lock); -diff -NurpP --minimal linux-2.6.18.1/fs/attr.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/attr.c +diff -NurpP --minimal linux-2.6.18.1/fs/attr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/attr.c --- linux-2.6.18.1/fs/attr.c 2006-04-09 13:49:53 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/attr.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/attr.c 2006-09-20 17:01:44 +0200 @@ -15,6 +15,9 @@ #include <linux/fcntl.h> #include <linux/quotaops.h> @@ -2601,9 +2654,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/attr.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/a error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0; if (!error) error = inode_setattr(inode, attr); -diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_aout.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/binfmt_aout.c +diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_aout.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_aout.c --- linux-2.6.18.1/fs/binfmt_aout.c 2006-04-09 13:49:53 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/binfmt_aout.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_aout.c 2006-09-20 17:01:44 +0200 @@ -24,6 +24,7 @@ #include <linux/binfmts.h> #include <linux/personality.h> @@ -2612,9 +2665,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_aout.c linux-2.6.18.1-vs2.0.2.2-r #include <asm/system.h> #include <asm/uaccess.h> -diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_elf.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/binfmt_elf.c +diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_elf.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_elf.c --- linux-2.6.18.1/fs/binfmt_elf.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/binfmt_elf.c 2006-09-20 18:28:33 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_elf.c 2006-09-20 18:28:33 +0200 @@ -39,6 +39,8 @@ #include <linux/syscalls.h> #include <linux/random.h> @@ -2624,9 +2677,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_elf.c linux-2.6.18.1-vs2.0.2.2-rc #include <asm/uaccess.h> #include <asm/param.h> #include <asm/page.h> -diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_elf_fdpic.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/binfmt_elf_fdpic.c +diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_elf_fdpic.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_elf_fdpic.c --- linux-2.6.18.1/fs/binfmt_elf_fdpic.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/binfmt_elf_fdpic.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_elf_fdpic.c 2006-09-20 17:01:44 +0200 @@ -34,6 +34,7 @@ #include <linux/elf.h> #include <linux/elf-fdpic.h> @@ -2635,9 +2688,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_elf_fdpic.c linux-2.6.18.1-vs2.0. #include <asm/uaccess.h> #include <asm/param.h> -diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_flat.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/binfmt_flat.c +diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_flat.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_flat.c --- linux-2.6.18.1/fs/binfmt_flat.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/binfmt_flat.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_flat.c 2006-09-20 17:01:44 +0200 @@ -36,6 +36,7 @@ #include <linux/init.h> #include <linux/flat.h> @@ -2646,9 +2699,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_flat.c linux-2.6.18.1-vs2.0.2.2-r #include <asm/byteorder.h> #include <asm/system.h> -diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_som.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/binfmt_som.c +diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_som.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_som.c --- linux-2.6.18.1/fs/binfmt_som.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/binfmt_som.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_som.c 2006-09-20 17:01:44 +0200 @@ -28,6 +28,7 @@ #include <linux/shm.h> #include <linux/personality.h> @@ -2657,9 +2710,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_som.c linux-2.6.18.1-vs2.0.2.2-rc #include <asm/uaccess.h> #include <asm/pgtable.h> -diff -NurpP --minimal linux-2.6.18.1/fs/devpts/inode.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/devpts/inode.c +diff -NurpP --minimal linux-2.6.18.1/fs/devpts/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/devpts/inode.c --- linux-2.6.18.1/fs/devpts/inode.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/devpts/inode.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/devpts/inode.c 2006-09-20 17:01:44 +0200 @@ -20,7 +20,19 @@ #include <linux/devpts_fs.h> #include <linux/parser.h> @@ -2726,9 +2779,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/devpts/inode.c linux-2.6.18.1-vs2.0.2.2- inode->u.generic_ip = tty; dentry = get_node(number); -diff -NurpP --minimal linux-2.6.18.1/fs/exec.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/exec.c +diff -NurpP --minimal linux-2.6.18.1/fs/exec.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/exec.c --- linux-2.6.18.1/fs/exec.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/exec.c 2006-09-20 18:03:28 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/exec.c 2006-09-20 18:03:28 +0200 @@ -49,6 +49,8 @@ #include <linux/acct.h> #include <linux/cn_proc.h> @@ -2757,9 +2810,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/exec.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/e up_read(&uts_sem); if (rc > out_end - out_ptr) goto out; -diff -NurpP --minimal linux-2.6.18.1/fs/ext2/balloc.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/balloc.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext2/balloc.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/balloc.c --- linux-2.6.18.1/fs/ext2/balloc.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/balloc.c 2006-10-16 19:05:41 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/balloc.c 2006-10-16 19:05:41 +0200 @@ -16,6 +16,7 @@ #include <linux/sched.h> #include <linux/buffer_head.h> @@ -2813,9 +2866,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext2/balloc.c linux-2.6.18.1-vs2.0.2.2-r release_blocks(sb, es_alloc); out_dquot: DQUOT_FREE_BLOCK(inode, dq_alloc); -diff -NurpP --minimal linux-2.6.18.1/fs/ext2/ext2.h linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/ext2.h +diff -NurpP --minimal linux-2.6.18.1/fs/ext2/ext2.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/ext2.h --- linux-2.6.18.1/fs/ext2/ext2.h 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/ext2.h 2006-09-20 19:55:12 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/ext2.h 2006-09-20 19:55:12 +0200 @@ -165,6 +165,7 @@ extern const struct file_operations ext2 extern const struct address_space_operations ext2_aops; extern const struct address_space_operations ext2_aops_xip; @@ -2824,18 +2877,18 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext2/ext2.h linux-2.6.18.1-vs2.0.2.2-rc3 /* namei.c */ extern struct inode_operations ext2_dir_inode_operations; -diff -NurpP --minimal linux-2.6.18.1/fs/ext2/file.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/file.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext2/file.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/file.c --- linux-2.6.18.1/fs/ext2/file.c 2006-06-18 04:54:33 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/file.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/file.c 2006-09-20 17:01:44 +0200 @@ -81,4 +81,5 @@ struct inode_operations ext2_file_inode_ #endif .setattr = ext2_setattr, .permission = ext2_permission, + .sync_flags = ext2_sync_flags, }; -diff -NurpP --minimal linux-2.6.18.1/fs/ext2/ialloc.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/ialloc.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext2/ialloc.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/ialloc.c --- linux-2.6.18.1/fs/ext2/ialloc.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/ialloc.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/ialloc.c 2006-09-20 17:01:44 +0200 @@ -17,6 +17,8 @@ #include <linux/backing-dev.h> #include <linux/buffer_head.h> @@ -2891,9 +2944,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext2/ialloc.c linux-2.6.18.1-vs2.0.2.2-r make_bad_inode(inode); iput(inode); return ERR_PTR(err); -diff -NurpP --minimal linux-2.6.18.1/fs/ext2/inode.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/inode.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext2/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/inode.c --- linux-2.6.18.1/fs/ext2/inode.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/inode.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/inode.c 2006-09-20 17:01:44 +0200 @@ -31,6 +31,7 @@ #include <linux/writeback.h> #include <linux/buffer_head.h> @@ -3029,9 +3082,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext2/inode.c linux-2.6.18.1-vs2.0.2.2-rc error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0; if (error) return error; -diff -NurpP --minimal linux-2.6.18.1/fs/ext2/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/ioctl.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext2/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/ioctl.c --- linux-2.6.18.1/fs/ext2/ioctl.c 2006-04-09 13:49:53 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/ioctl.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/ioctl.c 2006-09-20 17:01:44 +0200 @@ -11,6 +11,7 @@ #include <linux/capability.h> #include <linux/time.h> @@ -3071,9 +3124,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext2/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc return -EROFS; if (get_user(inode->i_generation, (int __user *) arg)) return -EFAULT; -diff -NurpP --minimal linux-2.6.18.1/fs/ext2/namei.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/namei.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext2/namei.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/namei.c --- linux-2.6.18.1/fs/ext2/namei.c 2006-06-18 04:54:33 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/namei.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/namei.c 2006-09-20 17:01:44 +0200 @@ -31,6 +31,7 @@ */ @@ -3104,9 +3157,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext2/namei.c linux-2.6.18.1-vs2.0.2.2-rc .permission = ext2_permission, + .sync_flags = ext2_sync_flags, }; -diff -NurpP --minimal linux-2.6.18.1/fs/ext2/super.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/super.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext2/super.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/super.c --- linux-2.6.18.1/fs/ext2/super.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/super.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/super.c 2006-09-20 17:01:44 +0200 @@ -325,7 +325,7 @@ enum { Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, @@ -3159,9 +3212,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext2/super.c linux-2.6.18.1-vs2.0.2.2-rc 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.18.1/fs/ext2/symlink.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/symlink.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext2/symlink.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/symlink.c --- linux-2.6.18.1/fs/ext2/symlink.c 2005-08-29 22:25:30 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/symlink.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/symlink.c 2006-09-20 17:01:44 +0200 @@ -38,6 +38,7 @@ struct inode_operations ext2_symlink_ino .listxattr = ext2_listxattr, .removexattr = generic_removexattr, @@ -3176,9 +3229,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext2/symlink.c linux-2.6.18.1-vs2.0.2.2- #endif + .sync_flags = ext2_sync_flags, }; -diff -NurpP --minimal linux-2.6.18.1/fs/ext2/xattr.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/xattr.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext2/xattr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/xattr.c --- linux-2.6.18.1/fs/ext2/xattr.c 2006-02-18 14:40:21 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext2/xattr.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/xattr.c 2006-09-20 17:01:44 +0200 @@ -60,6 +60,7 @@ #include <linux/mbcache.h> #include <linux/quotaops.h> @@ -3216,9 +3269,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext2/xattr.c linux-2.6.18.1-vs2.0.2.2-rc DQUOT_FREE_BLOCK(inode, 1); } EXT2_I(inode)->i_file_acl = 0; -diff -NurpP --minimal linux-2.6.18.1/fs/ext3/balloc.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/balloc.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext3/balloc.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/balloc.c --- linux-2.6.18.1/fs/ext3/balloc.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/balloc.c 2006-10-16 19:06:32 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/balloc.c 2006-10-16 19:06:32 +0200 @@ -19,6 +19,7 @@ #include <linux/ext3_jbd.h> #include <linux/quotaops.h> @@ -3317,9 +3370,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext3/balloc.c linux-2.6.18.1-vs2.0.2.2-r if (fatal) { *errp = fatal; ext3_std_error(sb, fatal); -diff -NurpP --minimal linux-2.6.18.1/fs/ext3/file.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/file.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext3/file.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/file.c --- linux-2.6.18.1/fs/ext3/file.c 2006-06-18 04:54:33 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/file.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/file.c 2006-09-20 17:01:44 +0200 @@ -133,5 +133,6 @@ struct inode_operations ext3_file_inode_ .removexattr = generic_removexattr, #endif @@ -3327,9 +3380,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext3/file.c linux-2.6.18.1-vs2.0.2.2-rc3 + .sync_flags = ext3_sync_flags, }; -diff -NurpP --minimal linux-2.6.18.1/fs/ext3/ialloc.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/ialloc.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext3/ialloc.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/ialloc.c --- linux-2.6.18.1/fs/ext3/ialloc.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/ialloc.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/ialloc.c 2006-09-20 17:01:44 +0200 @@ -23,6 +23,8 @@ #include <linux/buffer_head.h> #include <linux/random.h> @@ -3387,9 +3440,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext3/ialloc.c linux-2.6.18.1-vs2.0.2.2-r inode->i_flags |= S_NOQUOTA; inode->i_nlink = 0; iput(inode); -diff -NurpP --minimal linux-2.6.18.1/fs/ext3/inode.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/inode.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext3/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/inode.c --- linux-2.6.18.1/fs/ext3/inode.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/inode.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/inode.c 2006-09-20 17:01:44 +0200 @@ -36,6 +36,7 @@ #include <linux/writeback.h> #include <linux/mpage.h> @@ -3577,9 +3630,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext3/inode.c linux-2.6.18.1-vs2.0.2.2-rc error = ext3_mark_inode_dirty(handle, inode); ext3_journal_stop(handle); } -diff -NurpP --minimal linux-2.6.18.1/fs/ext3/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/ioctl.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext3/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/ioctl.c --- linux-2.6.18.1/fs/ext3/ioctl.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/ioctl.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/ioctl.c 2006-09-20 17:01:44 +0200 @@ -8,11 +8,13 @@ */ @@ -3694,9 +3747,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext3/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc default: return -ENOTTY; -diff -NurpP --minimal linux-2.6.18.1/fs/ext3/namei.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/namei.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext3/namei.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/namei.c --- linux-2.6.18.1/fs/ext3/namei.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/namei.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/namei.c 2006-09-20 17:01:44 +0200 @@ -36,6 +36,7 @@ #include <linux/quotaops.h> #include <linux/buffer_head.h> @@ -3727,9 +3780,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext3/namei.c linux-2.6.18.1-vs2.0.2.2-rc .permission = ext3_permission, + .sync_flags = ext3_sync_flags, }; -diff -NurpP --minimal linux-2.6.18.1/fs/ext3/super.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/super.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext3/super.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/super.c --- linux-2.6.18.1/fs/ext3/super.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/super.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/super.c 2006-09-20 17:01:44 +0200 @@ -677,7 +677,7 @@ enum { Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota, @@ -3782,9 +3835,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext3/super.c linux-2.6.18.1-vs2.0.2.2-rc sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-2.6.18.1/fs/ext3/symlink.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/symlink.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext3/symlink.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/symlink.c --- linux-2.6.18.1/fs/ext3/symlink.c 2005-08-29 22:25:30 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/symlink.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/symlink.c 2006-09-20 17:01:44 +0200 @@ -40,6 +40,7 @@ struct inode_operations ext3_symlink_ino .listxattr = ext3_listxattr, .removexattr = generic_removexattr, @@ -3799,9 +3852,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext3/symlink.c linux-2.6.18.1-vs2.0.2.2- #endif + .sync_flags = ext3_sync_flags, }; -diff -NurpP --minimal linux-2.6.18.1/fs/ext3/xattr.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/xattr.c +diff -NurpP --minimal linux-2.6.18.1/fs/ext3/xattr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/xattr.c --- linux-2.6.18.1/fs/ext3/xattr.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ext3/xattr.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/xattr.c 2006-09-20 17:01:44 +0200 @@ -58,6 +58,7 @@ #include <linux/mbcache.h> #include <linux/quotaops.h> @@ -3843,9 +3896,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ext3/xattr.c linux-2.6.18.1-vs2.0.2.2-rc goto cleanup; bad_block: -diff -NurpP --minimal linux-2.6.18.1/fs/fcntl.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/fcntl.c +diff -NurpP --minimal linux-2.6.18.1/fs/fcntl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/fcntl.c --- linux-2.6.18.1/fs/fcntl.c 2006-06-18 04:54:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/fcntl.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/fcntl.c 2006-09-20 17:01:44 +0200 @@ -18,6 +18,7 @@ #include <linux/ptrace.h> #include <linux/signal.h> @@ -3899,9 +3952,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/fcntl.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ if (p) { send_sigurg_to_task(p, fown); } -diff -NurpP --minimal linux-2.6.18.1/fs/file_table.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/file_table.c +diff -NurpP --minimal linux-2.6.18.1/fs/file_table.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/file_table.c --- linux-2.6.18.1/fs/file_table.c 2006-09-20 16:58:34 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/file_table.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/file_table.c 2006-09-20 17:01:44 +0200 @@ -21,6 +21,8 @@ #include <linux/fsnotify.h> #include <linux/sysctl.h> @@ -3938,9 +3991,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/file_table.c linux-2.6.18.1-vs2.0.2.2-rc file_kill(file); file_free(file); } -diff -NurpP --minimal linux-2.6.18.1/fs/hfsplus/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/hfsplus/ioctl.c +diff -NurpP --minimal linux-2.6.18.1/fs/hfsplus/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/hfsplus/ioctl.c --- linux-2.6.18.1/fs/hfsplus/ioctl.c 2006-04-09 13:49:53 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/hfsplus/ioctl.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/hfsplus/ioctl.c 2006-09-20 17:01:44 +0200 @@ -16,6 +16,7 @@ #include <linux/fs.h> #include <linux/sched.h> @@ -3959,9 +4012,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/hfsplus/ioctl.c linux-2.6.18.1-vs2.0.2.2 return -EROFS; if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) -diff -NurpP --minimal linux-2.6.18.1/fs/inode.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/inode.c +diff -NurpP --minimal linux-2.6.18.1/fs/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/inode.c --- linux-2.6.18.1/fs/inode.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/inode.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/inode.c 2006-09-20 17:01:44 +0200 @@ -115,6 +115,9 @@ static struct inode *alloc_inode(struct struct address_space * const mapping = &inode->i_data; @@ -3981,9 +4034,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/inode.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ /** * clear_inode - clear an inode * @inode: inode to clear -diff -NurpP --minimal linux-2.6.18.1/fs/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ioctl.c +diff -NurpP --minimal linux-2.6.18.1/fs/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ioctl.c --- linux-2.6.18.1/fs/ioctl.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ioctl.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ioctl.c 2006-09-20 17:01:44 +0200 @@ -12,10 +12,19 @@ #include <linux/fs.h> #include <linux/security.h> @@ -4053,9 +4106,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ default: if (S_ISREG(filp->f_dentry->d_inode->i_mode)) error = file_ioctl(filp, cmd, arg); -diff -NurpP --minimal linux-2.6.18.1/fs/ioprio.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ioprio.c +diff -NurpP --minimal linux-2.6.18.1/fs/ioprio.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ioprio.c --- linux-2.6.18.1/fs/ioprio.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/ioprio.c 2006-10-18 01:19:40 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ioprio.c 2006-10-18 01:19:40 +0200 @@ -104,7 +104,7 @@ asmlinkage long sys_ioprio_set(int which if (!who) user = current->user; @@ -4074,9 +4127,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/ioprio.c linux-2.6.18.1-vs2.0.2.2-rc3/fs if (!user) break; -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/acl.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/acl.c +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/acl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/acl.c --- linux-2.6.18.1/fs/jfs/acl.c 2006-06-18 04:54:36 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/acl.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/acl.c 2006-09-20 17:01:44 +0200 @@ -232,7 +232,8 @@ int jfs_setattr(struct dentry *dentry, s return rc; @@ -4087,9 +4140,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/acl.c linux-2.6.18.1-vs2.0.2.2-rc3/f if (DQUOT_TRANSFER(inode, iattr)) return -EDQUOT; } -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/file.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/file.c +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/file.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/file.c --- linux-2.6.18.1/fs/jfs/file.c 2006-06-18 04:54:36 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/file.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/file.c 2006-09-20 17:01:44 +0200 @@ -98,6 +98,7 @@ struct inode_operations jfs_file_inode_o .setattr = jfs_setattr, .permission = jfs_permission, @@ -4098,9 +4151,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/file.c linux-2.6.18.1-vs2.0.2.2-rc3/ }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/inode.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/inode.c +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/inode.c --- linux-2.6.18.1/fs/jfs/inode.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/inode.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/inode.c 2006-09-20 17:01:44 +0200 @@ -22,6 +22,7 @@ #include <linux/buffer_head.h> #include <linux/pagemap.h> @@ -4117,9 +4170,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/inode.c linux-2.6.18.1-vs2.0.2.2-rc3 } clear_inode(inode); -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/ioctl.c +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/ioctl.c --- linux-2.6.18.1/fs/jfs/ioctl.c 2006-06-18 04:54:36 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/ioctl.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/ioctl.c 2006-09-20 17:01:44 +0200 @@ -10,6 +10,7 @@ #include <linux/ctype.h> #include <linux/capability.h> @@ -4149,9 +4202,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc3 if (!capable(CAP_LINUX_IMMUTABLE)) return -EPERM; } -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_dinode.h linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_dinode.h +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_dinode.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_dinode.h --- linux-2.6.18.1/fs/jfs/jfs_dinode.h 2006-06-18 04:54:36 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_dinode.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_dinode.h 2006-09-20 17:01:44 +0200 @@ -162,9 +162,12 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ #define JFS_IMMUTABLE_FL 0x02000000 /* Immutable file */ @@ -4167,9 +4220,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_dinode.h linux-2.6.18.1-vs2.0.2. /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ #define JFS_IOC_GETFLAGS _IOR('f', 1, long) -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_dtree.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_dtree.c +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_dtree.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_dtree.c --- linux-2.6.18.1/fs/jfs/jfs_dtree.c 2006-06-18 04:54:36 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_dtree.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_dtree.c 2006-09-20 17:01:44 +0200 @@ -102,6 +102,7 @@ #include <linux/fs.h> @@ -4279,9 +4332,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_dtree.c linux-2.6.18.1-vs2.0.2.2 /* Free quota allocation */ DQUOT_FREE_BLOCK(ip, xlen); -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_extent.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_extent.c +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_extent.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_extent.c --- linux-2.6.18.1/fs/jfs/jfs_extent.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_extent.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_extent.c 2006-09-20 17:01:44 +0200 @@ -18,6 +18,7 @@ #include <linux/fs.h> @@ -4342,9 +4395,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_extent.c linux-2.6.18.1-vs2.0.2. DQUOT_FREE_BLOCK(ip, nxlen); goto exit; } -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_filsys.h linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_filsys.h +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_filsys.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_filsys.h --- linux-2.6.18.1/fs/jfs/jfs_filsys.h 2005-10-28 20:49:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_filsys.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_filsys.h 2006-09-20 17:01:44 +0200 @@ -84,6 +84,7 @@ #define JFS_DIR_INDEX 0x00200000 /* Persistant index for */ /* directory entries */ @@ -4353,9 +4406,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_filsys.h linux-2.6.18.1-vs2.0.2. /* * buffer cache configuration -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_imap.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_imap.c +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_imap.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_imap.c --- linux-2.6.18.1/fs/jfs/jfs_imap.c 2006-06-18 04:54:36 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_imap.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_imap.c 2006-09-20 17:01:44 +0200 @@ -45,6 +45,7 @@ #include <linux/buffer_head.h> #include <linux/pagemap.h> @@ -4415,9 +4468,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_imap.c linux-2.6.18.1-vs2.0.2.2- /* * mode2 is only needed for storing the higher order bits. * Trust i_mode for the lower order ones -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_inode.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_inode.c +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_inode.c --- linux-2.6.18.1/fs/jfs/jfs_inode.c 2006-06-18 04:54:36 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_inode.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_inode.c 2006-09-20 17:01:44 +0200 @@ -18,6 +18,8 @@ #include <linux/fs.h> @@ -4509,9 +4562,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_inode.c linux-2.6.18.1-vs2.0.2.2 DQUOT_DROP(inode); inode->i_flags |= S_NOQUOTA; inode->i_nlink = 0; -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_inode.h linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_inode.h +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_inode.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_inode.h --- linux-2.6.18.1/fs/jfs/jfs_inode.h 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_inode.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_inode.h 2006-09-20 17:01:44 +0200 @@ -31,6 +31,7 @@ extern void jfs_truncate(struct inode *) extern void jfs_truncate_nolock(struct inode *, loff_t); extern void jfs_free_zero_link(struct inode *); @@ -4520,9 +4573,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_inode.h linux-2.6.18.1-vs2.0.2.2 extern void jfs_set_inode_flags(struct inode *); extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int); -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_xtree.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_xtree.c +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_xtree.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_xtree.c --- linux-2.6.18.1/fs/jfs/jfs_xtree.c 2006-01-03 17:29:57 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/jfs_xtree.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_xtree.c 2006-09-20 17:01:44 +0200 @@ -21,6 +21,7 @@ #include <linux/fs.h> @@ -4606,9 +4659,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_xtree.c linux-2.6.18.1-vs2.0.2.2 /* update quota allocation to reflect freed blocks */ DQUOT_FREE_BLOCK(ip, nfreed); -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/namei.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/namei.c +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/namei.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/namei.c --- linux-2.6.18.1/fs/jfs/namei.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/namei.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/namei.c 2006-09-20 17:01:44 +0200 @@ -20,6 +20,7 @@ #include <linux/fs.h> #include <linux/ctype.h> @@ -4633,9 +4686,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/namei.c linux-2.6.18.1-vs2.0.2.2-rc3 }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/super.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/super.c +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/super.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/super.c --- linux-2.6.18.1/fs/jfs/super.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/super.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/super.c 2006-09-20 17:01:44 +0200 @@ -194,7 +194,8 @@ static void jfs_put_super(struct super_b enum { Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, @@ -4690,9 +4743,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/super.c linux-2.6.18.1-vs2.0.2.2-rc3 if (newLVSize) { printk(KERN_ERR "resize option for remount only\n"); -diff -NurpP --minimal linux-2.6.18.1/fs/jfs/xattr.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/xattr.c +diff -NurpP --minimal linux-2.6.18.1/fs/jfs/xattr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/xattr.c --- linux-2.6.18.1/fs/jfs/xattr.c 2006-06-18 04:54:36 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/jfs/xattr.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/xattr.c 2006-09-20 17:01:44 +0200 @@ -23,6 +23,7 @@ #include <linux/posix_acl_xattr.h> #include <linux/quotaops.h> @@ -4770,9 +4823,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/jfs/xattr.c linux-2.6.18.1-vs2.0.2.2-rc3 inode->i_ctime = CURRENT_TIME; -diff -NurpP --minimal linux-2.6.18.1/fs/libfs.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/libfs.c +diff -NurpP --minimal linux-2.6.18.1/fs/libfs.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/libfs.c --- linux-2.6.18.1/fs/libfs.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/libfs.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/libfs.c 2006-09-20 17:01:44 +0200 @@ -124,7 +124,8 @@ static inline unsigned char dt_type(stru * both impossible due to the lock on directory. */ @@ -4819,9 +4872,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/libfs.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ EXPORT_SYMBOL(generic_read_dir); EXPORT_SYMBOL(get_sb_pseudo); EXPORT_SYMBOL(simple_commit_write); -diff -NurpP --minimal linux-2.6.18.1/fs/lockd/clntproc.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/lockd/clntproc.c +diff -NurpP --minimal linux-2.6.18.1/fs/lockd/clntproc.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/lockd/clntproc.c --- linux-2.6.18.1/fs/lockd/clntproc.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/lockd/clntproc.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/lockd/clntproc.c 2006-09-20 17:01:44 +0200 @@ -17,6 +17,7 @@ #include <linux/sunrpc/svc.h> #include <linux/lockd/lockd.h> @@ -4844,9 +4897,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/lockd/clntproc.c linux-2.6.18.1-vs2.0.2. lock->svid = fl->fl_u.nfs_fl.owner->pid; lock->fl.fl_start = fl->fl_start; lock->fl.fl_end = fl->fl_end; -diff -NurpP --minimal linux-2.6.18.1/fs/locks.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/locks.c +diff -NurpP --minimal linux-2.6.18.1/fs/locks.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/locks.c --- linux-2.6.18.1/fs/locks.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/locks.c 2006-09-20 18:02:37 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/locks.c 2006-09-20 18:02:37 +0200 @@ -125,6 +125,7 @@ #include <linux/syscalls.h> #include <linux/time.h> @@ -5005,9 +5058,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/locks.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ lock_get_status(q, fl, ++i, ""); move_lock_status(&q, &pos, offset); -diff -NurpP --minimal linux-2.6.18.1/fs/namei.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/namei.c +diff -NurpP --minimal linux-2.6.18.1/fs/namei.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/namei.c --- linux-2.6.18.1/fs/namei.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/namei.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/namei.c 2006-09-20 17:01:44 +0200 @@ -32,6 +32,9 @@ #include <linux/file.h> #include <linux/fcntl.h> @@ -5342,9 +5395,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/namei.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ new_dentry = lookup_hash(&newnd); error = PTR_ERR(new_dentry); if (IS_ERR(new_dentry)) -diff -NurpP --minimal linux-2.6.18.1/fs/namespace.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/namespace.c +diff -NurpP --minimal linux-2.6.18.1/fs/namespace.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/namespace.c --- linux-2.6.18.1/fs/namespace.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/namespace.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/namespace.c 2006-09-20 17:01:44 +0200 @@ -22,6 +22,8 @@ #include <linux/namei.h> #include <linux/security.h> @@ -5656,9 +5709,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/namespace.c linux-2.6.18.1-vs2.0.2.2-rc3 err = -EPERM; goto out; } -diff -NurpP --minimal linux-2.6.18.1/fs/nfs/dir.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfs/dir.c +diff -NurpP --minimal linux-2.6.18.1/fs/nfs/dir.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/dir.c --- linux-2.6.18.1/fs/nfs/dir.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfs/dir.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/dir.c 2006-09-20 17:01:44 +0200 @@ -28,9 +28,11 @@ #include <linux/sunrpc/clnt.h> #include <linux/nfs_fs.h> @@ -5689,9 +5742,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/nfs/dir.c linux-2.6.18.1-vs2.0.2.2-rc3/f return 0; return 1; } -diff -NurpP --minimal linux-2.6.18.1/fs/nfs/inode.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfs/inode.c +diff -NurpP --minimal linux-2.6.18.1/fs/nfs/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/inode.c --- linux-2.6.18.1/fs/nfs/inode.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfs/inode.c 2006-09-21 01:31:36 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/inode.c 2006-09-21 01:31:36 +0200 @@ -37,6 +37,7 @@ #include <linux/vfs.h> #include <linux/inet.h> @@ -5786,9 +5839,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/nfs/inode.c linux-2.6.18.1-vs2.0.2.2-rc3 if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) { /* -diff -NurpP --minimal linux-2.6.18.1/fs/nfs/nfs3xdr.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfs/nfs3xdr.c +diff -NurpP --minimal linux-2.6.18.1/fs/nfs/nfs3xdr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/nfs3xdr.c --- linux-2.6.18.1/fs/nfs/nfs3xdr.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfs/nfs3xdr.c 2006-09-20 19:47:41 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/nfs3xdr.c 2006-09-20 19:47:41 +0200 @@ -22,6 +22,7 @@ #include <linux/nfs3.h> #include <linux/nfs_fs.h> @@ -5878,9 +5931,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/nfs/nfs3xdr.c linux-2.6.18.1-vs2.0.2.2-r if (args->type == NF3CHR || args->type == NF3BLK) { *p++ = htonl(MAJOR(args->rdev)); *p++ = htonl(MINOR(args->rdev)); -diff -NurpP --minimal linux-2.6.18.1/fs/nfs/nfsroot.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfs/nfsroot.c +diff -NurpP --minimal linux-2.6.18.1/fs/nfs/nfsroot.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/nfsroot.c --- linux-2.6.18.1/fs/nfs/nfsroot.c 2006-02-18 14:40:23 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfs/nfsroot.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/nfsroot.c 2006-09-20 17:01:44 +0200 @@ -87,6 +87,7 @@ #include <linux/root_dev.h> #include <net/ipconfig.h> @@ -5927,9 +5980,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/nfs/nfsroot.c linux-2.6.18.1-vs2.0.2.2-r if (strlen(buf) + strlen(cp) > NFS_MAXPATHLEN) { printk(KERN_ERR "Root-NFS: Pathname for remote directory too long.\n"); return -1; -diff -NurpP --minimal linux-2.6.18.1/fs/nfs/super.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfs/super.c +diff -NurpP --minimal linux-2.6.18.1/fs/nfs/super.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/super.c --- linux-2.6.18.1/fs/nfs/super.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfs/super.c 2006-09-20 20:28:12 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/super.c 2006-09-20 20:28:12 +0200 @@ -40,6 +40,7 @@ #include <linux/vfs.h> #include <linux/inet.h> @@ -5969,9 +6022,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/nfs/super.c linux-2.6.18.1-vs2.0.2.2-rc3 return clnt; -diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/auth.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfsd/auth.c +diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/auth.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/auth.c --- linux-2.6.18.1/fs/nfsd/auth.c 2006-06-18 04:54:42 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfsd/auth.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/auth.c 2006-09-20 17:01:44 +0200 @@ -9,6 +9,7 @@ #include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcauth.h> @@ -6006,9 +6059,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/auth.c linux-2.6.18.1-vs2.0.2.2-rc3 cap_t(current->cap_effective) &= ~CAP_NFSD_MASK; } else { cap_t(current->cap_effective) |= (CAP_NFSD_MASK & -diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfs3xdr.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfsd/nfs3xdr.c +diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfs3xdr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfs3xdr.c --- linux-2.6.18.1/fs/nfsd/nfs3xdr.c 2006-04-09 13:49:54 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfsd/nfs3xdr.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfs3xdr.c 2006-09-20 17:01:44 +0200 @@ -21,6 +21,7 @@ #include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> @@ -6057,9 +6110,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfs3xdr.c linux-2.6.18.1-vs2.0.2.2- if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfs4recover.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfsd/nfs4recover.c +diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfs4recover.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfs4recover.c --- linux-2.6.18.1/fs/nfsd/nfs4recover.c 2006-02-18 14:40:23 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfsd/nfs4recover.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfs4recover.c 2006-09-20 17:01:44 +0200 @@ -155,7 +155,7 @@ nfsd4_create_clid_dir(struct nfs4_client dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n"); goto out_put; @@ -6087,9 +6140,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfs4recover.c linux-2.6.18.1-vs2.0. mutex_unlock(&dir->d_inode->i_mutex); return status; } -diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfs4xdr.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfsd/nfs4xdr.c +diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfs4xdr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfs4xdr.c --- linux-2.6.18.1/fs/nfsd/nfs4xdr.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfsd/nfs4xdr.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfs4xdr.c 2006-09-20 17:01:44 +0200 @@ -57,6 +57,7 @@ #include <linux/nfsd_idmap.h> #include <linux/nfs4.h> @@ -6119,9 +6172,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfs4xdr.c linux-2.6.18.1-vs2.0.2.2- if (status == nfserr_resource) goto out_resource; if (status) -diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfsxdr.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfsd/nfsxdr.c +diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfsxdr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfsxdr.c --- linux-2.6.18.1/fs/nfsd/nfsxdr.c 2006-04-09 13:49:54 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfsd/nfsxdr.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfsxdr.c 2006-09-20 17:01:44 +0200 @@ -15,6 +15,7 @@ #include <linux/nfsd/nfsd.h> #include <linux/nfsd/xdr.h> @@ -6170,9 +6223,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfsxdr.c linux-2.6.18.1-vs2.0.2.2-r if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/vfs.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfsd/vfs.c +diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/vfs.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/vfs.c --- linux-2.6.18.1/fs/nfsd/vfs.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/nfsd/vfs.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/vfs.c 2006-09-20 17:01:44 +0200 @@ -1158,13 +1158,13 @@ nfsd_create(struct svc_rqst *rqstp, stru err = vfs_create(dirp, dchild, iap->ia_mode, NULL); break; @@ -6236,9 +6289,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/vfs.c linux-2.6.18.1-vs2.0.2.2-rc3/ return nfserr_rofs; if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode)) return nfserr_perm; -diff -NurpP --minimal linux-2.6.18.1/fs/open.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/open.c +diff -NurpP --minimal linux-2.6.18.1/fs/open.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/open.c --- linux-2.6.18.1/fs/open.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/open.c 2006-09-20 21:05:31 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/open.c 2006-09-20 21:05:31 +0200 @@ -28,6 +28,9 @@ #include <linux/syscalls.h> #include <linux/rcupdate.h> @@ -6412,20 +6465,19 @@ diff -NurpP --minimal linux-2.6.18.1/fs/open.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/o } void fastcall put_unused_fd(unsigned int fd) -diff -NurpP --minimal linux-2.6.18.1/fs/proc/array.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/proc/array.c +diff -NurpP --minimal linux-2.6.18.1/fs/proc/array.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/array.c --- linux-2.6.18.1/fs/proc/array.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/proc/array.c 2006-09-20 19:47:01 +0200 -@@ -75,6 +75,9 @@ ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/array.c 2006-10-25 03:43:38 +0200 +@@ -75,6 +75,8 @@ #include <linux/cpuset.h> #include <linux/rcupdate.h> #include <linux/delayacct.h> +#include <linux/vs_context.h> +#include <linux/vs_network.h> -+#include <linux/vs_cvirt.h> #include <asm/uaccess.h> #include <asm/pgtable.h> -@@ -135,7 +138,9 @@ static const char *task_state_array[] = +@@ -135,7 +137,9 @@ static const char *task_state_array[] = "T (stopped)", /* 4 */ "T (tracing stop)", /* 8 */ "Z (zombie)", /* 16 */ @@ -6436,7 +6488,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/array.c linux-2.6.18.1-vs2.0.2.2-rc }; static inline const char * get_task_state(struct task_struct *tsk) -@@ -144,7 +149,8 @@ static inline const char * get_task_stat +@@ -144,7 +148,8 @@ static inline const char * get_task_stat TASK_INTERRUPTIBLE | TASK_UNINTERRUPTIBLE | TASK_STOPPED | @@ -6446,7 +6498,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/array.c linux-2.6.18.1-vs2.0.2.2-rc (tsk->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)); const char **p = &task_state_array[0]; -@@ -161,8 +167,13 @@ static inline char * task_state(struct t +@@ -161,8 +166,13 @@ static inline char * task_state(struct t struct group_info *group_info; int g; struct fdtable *fdt = NULL; @@ -6460,7 +6512,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/array.c linux-2.6.18.1-vs2.0.2.2-rc buffer += sprintf(buffer, "State:\t%s\n" "SleepAVG:\t%lu%%\n" -@@ -174,9 +185,8 @@ static inline char * task_state(struct t +@@ -174,9 +184,8 @@ static inline char * task_state(struct t "Gid:\t%d\t%d\t%d\t%d\n", get_task_state(p), (p->sleep_avg/1024)*100/(1020000000/1024), @@ -6472,7 +6524,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/array.c linux-2.6.18.1-vs2.0.2.2-rc p->uid, p->euid, p->suid, p->fsuid, p->gid, p->egid, p->sgid, p->fsgid); read_unlock(&tasklist_lock); -@@ -296,6 +306,12 @@ static inline char *task_cap(struct task +@@ -296,6 +305,12 @@ static inline char *task_cap(struct task int proc_pid_status(struct task_struct *task, char * buffer) { char * orig = buffer; @@ -6485,7 +6537,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/array.c linux-2.6.18.1-vs2.0.2.2-rc struct mm_struct *mm = get_task_mm(task); buffer = task_name(task, buffer); -@@ -308,6 +324,46 @@ int proc_pid_status(struct task_struct * +@@ -308,6 +323,46 @@ int proc_pid_status(struct task_struct * buffer = task_sig(task, buffer); buffer = task_cap(task, buffer); buffer = cpuset_task_status_allowed(task, buffer); @@ -6532,7 +6584,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/array.c linux-2.6.18.1-vs2.0.2.2-rc #if defined(CONFIG_S390) buffer = task_show_regs(task, buffer); #endif -@@ -322,7 +378,7 @@ static int do_task_stat(struct task_stru +@@ -322,7 +377,7 @@ static int do_task_stat(struct task_stru sigset_t sigign, sigcatch; char state; int res; @@ -6541,7 +6593,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/array.c linux-2.6.18.1-vs2.0.2.2-rc int num_threads = 0; struct mm_struct *mm; unsigned long long start_time; -@@ -386,7 +442,11 @@ static int do_task_stat(struct task_stru +@@ -386,7 +441,11 @@ static int do_task_stat(struct task_stru stime = cputime_add(stime, task->signal->stime); } } @@ -6554,7 +6606,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/array.c linux-2.6.18.1-vs2.0.2.2-rc read_unlock(&tasklist_lock); if (!whole || num_threads<2) -@@ -410,10 +470,21 @@ static int do_task_stat(struct task_stru +@@ -410,10 +469,21 @@ static int do_task_stat(struct task_stru /* convert nsec -> ticks */ start_time = nsec_to_clock_t(start_time); @@ -6577,19 +6629,20 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/array.c linux-2.6.18.1-vs2.0.2.2-rc tcomm, state, ppid, -diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/proc/base.c +diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/base.c --- linux-2.6.18.1/fs/proc/base.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/proc/base.c 2006-09-24 14:30:52 +0200 -@@ -71,6 +71,8 @@ ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/base.c 2006-10-29 04:48:56 +0100 +@@ -71,6 +71,9 @@ #include <linux/cpuset.h> #include <linux/audit.h> #include <linux/poll.h> -+#include <linux/vs_cvirt.h> ++#include <linux/vs_context.h> +#include <linux/vs_network.h> ++ #include "internal.h" /* NOTE: -@@ -133,6 +135,8 @@ enum pid_directory_inos { +@@ -133,6 +136,8 @@ enum pid_directory_inos { PROC_TGID_ATTR_KEYCREATE, PROC_TGID_ATTR_SOCKCREATE, #endif @@ -6598,7 +6651,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3 #ifdef CONFIG_AUDITSYSCALL PROC_TGID_LOGINUID, #endif -@@ -176,6 +180,8 @@ enum pid_directory_inos { +@@ -176,6 +181,8 @@ enum pid_directory_inos { PROC_TID_ATTR_KEYCREATE, PROC_TID_ATTR_SOCKCREATE, #endif @@ -6607,7 +6660,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3 #ifdef CONFIG_AUDITSYSCALL PROC_TID_LOGINUID, #endif -@@ -235,6 +241,8 @@ static struct pid_entry tgid_base_stuff[ +@@ -235,6 +242,8 @@ static struct pid_entry tgid_base_stuff[ #ifdef CONFIG_CPUSETS E(PROC_TGID_CPUSET, "cpuset", S_IFREG|S_IRUGO), #endif @@ -6616,7 +6669,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3 E(PROC_TGID_OOM_SCORE, "oom_score",S_IFREG|S_IRUGO), E(PROC_TGID_OOM_ADJUST,"oom_adj", S_IFREG|S_IRUGO|S_IWUSR), #ifdef CONFIG_AUDITSYSCALL -@@ -277,6 +285,8 @@ static struct pid_entry tid_base_stuff[] +@@ -277,6 +286,8 @@ static struct pid_entry tid_base_stuff[] #ifdef CONFIG_CPUSETS E(PROC_TID_CPUSET, "cpuset", S_IFREG|S_IRUGO), #endif @@ -6625,7 +6678,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3 E(PROC_TID_OOM_SCORE, "oom_score",S_IFREG|S_IRUGO), E(PROC_TID_OOM_ADJUST, "oom_adj", S_IFREG|S_IRUGO|S_IWUSR), #ifdef CONFIG_AUDITSYSCALL -@@ -1214,7 +1224,7 @@ static int proc_pident_readdir(struct fi +@@ -1214,7 +1225,7 @@ static int proc_pident_readdir(struct fi struct task_struct *task = get_proc_task(inode); struct pid_entry *p; ino_t ino; @@ -6634,7 +6687,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3 ret = -ENOENT; if (!task) -@@ -1246,11 +1256,20 @@ static int proc_pident_readdir(struct fi +@@ -1246,11 +1257,20 @@ static int proc_pident_readdir(struct fi goto out; } p = ents + i; @@ -6655,7 +6708,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3 p++; } } -@@ -1322,6 +1341,7 @@ static struct inode *proc_pid_make_inode +@@ -1322,6 +1342,7 @@ static struct inode *proc_pid_make_inode inode->i_uid = task->euid; inode->i_gid = task->egid; } @@ -6663,22 +6716,23 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3 security_task_to_inode(task, inode); out: -@@ -1353,7 +1373,14 @@ static int pid_revalidate(struct dentry +@@ -1353,7 +1374,15 @@ static int pid_revalidate(struct dentry { struct inode *inode = dentry->d_inode; struct task_struct *task = get_proc_task(inode); + int ret = 0; + if (task) { -+ ret = 1; -+ /* discard wrong fakeinit */ -+ if (!vx_check(vx_task_xid(task), VX_IDENT)) ++ int pid = (inode->i_ino >> 16) & 0xFFFF; ++ ++ if (!proc_pid_visible(task, pid)) + goto out_drop; + ++ ret = 1; if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || task_dumpable(task)) { inode->i_uid = task->euid; -@@ -1364,11 +1391,14 @@ static int pid_revalidate(struct dentry +@@ -1364,11 +1393,14 @@ static int pid_revalidate(struct dentry } inode->i_mode &= ~(S_ISUID | S_ISGID); security_task_to_inode(task, inode); @@ -6696,7 +6750,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3 } static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) -@@ -1642,6 +1672,9 @@ static struct file_operations proc_tgid_ +@@ -1642,6 +1674,9 @@ static struct file_operations proc_tgid_ static struct inode_operations proc_tgid_attr_inode_operations; #endif @@ -6706,48 +6760,42 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3 /* SMP-safe */ static struct dentry *proc_pident_lookup(struct inode *dir, struct dentry *dentry, -@@ -1834,17 +1867,37 @@ static struct dentry *proc_pident_lookup +@@ -1668,6 +1703,17 @@ static struct dentry *proc_pident_lookup + if (!p->name) + goto out; + ++ switch(p->type) { ++ case PROC_TID_VX_INFO: ++ case PROC_TGID_VX_INFO: ++ case PROC_TID_IP_INFO: ++ case PROC_TGID_IP_INFO: ++ if (task_vx_flags(task, VXF_INFO_HIDE, 0)) ++ goto out; ++ default: ++ break; ++ } ++ + error = ERR_PTR(-EINVAL); + inode = proc_pid_make_inode(dir->i_sb, task, p->type); + if (!inode) +@@ -1834,6 +1880,16 @@ static struct dentry *proc_pident_lookup inode->i_fop = &proc_loginuid_operations; break; #endif + case PROC_TID_VX_INFO: + case PROC_TGID_VX_INFO: -+ if (task_vx_flags(task, VXF_INFO_HIDE, 0)) -+ goto out_noent; + inode->i_fop = &proc_info_file_operations; + ei->op.proc_read = proc_pid_vx_info; + break; + case PROC_TID_IP_INFO: + case PROC_TGID_IP_INFO: -+ if (task_vx_flags(task, VXF_INFO_HIDE, 0)) -+ goto out_noent; + inode->i_fop = &proc_info_file_operations; + ei->op.proc_read = proc_pid_nx_info; + break; default: printk("procfs: impossible type (%d)",p->type); -- iput(inode); - error = ERR_PTR(-EINVAL); -- goto out; -+ goto out_put; - } - dentry->d_op = &pid_dentry_operations; - d_add(dentry, inode); - /* Close the race of the process dying before we return the dentry */ -- if (pid_revalidate(dentry, NULL)) -+ if (pid_revalidate(dentry, NULL)) { - error = NULL; -+ goto out; -+ } -+ -+out_noent: -+ error=ERR_PTR(-ENOENT); -+out_put: -+ iput(inode); - out: - put_task_struct(task); - out_no_task: -@@ -1938,14 +1991,14 @@ static int proc_self_readlink(struct den + iput(inode); +@@ -1938,14 +1994,14 @@ static int proc_self_readlink(struct den int buflen) { char tmp[PROC_NUMBUF]; @@ -6764,28 +6812,16 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3 return ERR_PTR(vfs_follow_link(nd,tmp)); } -@@ -2021,6 +2074,20 @@ out: - return; - } +@@ -2050,7 +2106,7 @@ struct dentry *proc_pid_lookup(struct in + goto out; -+#define VXF_FAKE_INIT (VXF_INFO_INIT|VXF_STATE_INIT) -+ -+static inline int proc_pid_visible(struct task_struct *task, int pid) -+{ -+ if ((pid == 1) && -+ !vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT)) -+ goto visible; -+ if (vx_check(vx_task_xid(task), VX_WATCH|VX_IDENT)) -+ goto visible; -+ return 0; -+visible: -+ return 1; -+} -+ - /* SMP-safe */ - struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd) - { -@@ -2060,7 +2127,7 @@ struct dentry *proc_pid_lookup(struct in + rcu_read_lock(); +- task = find_task_by_pid(tgid); ++ task = find_proc_task_by_pid(tgid); + if (task) + get_task_struct(task); + rcu_read_unlock(); +@@ -2060,7 +2116,7 @@ struct dentry *proc_pid_lookup(struct in inode = proc_pid_make_inode(dir->i_sb, task, PROC_TGID_INO); if (!inode) goto out_put_task; @@ -6794,7 +6830,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO; inode->i_op = &proc_tgid_base_inode_operations; inode->i_fop = &proc_tgid_base_operations; -@@ -2099,6 +2166,8 @@ static struct dentry *proc_task_lookup(s +@@ -2099,9 +2155,11 @@ static struct dentry *proc_task_lookup(s tid = name_to_int(dentry); if (tid == ~0U) goto out; @@ -6802,8 +6838,21 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3 + goto out; rcu_read_lock(); - task = find_task_by_pid(tid); -@@ -2234,7 +2303,10 @@ int proc_pid_readdir(struct file * filp, +- task = find_task_by_pid(tid); ++ task = find_proc_task_by_pid(tid); + if (task) + get_task_struct(task); + rcu_read_unlock(); +@@ -2157,7 +2215,7 @@ static struct task_struct *first_tgid(in + struct task_struct *pos; + rcu_read_lock(); + if (tgid && nr) { +- pos = find_task_by_pid(tgid); ++ pos = find_proc_task_by_pid(tgid); + if (pos && thread_group_leader(pos)) + goto found; + } +@@ -2234,7 +2292,10 @@ int proc_pid_readdir(struct file * filp, task = next_tgid(task), filp->f_pos++) { int len; ino_t ino; @@ -6815,7 +6864,16 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3 len = snprintf(buf, sizeof(buf), "%d", tgid); ino = fake_ino(tgid, PROC_TGID_INO); if (filldir(dirent, buf, len, filp->f_pos, ino, DT_DIR) < 0) { -@@ -2358,7 +2430,10 @@ static int proc_task_readdir(struct file +@@ -2268,7 +2329,7 @@ static struct task_struct *first_tid(str + rcu_read_lock(); + /* Attempt to start with the pid of a thread */ + if (tid && (nr > 0)) { +- pos = find_task_by_pid(tid); ++ pos = find_proc_task_by_pid(tid); + if (pos && (pos->group_leader == leader)) + goto found; + } +@@ -2358,7 +2419,10 @@ static int proc_task_readdir(struct file task; task = next_tid(task), pos++) { int len; @@ -6827,9 +6885,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc3 len = snprintf(buf, sizeof(buf), "%d", tid); ino = fake_ino(tid, PROC_TID_INO); if (filldir(dirent, buf, len, pos, ino, DT_DIR < 0)) { -diff -NurpP --minimal linux-2.6.18.1/fs/proc/generic.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/proc/generic.c +diff -NurpP --minimal linux-2.6.18.1/fs/proc/generic.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/generic.c --- linux-2.6.18.1/fs/proc/generic.c 2006-06-18 04:54:45 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/proc/generic.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/generic.c 2006-09-20 17:01:44 +0200 @@ -20,6 +20,7 @@ #include <linux/namei.h> #include <linux/bitops.h> @@ -6889,9 +6947,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/generic.c linux-2.6.18.1-vs2.0.2.2- } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-2.6.18.1/fs/proc/inode.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/proc/inode.c +diff -NurpP --minimal linux-2.6.18.1/fs/proc/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/inode.c --- linux-2.6.18.1/fs/proc/inode.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/proc/inode.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/inode.c 2006-09-20 17:01:44 +0200 @@ -168,6 +168,8 @@ struct inode *proc_get_inode(struct supe inode->i_uid = de->uid; inode->i_gid = de->gid; @@ -6901,19 +6959,30 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/inode.c linux-2.6.18.1-vs2.0.2.2-rc if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-2.6.18.1/fs/proc/proc_misc.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/proc/proc_misc.c ---- linux-2.6.18.1/fs/proc/proc_misc.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/proc/proc_misc.c 2006-09-20 18:36:46 +0200 -@@ -52,6 +52,8 @@ - #include <asm/div64.h> - #include "internal.h" +diff -NurpP --minimal linux-2.6.18.1/fs/proc/internal.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/internal.h +--- linux-2.6.18.1/fs/proc/internal.h 2006-09-20 16:58:35 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/internal.h 2006-10-25 03:49:22 +0200 +@@ -10,6 +10,7 @@ + */ + #include <linux/proc_fs.h> +#include <linux/vs_cvirt.h> -+ - #define LOAD_INT(x) ((x) >> FSHIFT) - #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) - /* -@@ -81,17 +83,32 @@ static int proc_calc_metrics(char *page, + + struct vmalloc_info { + unsigned long used; +@@ -57,7 +58,7 @@ static inline struct pid *proc_pid(struc + + static inline struct task_struct *get_proc_task(struct inode *inode) + { +- return get_pid_task(proc_pid(inode), PIDTYPE_PID); ++ return vx_get_proc_task(inode, proc_pid(inode)); + } + + static inline int proc_fd(struct inode *inode) +diff -NurpP --minimal linux-2.6.18.1/fs/proc/proc_misc.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/proc_misc.c +--- linux-2.6.18.1/fs/proc/proc_misc.c 2006-09-20 16:58:35 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/proc_misc.c 2006-10-25 03:50:01 +0200 +@@ -81,17 +81,32 @@ static int proc_calc_metrics(char *page, static int loadavg_read_proc(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -6951,7 +7020,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/proc_misc.c linux-2.6.18.1-vs2.0.2. return proc_calc_metrics(page, start, off, count, eof, len); } -@@ -105,6 +122,9 @@ static int uptime_read_proc(char *page, +@@ -105,6 +120,9 @@ static int uptime_read_proc(char *page, do_posix_clock_monotonic_gettime(&uptime); cputime_to_timespec(idletime, &idle); @@ -6961,7 +7030,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/proc_misc.c linux-2.6.18.1-vs2.0.2. len = sprintf(page,"%lu.%02lu %lu.%02lu\n", (unsigned long) uptime.tv_sec, (uptime.tv_nsec / (NSEC_PER_SEC / 100)), -@@ -141,7 +161,7 @@ static int meminfo_read_proc(char *page, +@@ -141,7 +159,7 @@ static int meminfo_read_proc(char *page, cached = global_page_state(NR_FILE_PAGES) - total_swapcache_pages - i.bufferram; @@ -6970,7 +7039,7 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/proc_misc.c linux-2.6.18.1-vs2.0.2. cached = 0; get_vmalloc_info(&vmi); -@@ -242,8 +262,9 @@ static int version_read_proc(char *page, +@@ -242,8 +260,9 @@ static int version_read_proc(char *page, { int len; @@ -6982,9 +7051,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/proc_misc.c linux-2.6.18.1-vs2.0.2. return proc_calc_metrics(page, start, off, count, eof, len); } -diff -NurpP --minimal linux-2.6.18.1/fs/proc/root.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/proc/root.c +diff -NurpP --minimal linux-2.6.18.1/fs/proc/root.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/root.c --- linux-2.6.18.1/fs/proc/root.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/proc/root.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/root.c 2006-09-20 17:01:44 +0200 @@ -24,6 +24,9 @@ struct proc_dir_entry *proc_net, *proc_n #ifdef CONFIG_SYSCTL struct proc_dir_entry *proc_sys_root; @@ -7003,9 +7072,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/proc/root.c linux-2.6.18.1-vs2.0.2.2-rc3 } static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat -diff -NurpP --minimal linux-2.6.18.1/fs/quota.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/quota.c +diff -NurpP --minimal linux-2.6.18.1/fs/quota.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/quota.c --- linux-2.6.18.1/fs/quota.c 2006-06-18 04:54:47 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/quota.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/quota.c 2006-09-20 17:01:44 +0200 @@ -17,6 +17,9 @@ #include <linux/buffer_head.h> #include <linux/capability.h> @@ -7111,9 +7180,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/quota.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ sb = get_super(bdev); bdput(bdev); if (!sb) -diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/bitmap.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/bitmap.c +diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/bitmap.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/bitmap.c --- linux-2.6.18.1/fs/reiserfs/bitmap.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/bitmap.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/bitmap.c 2006-09-20 17:01:44 +0200 @@ -12,6 +12,7 @@ #include <linux/reiserfs_fs_sb.h> #include <linux/reiserfs_fs_i.h> @@ -7206,18 +7275,18 @@ diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/bitmap.c linux-2.6.18.1-vs2.0.2 } return CARRY_ON; -diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/file.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/file.c +diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/file.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/file.c --- linux-2.6.18.1/fs/reiserfs/file.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/file.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/file.c 2006-09-20 17:01:44 +0200 @@ -1586,4 +1586,5 @@ struct inode_operations reiserfs_file_in .listxattr = reiserfs_listxattr, .removexattr = reiserfs_removexattr, .permission = reiserfs_permission, + .sync_flags = reiserfs_sync_flags, }; -diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/inode.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/inode.c +diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/inode.c --- linux-2.6.18.1/fs/reiserfs/inode.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/inode.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/inode.c 2006-09-20 17:01:44 +0200 @@ -16,6 +16,8 @@ #include <linux/mpage.h> #include <linux/writeback.h> @@ -7401,9 +7470,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/inode.c linux-2.6.18.1-vs2.0.2. mark_inode_dirty(inode); error = journal_end(&th, inode->i_sb, jbegin_count); -diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/ioctl.c +diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/ioctl.c --- linux-2.6.18.1/fs/reiserfs/ioctl.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/ioctl.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/ioctl.c 2006-09-20 17:01:44 +0200 @@ -4,6 +4,7 @@ #include <linux/capability.h> @@ -7474,9 +7543,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/ioctl.c linux-2.6.18.1-vs2.0.2. return -EROFS; if (get_user(inode->i_generation, (int __user *)arg)) return -EFAULT; -diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/namei.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/namei.c +diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/namei.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/namei.c --- linux-2.6.18.1/fs/reiserfs/namei.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/namei.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/namei.c 2006-09-20 17:01:44 +0200 @@ -18,6 +18,7 @@ #include <linux/reiserfs_xattr.h> #include <linux/smp_lock.h> @@ -7524,9 +7593,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/namei.c linux-2.6.18.1-vs2.0.2. + .sync_flags = reiserfs_sync_flags, }; -diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/stree.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/stree.c +diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/stree.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/stree.c --- linux-2.6.18.1/fs/reiserfs/stree.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/stree.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/stree.c 2006-09-20 17:01:44 +0200 @@ -56,6 +56,7 @@ #include <linux/smp_lock.h> #include <linux/buffer_head.h> @@ -7602,9 +7671,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/stree.c linux-2.6.18.1-vs2.0.2. + } return retval; } -diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/super.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/super.c +diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/super.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/super.c --- linux-2.6.18.1/fs/reiserfs/super.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/super.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/super.c 2006-09-20 17:01:44 +0200 @@ -882,6 +882,9 @@ static int reiserfs_parse_options(struct {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT}, {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT}, @@ -7639,9 +7708,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/super.c linux-2.6.18.1-vs2.0.2. 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.18.1/fs/reiserfs/xattr.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/xattr.c +diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/xattr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/xattr.c --- linux-2.6.18.1/fs/reiserfs/xattr.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/reiserfs/xattr.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/xattr.c 2006-09-20 17:01:44 +0200 @@ -35,6 +35,7 @@ #include <linux/namei.h> #include <linux/errno.h> @@ -7659,9 +7728,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/xattr.c linux-2.6.18.1-vs2.0.2. reiserfs_write_unlock_xattrs(inode->i_sb); dput(root); } else { -diff -NurpP --minimal linux-2.6.18.1/fs/stat.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/stat.c +diff -NurpP --minimal linux-2.6.18.1/fs/stat.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/stat.c --- linux-2.6.18.1/fs/stat.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/stat.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/stat.c 2006-09-20 17:01:44 +0200 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -7670,9 +7739,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/stat.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/s stat->rdev = inode->i_rdev; stat->atime = inode->i_atime; stat->mtime = inode->i_mtime; -diff -NurpP --minimal linux-2.6.18.1/fs/super.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/super.c +diff -NurpP --minimal linux-2.6.18.1/fs/super.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/super.c --- linux-2.6.18.1/fs/super.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/super.c 2006-09-20 17:59:47 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/super.c 2006-09-20 17:59:47 +0200 @@ -37,6 +37,8 @@ #include <linux/idr.h> #include <linux/kobject.h> @@ -7724,9 +7793,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/super.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ put_filesystem(type); return mnt; } -diff -NurpP --minimal linux-2.6.18.1/fs/sysfs/mount.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/sysfs/mount.c +diff -NurpP --minimal linux-2.6.18.1/fs/sysfs/mount.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/sysfs/mount.c --- linux-2.6.18.1/fs/sysfs/mount.c 2006-09-20 16:58:35 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/sysfs/mount.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/sysfs/mount.c 2006-09-20 17:01:44 +0200 @@ -11,8 +11,6 @@ #include "sysfs.h" @@ -7745,9 +7814,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/sysfs/mount.c linux-2.6.18.1-vs2.0.2.2-r sb->s_op = &sysfs_ops; sb->s_time_gran = 1; sysfs_sb = sb; -diff -NurpP --minimal linux-2.6.18.1/fs/xattr.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/xattr.c +diff -NurpP --minimal linux-2.6.18.1/fs/xattr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xattr.c --- linux-2.6.18.1/fs/xattr.c 2006-09-20 16:58:37 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xattr.c 2006-09-20 21:08:52 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xattr.c 2006-09-20 21:08:52 +0200 @@ -18,6 +18,7 @@ #include <linux/module.h> #include <linux/fsnotify.h> @@ -7848,9 +7917,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xattr.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/ fput(f); return error; } -diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/linux-2.6/xfs_ioctl.c +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_ioctl.c --- linux-2.6.18.1/fs/xfs/linux-2.6/xfs_ioctl.c 2006-09-20 16:58:39 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/linux-2.6/xfs_ioctl.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_ioctl.c 2006-09-20 17:01:44 +0200 @@ -1095,6 +1095,8 @@ xfs_ioc_fsgeometry( #define LINUX_XFLAG_APPEND 0x00000020 /* writes to file may only append */ #define LINUX_XFLAG_NODUMP 0x00000040 /* do not dump file */ @@ -7871,9 +7940,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.18.1 if (di_flags & XFS_DIFLAG_APPEND) flags |= LINUX_XFLAG_APPEND; if (di_flags & XFS_DIFLAG_SYNC) -diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/linux-2.6/xfs_iops.c +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_iops.c --- linux-2.6.18.1/fs/xfs/linux-2.6/xfs_iops.c 2006-09-20 16:58:39 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/linux-2.6/xfs_iops.c 2006-09-21 16:42:52 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_iops.c 2006-09-21 16:42:52 +0200 @@ -53,6 +53,7 @@ #include <linux/xattr.h> #include <linux/namei.h> @@ -7977,9 +8046,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.18.1- .removexattr = xfs_vn_removexattr, + .sync_flags = xfs_vn_sync_flags, }; -diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/linux-2.6/xfs_linux.h +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_linux.h --- linux-2.6.18.1/fs/xfs/linux-2.6/xfs_linux.h 2006-09-20 16:58:39 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/linux-2.6/xfs_linux.h 2006-09-20 18:35:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_linux.h 2006-09-20 18:35:45 +0200 @@ -139,6 +139,7 @@ BUFFER_FNS(PrivateStart, unwritten); #define current_pid() (current->pid) #define current_fsuid(cred) (current->fsuid) @@ -7988,9 +8057,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.18.1 #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.18.1/fs/xfs/linux-2.6/xfs_super.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/linux-2.6/xfs_super.c +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_super.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_super.c --- linux-2.6.18.1/fs/xfs/linux-2.6/xfs_super.c 2006-09-20 16:58:39 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/linux-2.6/xfs_super.c 2006-09-20 18:34:48 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_super.c 2006-09-20 18:34:48 +0200 @@ -158,6 +158,7 @@ xfs_revalidate_inode( inode->i_nlink = ip->i_d.di_nlink; inode->i_uid = ip->i_d.di_uid; @@ -8027,9 +8096,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_super.c linux-2.6.18.1 if (!error) error = bhv_vfs_mntupdate(vfsp, flags, args); kmem_free(args, sizeof(*args)); -diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_sysctl.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/linux-2.6/xfs_sysctl.c +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_sysctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_sysctl.c --- linux-2.6.18.1/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 16:58:39 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 18:32:51 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 18:32:51 +0200 @@ -57,79 +57,79 @@ xfs_stats_clear_proc_handler( STATIC ctl_table xfs_table[] = { {XFS_RESTRICT_CHOWN, "restrict_chown", &xfs_params.restrict_chown.val, @@ -8125,9 +8194,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_sysctl.c linux-2.6.18. &xfs_params.stats_clear.min, &xfs_params.stats_clear.max}, #endif /* CONFIG_PROC_FS */ -diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_vnode.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/linux-2.6/xfs_vnode.c +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_vnode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_vnode.c --- linux-2.6.18.1/fs/xfs/linux-2.6/xfs_vnode.c 2006-09-20 16:58:40 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/linux-2.6/xfs_vnode.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_vnode.c 2006-09-20 17:01:44 +0200 @@ -119,6 +119,7 @@ vn_revalidate_core( inode->i_nlink = vap->va_nlink; inode->i_uid = vap->va_uid; @@ -8151,9 +8220,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_vnode.c linux-2.6.18.1 if (vap->va_xflags & XFS_XFLAG_APPEND) inode->i_flags |= S_APPEND; else -diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_vnode.h linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/linux-2.6/xfs_vnode.h +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_vnode.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_vnode.h --- linux-2.6.18.1/fs/xfs/linux-2.6/xfs_vnode.h 2006-09-20 16:58:40 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/linux-2.6/xfs_vnode.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_vnode.h 2006-09-20 17:01:44 +0200 @@ -352,6 +352,7 @@ typedef struct bhv_vattr { xfs_nlink_t va_nlink; /* number of references to file */ uid_t va_uid; /* owner user id */ @@ -8179,9 +8248,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_vnode.h linux-2.6.18.1 #define XFS_AT_STAT (XFS_AT_TYPE|XFS_AT_MODE|XFS_AT_UID|XFS_AT_GID|\ XFS_AT_FSID|XFS_AT_NODEID|XFS_AT_NLINK|XFS_AT_SIZE|\ -diff -NurpP --minimal linux-2.6.18.1/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/quota/xfs_qm_syscalls.c +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/quota/xfs_qm_syscalls.c --- linux-2.6.18.1/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 16:58:40 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 17:01:44 +0200 @@ -213,7 +213,7 @@ xfs_qm_scall_quotaoff( xfs_qoff_logitem_t *qoffstart; int nculprits; @@ -8218,9 +8287,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.18 return XFS_ERROR(EPERM); if ((newlim->d_fieldmask & -diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_clnt.h linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_clnt.h +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_clnt.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_clnt.h --- linux-2.6.18.1/fs/xfs/xfs_clnt.h 2006-06-18 04:54:50 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_clnt.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_clnt.h 2006-09-20 17:01:44 +0200 @@ -99,5 +99,7 @@ struct xfs_mount_args { */ #define XFSMNT2_COMPAT_IOSIZE 0x00000001 /* don't report large preferred @@ -8229,9 +8298,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_clnt.h linux-2.6.18.1-vs2.0.2.2- + #endif /* __XFS_CLNT_H__ */ -diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_dinode.h linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_dinode.h +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_dinode.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_dinode.h --- linux-2.6.18.1/fs/xfs/xfs_dinode.h 2006-09-20 16:58:40 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_dinode.h 2006-09-20 18:30:41 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_dinode.h 2006-09-20 18:30:41 +0200 @@ -53,7 +53,8 @@ typedef struct xfs_dinode_core __uint32_t di_gid; /* owner's group id */ __uint32_t di_nlink; /* number of links to file */ @@ -8269,9 +8338,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_dinode.h linux-2.6.18.1-vs2.0.2. + XFS_DIFLAG_IUNLINK) #endif /* __XFS_DINODE_H__ */ -diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_fs.h linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_fs.h +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_fs.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_fs.h --- linux-2.6.18.1/fs/xfs/xfs_fs.h 2006-09-20 16:58:40 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_fs.h 2006-09-20 18:29:07 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_fs.h 2006-09-20 18:29:07 +0200 @@ -68,6 +68,8 @@ struct fsxattr { #define XFS_XFLAG_EXTSIZE 0x00000800 /* extent size allocator hint */ #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */ @@ -8291,9 +8360,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_fs.h linux-2.6.18.1-vs2.0.2.2-rc __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.18.1/fs/xfs/xfs_inode.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_inode.c +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_inode.c --- linux-2.6.18.1/fs/xfs/xfs_inode.c 2006-09-20 16:58:40 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_inode.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_inode.c 2006-09-20 17:01:44 +0200 @@ -50,6 +50,7 @@ #include "xfs_mac.h" #include "xfs_acl.h" @@ -8359,9 +8428,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_inode.c linux-2.6.18.1-vs2.0.2.2 ip->i_d.di_projid = prid; memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); -diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_itable.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_itable.c +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_itable.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_itable.c --- linux-2.6.18.1/fs/xfs/xfs_itable.c 2006-09-20 16:58:40 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_itable.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_itable.c 2006-09-20 17:01:44 +0200 @@ -78,6 +78,7 @@ xfs_bulkstat_one_iget( buf->bs_mode = dic->di_mode; buf->bs_uid = dic->di_uid; @@ -8378,9 +8447,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_itable.c linux-2.6.18.1-vs2.0.2. buf->bs_size = INT_GET(dic->di_size, ARCH_CONVERT); buf->bs_atime.tv_sec = INT_GET(dic->di_atime.t_sec, ARCH_CONVERT); buf->bs_atime.tv_nsec = INT_GET(dic->di_atime.t_nsec, ARCH_CONVERT); -diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_mount.h linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_mount.h +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_mount.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_mount.h --- linux-2.6.18.1/fs/xfs/xfs_mount.h 2006-09-20 16:58:40 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_mount.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_mount.h 2006-09-20 17:01:44 +0200 @@ -460,6 +460,7 @@ typedef struct xfs_mount { #define XFS_MOUNT_NO_PERCPU_SB (1ULL << 23) /* don't use per-cpu superblock counters */ @@ -8389,9 +8458,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_mount.h linux-2.6.18.1-vs2.0.2.2 /* * Default minimum read and write sizes. -diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_vfsops.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_vfsops.c +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_vfsops.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_vfsops.c --- linux-2.6.18.1/fs/xfs/xfs_vfsops.c 2006-09-20 16:58:40 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_vfsops.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_vfsops.c 2006-09-20 17:01:44 +0200 @@ -300,6 +300,8 @@ xfs_start_flags( if (ap->flags2 & XFSMNT2_COMPAT_IOSIZE) @@ -8429,9 +8498,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_vfsops.c linux-2.6.18.1-vs2.0.2. } else if (!strcmp(this_char, "osyncisdsync")) { /* no-op, this is now the default */ cmn_err(CE_WARN, -diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_vnodeops.c linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_vnodeops.c +diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_vnodeops.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_vnodeops.c --- linux-2.6.18.1/fs/xfs/xfs_vnodeops.c 2006-09-20 16:58:40 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/fs/xfs/xfs_vnodeops.c 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_vnodeops.c 2006-09-20 17:01:44 +0200 @@ -160,6 +160,7 @@ xfs_getattr( vap->va_mode = ip->i_d.di_mode; vap->va_uid = ip->i_d.di_uid; @@ -8530,9 +8599,9 @@ diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_vnodeops.c linux-2.6.18.1-vs2.0. if (vap->va_xflags & XFS_XFLAG_APPEND) di_flags |= XFS_DIFLAG_APPEND; if (vap->va_xflags & XFS_XFLAG_SYNC) -diff -NurpP --minimal linux-2.6.18.1/include/asm-arm/tlb.h linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-arm/tlb.h +diff -NurpP --minimal linux-2.6.18.1/include/asm-arm/tlb.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-arm/tlb.h --- linux-2.6.18.1/include/asm-arm/tlb.h 2006-06-18 04:54:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-arm/tlb.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-arm/tlb.h 2006-09-20 17:01:44 +0200 @@ -28,6 +28,7 @@ #else /* !CONFIG_MMU */ @@ -8541,9 +8610,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/asm-arm/tlb.h linux-2.6.18.1-vs2.0. /* * TLB handling. This allows us to remove pages from the page -diff -NurpP --minimal linux-2.6.18.1/include/asm-arm26/tlb.h linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-arm26/tlb.h +diff -NurpP --minimal linux-2.6.18.1/include/asm-arm26/tlb.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-arm26/tlb.h --- linux-2.6.18.1/include/asm-arm26/tlb.h 2006-01-03 17:30:02 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-arm26/tlb.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-arm26/tlb.h 2006-09-20 17:01:44 +0200 @@ -3,6 +3,7 @@ #include <asm/pgalloc.h> @@ -8552,9 +8621,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/asm-arm26/tlb.h linux-2.6.18.1-vs2. /* * TLB handling. This allows us to remove pages from the page -diff -NurpP --minimal linux-2.6.18.1/include/asm-arm26/unistd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-arm26/unistd.h +diff -NurpP --minimal linux-2.6.18.1/include/asm-arm26/unistd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-arm26/unistd.h --- linux-2.6.18.1/include/asm-arm26/unistd.h 2006-09-20 16:58:40 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-arm26/unistd.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-arm26/unistd.h 2006-09-20 17:01:44 +0200 @@ -302,6 +302,8 @@ #define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279) #define __NR_waitid (__NR_SYSCALL_BASE+280) @@ -8564,9 +8633,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/asm-arm26/unistd.h linux-2.6.18.1-v /* * The following SWIs are ARM private. FIXME - make appropriate for arm26 */ -diff -NurpP --minimal linux-2.6.18.1/include/asm-generic/tlb.h linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-generic/tlb.h +diff -NurpP --minimal linux-2.6.18.1/include/asm-generic/tlb.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-generic/tlb.h --- linux-2.6.18.1/include/asm-generic/tlb.h 2006-09-20 16:58:40 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-generic/tlb.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-generic/tlb.h 2006-09-20 17:01:44 +0200 @@ -14,6 +14,7 @@ #define _ASM_GENERIC__TLB_H @@ -8575,9 +8644,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/asm-generic/tlb.h linux-2.6.18.1-vs #include <asm/pgalloc.h> #include <asm/tlbflush.h> -diff -NurpP --minimal linux-2.6.18.1/include/asm-i386/elf.h linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-i386/elf.h +diff -NurpP --minimal linux-2.6.18.1/include/asm-i386/elf.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-i386/elf.h --- linux-2.6.18.1/include/asm-i386/elf.h 2006-09-20 16:58:40 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-i386/elf.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-i386/elf.h 2006-09-20 17:01:44 +0200 @@ -112,7 +112,7 @@ typedef struct user_fxsr_struct elf_fpxr For the moment, we have only optimizations for the Intel generations, but that could change... */ @@ -8587,9 +8656,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/asm-i386/elf.h linux-2.6.18.1-vs2.0 #define SET_PERSONALITY(ex, ibcs2) do { } while (0) -diff -NurpP --minimal linux-2.6.18.1/include/asm-ia64/tlb.h linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-ia64/tlb.h +diff -NurpP --minimal linux-2.6.18.1/include/asm-ia64/tlb.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-ia64/tlb.h --- linux-2.6.18.1/include/asm-ia64/tlb.h 2006-09-20 16:58:40 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-ia64/tlb.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-ia64/tlb.h 2006-09-20 17:01:44 +0200 @@ -40,6 +40,7 @@ #include <linux/mm.h> #include <linux/pagemap.h> @@ -8598,9 +8667,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/asm-ia64/tlb.h linux-2.6.18.1-vs2.0 #include <asm/pgalloc.h> #include <asm/processor.h> -diff -NurpP --minimal linux-2.6.18.1/include/asm-mips/irq.h linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-mips/irq.h +diff -NurpP --minimal linux-2.6.18.1/include/asm-mips/irq.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-mips/irq.h --- linux-2.6.18.1/include/asm-mips/irq.h 2006-09-20 16:58:41 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-mips/irq.h 2006-10-17 01:58:48 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-mips/irq.h 2006-10-17 01:58:48 +0200 @@ -57,9 +57,13 @@ do { \ */ #define do_IRQ(irq, regs) \ @@ -8615,9 +8684,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/asm-mips/irq.h linux-2.6.18.1-vs2.0 irq_exit(); \ } while (0) -diff -NurpP --minimal linux-2.6.18.1/include/asm-powerpc/systbl.h linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-powerpc/systbl.h +diff -NurpP --minimal linux-2.6.18.1/include/asm-powerpc/systbl.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-powerpc/systbl.h --- linux-2.6.18.1/include/asm-powerpc/systbl.h 2006-09-20 16:58:41 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-powerpc/systbl.h 2006-09-20 20:01:36 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-powerpc/systbl.h 2006-09-20 20:01:36 +0200 @@ -260,7 +260,7 @@ COMPAT_SYS_SPU(fstatfs64) SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64) PPC_SYS_SPU(rtas) @@ -8627,9 +8696,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/asm-powerpc/systbl.h linux-2.6.18.1 SYSCALL(ni_syscall) COMPAT_SYS(mbind) COMPAT_SYS(get_mempolicy) -diff -NurpP --minimal linux-2.6.18.1/include/asm-powerpc/unistd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-powerpc/unistd.h +diff -NurpP --minimal linux-2.6.18.1/include/asm-powerpc/unistd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-powerpc/unistd.h --- linux-2.6.18.1/include/asm-powerpc/unistd.h 2006-09-20 16:58:41 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-powerpc/unistd.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-powerpc/unistd.h 2006-09-20 17:01:44 +0200 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -8639,9 +8708,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/asm-powerpc/unistd.h linux-2.6.18.1 /* 258 currently unused */ #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-2.6.18.1/include/asm-s390/unistd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-s390/unistd.h +diff -NurpP --minimal linux-2.6.18.1/include/asm-s390/unistd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-s390/unistd.h --- linux-2.6.18.1/include/asm-s390/unistd.h 2006-09-20 16:58:43 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-s390/unistd.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-s390/unistd.h 2006-09-20 17:01:44 +0200 @@ -255,7 +255,7 @@ #define __NR_clock_gettime (__NR_timer_create+6) #define __NR_clock_getres (__NR_timer_create+7) @@ -8651,9 +8720,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/asm-s390/unistd.h linux-2.6.18.1-vs #define __NR_fadvise64_64 264 #define __NR_statfs64 265 #define __NR_fstatfs64 266 -diff -NurpP --minimal linux-2.6.18.1/include/asm-sparc/unistd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-sparc/unistd.h +diff -NurpP --minimal linux-2.6.18.1/include/asm-sparc/unistd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-sparc/unistd.h --- linux-2.6.18.1/include/asm-sparc/unistd.h 2006-09-20 16:58:43 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-sparc/unistd.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-sparc/unistd.h 2006-09-20 17:01:44 +0200 @@ -283,7 +283,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -8663,9 +8732,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/asm-sparc/unistd.h linux-2.6.18.1-v #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-2.6.18.1/include/asm-sparc64/tlb.h linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-sparc64/tlb.h +diff -NurpP --minimal linux-2.6.18.1/include/asm-sparc64/tlb.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-sparc64/tlb.h --- linux-2.6.18.1/include/asm-sparc64/tlb.h 2006-09-20 16:58:43 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-sparc64/tlb.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-sparc64/tlb.h 2006-09-20 17:01:44 +0200 @@ -2,6 +2,7 @@ #define _SPARC64_TLB_H @@ -8674,9 +8743,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/asm-sparc64/tlb.h linux-2.6.18.1-vs #include <asm/pgalloc.h> #include <asm/tlbflush.h> #include <asm/mmu_context.h> -diff -NurpP --minimal linux-2.6.18.1/include/asm-sparc64/unistd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-sparc64/unistd.h +diff -NurpP --minimal linux-2.6.18.1/include/asm-sparc64/unistd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-sparc64/unistd.h --- linux-2.6.18.1/include/asm-sparc64/unistd.h 2006-09-20 16:58:43 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-sparc64/unistd.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-sparc64/unistd.h 2006-09-20 17:01:44 +0200 @@ -285,7 +285,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -8686,9 +8755,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/asm-sparc64/unistd.h linux-2.6.18.1 #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-2.6.18.1/include/asm-x86_64/unistd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-x86_64/unistd.h +diff -NurpP --minimal linux-2.6.18.1/include/asm-x86_64/unistd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-x86_64/unistd.h --- linux-2.6.18.1/include/asm-x86_64/unistd.h 2006-09-20 16:58:43 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/asm-x86_64/unistd.h 2006-09-20 17:01:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-x86_64/unistd.h 2006-09-20 17:01:44 +0200 @@ -532,7 +532,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill) #define __NR_utimes 235 __SYSCALL(__NR_utimes, sys_utimes) @@ -8698,9 +8767,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/asm-x86_64/unistd.h linux-2.6.18.1- #define __NR_mbind 237 __SYSCALL(__NR_mbind, sys_mbind) #define __NR_set_mempolicy 238 -diff -NurpP --minimal linux-2.6.18.1/include/linux/capability.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/capability.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/capability.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/capability.h --- linux-2.6.18.1/include/linux/capability.h 2006-06-18 04:55:15 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/capability.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/capability.h 2006-09-20 17:01:45 +0200 @@ -235,6 +235,7 @@ typedef __u32 kernel_cap_t; arbitrary SCSI commands */ /* Allow setting encryption key on loopback filesystem */ @@ -8721,9 +8790,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/capability.h linux-2.6.18.1-v #ifdef __KERNEL__ /* * Bounding set -diff -NurpP --minimal linux-2.6.18.1/include/linux/devpts_fs.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/devpts_fs.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/devpts_fs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/devpts_fs.h --- linux-2.6.18.1/include/linux/devpts_fs.h 2004-08-14 12:55:59 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/devpts_fs.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/devpts_fs.h 2006-09-20 17:01:45 +0200 @@ -30,5 +30,7 @@ static inline void devpts_pty_kill(int n #endif @@ -8732,9 +8801,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/devpts_fs.h linux-2.6.18.1-vs + #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/ext2_fs.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/ext2_fs.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/ext2_fs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/ext2_fs.h --- linux-2.6.18.1/include/linux/ext2_fs.h 2006-09-20 16:58:43 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/ext2_fs.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/ext2_fs.h 2006-09-20 17:01:45 +0200 @@ -192,10 +192,17 @@ struct ext2_group_desc #define EXT2_NOTAIL_FL 0x00008000 /* file tail should not be merged */ #define EXT2_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */ @@ -8782,9 +8851,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/ext2_fs.h linux-2.6.18.1-vs2. #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt -diff -NurpP --minimal linux-2.6.18.1/include/linux/ext3_fs.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/ext3_fs.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/ext3_fs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/ext3_fs.h --- linux-2.6.18.1/include/linux/ext3_fs.h 2006-09-20 16:58:43 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/ext3_fs.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/ext3_fs.h 2006-09-20 17:01:45 +0200 @@ -181,10 +181,20 @@ struct ext3_group_desc #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */ #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */ @@ -8839,9 +8908,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/ext3_fs.h linux-2.6.18.1-vs2. extern void ext3_read_inode (struct inode *); extern int ext3_write_inode (struct inode *, int); -diff -NurpP --minimal linux-2.6.18.1/include/linux/fs.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/fs.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/fs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/fs.h --- linux-2.6.18.1/include/linux/fs.h 2006-09-20 16:58:43 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/fs.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/fs.h 2006-09-20 17:01:45 +0200 @@ -119,6 +119,8 @@ extern int dir_notify_enable; #define MS_PRIVATE (1<<18) /* change to private */ #define MS_SLAVE (1<<19) /* change to slave */ @@ -8969,9 +9038,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/fs.h linux-2.6.18.1-vs2.0.2.2 extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *); extern int simple_statfs(struct dentry *, struct kstatfs *); extern int simple_link(struct dentry *, struct inode *, struct dentry *); -diff -NurpP --minimal linux-2.6.18.1/include/linux/init_task.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/init_task.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/init_task.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/init_task.h --- linux-2.6.18.1/include/linux/init_task.h 2006-09-20 16:58:43 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/init_task.h 2006-09-20 17:51:11 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/init_task.h 2006-09-20 17:51:11 +0200 @@ -128,6 +128,10 @@ extern struct group_info init_groups; .pi_lock = SPIN_LOCK_UNLOCKED, \ INIT_TRACE_IRQFLAGS \ @@ -8983,9 +9052,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/init_task.h linux-2.6.18.1-vs } -diff -NurpP --minimal linux-2.6.18.1/include/linux/ipc.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/ipc.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/ipc.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/ipc.h --- linux-2.6.18.1/include/linux/ipc.h 2004-08-14 12:54:46 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/ipc.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/ipc.h 2006-09-20 17:01:45 +0200 @@ -66,6 +66,7 @@ struct kern_ipc_perm mode_t mode; unsigned long seq; @@ -8994,9 +9063,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/ipc.h linux-2.6.18.1-vs2.0.2. }; #endif /* __KERNEL__ */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/kernel.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/kernel.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/kernel.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/kernel.h --- linux-2.6.18.1/include/linux/kernel.h 2006-09-20 16:58:43 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/kernel.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/kernel.h 2006-09-20 17:01:45 +0200 @@ -17,6 +17,7 @@ #include <asm/bug.h> @@ -9005,9 +9074,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/kernel.h linux-2.6.18.1-vs2.0 #define INT_MAX ((int)(~0U>>1)) #define INT_MIN (-INT_MAX - 1) -diff -NurpP --minimal linux-2.6.18.1/include/linux/major.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/major.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/major.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/major.h --- linux-2.6.18.1/include/linux/major.h 2006-06-18 04:55:19 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/major.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/major.h 2006-09-20 17:01:45 +0200 @@ -15,6 +15,7 @@ #define HD_MAJOR IDE0_MAJOR #define PTY_SLAVE_MAJOR 3 @@ -9016,9 +9085,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/major.h linux-2.6.18.1-vs2.0. #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-2.6.18.1/include/linux/mount.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/mount.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/mount.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/mount.h --- linux-2.6.18.1/include/linux/mount.h 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/mount.h 2006-09-20 17:50:23 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/mount.h 2006-09-20 17:50:23 +0200 @@ -27,12 +27,16 @@ struct namespace; #define MNT_NOEXEC 0x04 #define MNT_NOATIME 0x08 @@ -9044,9 +9113,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/mount.h linux-2.6.18.1-vs2.0. }; static inline struct vfsmount *mntget(struct vfsmount *mnt) -diff -NurpP --minimal linux-2.6.18.1/include/linux/net.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/net.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/net.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/net.h --- linux-2.6.18.1/include/linux/net.h 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/net.h 2006-09-20 17:47:13 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/net.h 2006-09-20 17:47:13 +0200 @@ -62,6 +62,7 @@ typedef enum { #define SOCK_NOSPACE 2 #define SOCK_PASSCRED 3 @@ -9055,9 +9124,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/net.h linux-2.6.18.1-vs2.0.2. #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-2.6.18.1/include/linux/nfs_mount.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/nfs_mount.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/nfs_mount.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/nfs_mount.h --- linux-2.6.18.1/include/linux/nfs_mount.h 2005-08-29 22:25:42 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/nfs_mount.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/nfs_mount.h 2006-09-20 17:01:45 +0200 @@ -61,6 +61,7 @@ struct nfs_mount_data { #define NFS_MOUNT_NOACL 0x0800 /* 4 */ #define NFS_MOUNT_STRICTLOCK 0x1000 /* reserved for NFSv4 */ @@ -9066,9 +9135,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/nfs_mount.h linux-2.6.18.1-vs #define NFS_MOUNT_FLAGMASK 0xFFFF #endif -diff -NurpP --minimal linux-2.6.18.1/include/linux/percpu.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/percpu.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/percpu.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/percpu.h --- linux-2.6.18.1/include/linux/percpu.h 2006-04-09 13:49:57 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/percpu.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/percpu.h 2006-09-20 17:01:45 +0200 @@ -8,7 +8,7 @@ /* Enough to cover all DEFINE_PER_CPUs in kernel, including modules. */ @@ -9078,9 +9147,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/percpu.h linux-2.6.18.1-vs2.0 #endif /* Must be an lvalue. */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/pid.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/pid.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/pid.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/pid.h --- linux-2.6.18.1/include/linux/pid.h 2006-06-18 04:55:21 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/pid.h 2006-10-17 01:48:03 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/pid.h 2006-10-17 01:48:03 +0200 @@ -8,7 +8,8 @@ enum pid_type PIDTYPE_PID, PIDTYPE_PGID, @@ -9091,9 +9160,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/pid.h linux-2.6.18.1-vs2.0.2. }; /* -diff -NurpP --minimal linux-2.6.18.1/include/linux/proc_fs.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/proc_fs.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/proc_fs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/proc_fs.h --- linux-2.6.18.1/include/linux/proc_fs.h 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/proc_fs.h 2006-09-20 17:46:14 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/proc_fs.h 2006-09-20 17:46:14 +0200 @@ -55,6 +55,7 @@ struct proc_dir_entry { nlink_t nlink; uid_t uid; @@ -9115,9 +9184,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/proc_fs.h linux-2.6.18.1-vs2. } op; struct proc_dir_entry *pde; struct inode vfs_inode; -diff -NurpP --minimal linux-2.6.18.1/include/linux/reiserfs_fs.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/reiserfs_fs.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/reiserfs_fs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/reiserfs_fs.h --- linux-2.6.18.1/include/linux/reiserfs_fs.h 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/reiserfs_fs.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/reiserfs_fs.h 2006-09-20 17:01:45 +0200 @@ -829,6 +829,18 @@ struct stat_data_v1 { #define REISERFS_COMPR_FL EXT2_COMPR_FL #define REISERFS_NOTAIL_FL EXT2_NOTAIL_FL @@ -9145,9 +9214,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/reiserfs_fs.h linux-2.6.18.1- /* namei.c */ void set_de_name_and_namelen(struct reiserfs_dir_entry *de); -diff -NurpP --minimal linux-2.6.18.1/include/linux/reiserfs_fs_sb.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/reiserfs_fs_sb.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/reiserfs_fs_sb.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/reiserfs_fs_sb.h --- linux-2.6.18.1/include/linux/reiserfs_fs_sb.h 2006-02-18 14:40:35 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/reiserfs_fs_sb.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/reiserfs_fs_sb.h 2006-09-20 17:01:45 +0200 @@ -456,6 +456,7 @@ enum reiserfs_mount_options { REISERFS_POSIXACL, REISERFS_BARRIER_NONE, @@ -9156,9 +9225,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/reiserfs_fs_sb.h linux-2.6.18 /* Actions on error */ REISERFS_ERROR_PANIC, -diff -NurpP --minimal linux-2.6.18.1/include/linux/sched.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/sched.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/sched.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sched.h --- linux-2.6.18.1/include/linux/sched.h 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/sched.h 2006-10-17 01:48:03 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sched.h 2006-10-17 01:48:03 +0200 @@ -52,6 +52,7 @@ struct sched_param { #include <linux/cpumask.h> #include <linux/errno.h> @@ -9272,9 +9341,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/sched.h linux-2.6.18.1-vs2.0. static inline struct user_struct *get_uid(struct user_struct *u) { atomic_inc(&u->__count); -diff -NurpP --minimal linux-2.6.18.1/include/linux/shmem_fs.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/shmem_fs.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/shmem_fs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/shmem_fs.h --- linux-2.6.18.1/include/linux/shmem_fs.h 2006-04-09 13:49:57 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/shmem_fs.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/shmem_fs.h 2006-09-20 17:01:45 +0200 @@ -8,6 +8,9 @@ #define SHMEM_NR_DIRECT 16 @@ -9285,9 +9354,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/shmem_fs.h linux-2.6.18.1-vs2 struct shmem_inode_info { spinlock_t lock; unsigned long flags; -diff -NurpP --minimal linux-2.6.18.1/include/linux/stat.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/stat.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/stat.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/stat.h --- linux-2.6.18.1/include/linux/stat.h 2006-06-18 04:55:25 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/stat.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/stat.h 2006-09-20 17:01:45 +0200 @@ -63,6 +63,7 @@ struct kstat { unsigned int nlink; uid_t uid; @@ -9296,9 +9365,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/stat.h linux-2.6.18.1-vs2.0.2 dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-2.6.18.1/include/linux/sunrpc/auth.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/sunrpc/auth.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/sunrpc/auth.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sunrpc/auth.h --- linux-2.6.18.1/include/linux/sunrpc/auth.h 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/sunrpc/auth.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sunrpc/auth.h 2006-09-20 17:01:45 +0200 @@ -27,6 +27,7 @@ struct auth_cred { uid_t uid; @@ -9307,9 +9376,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/sunrpc/auth.h linux-2.6.18.1- struct group_info *group_info; }; -diff -NurpP --minimal linux-2.6.18.1/include/linux/sunrpc/clnt.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/sunrpc/clnt.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/sunrpc/clnt.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sunrpc/clnt.h --- linux-2.6.18.1/include/linux/sunrpc/clnt.h 2006-06-18 04:55:25 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/sunrpc/clnt.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sunrpc/clnt.h 2006-09-20 17:01:45 +0200 @@ -52,7 +52,8 @@ struct rpc_clnt { cl_intr : 1,/* interruptible */ cl_autobind : 1,/* use getport() */ @@ -9320,9 +9389,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/sunrpc/clnt.h linux-2.6.18.1- struct rpc_rtt * cl_rtt; /* RTO estimator data */ struct rpc_portmap * cl_pmap; /* port mapping */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/sysctl.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/sysctl.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/sysctl.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sysctl.h --- linux-2.6.18.1/include/linux/sysctl.h 2006-10-17 03:21:24 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/sysctl.h 2006-10-16 18:56:11 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sysctl.h 2006-10-16 18:56:11 +0200 @@ -93,6 +93,7 @@ enum KERN_CAP_BSET=14, /* int: capability bounding set */ KERN_PANIC=15, /* int: panic timeout */ @@ -9349,9 +9418,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/sysctl.h linux-2.6.18.1-vs2.0 ctl_handler *strategy; /* Callback function for all r/w */ struct proc_dir_entry *de; /* /proc control block */ void *extra1; -diff -NurpP --minimal linux-2.6.18.1/include/linux/sysfs.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/sysfs.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/sysfs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sysfs.h --- linux-2.6.18.1/include/linux/sysfs.h 2006-06-18 04:55:25 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/sysfs.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sysfs.h 2006-09-20 17:01:45 +0200 @@ -12,6 +12,8 @@ #include <asm/atomic.h> @@ -9361,9 +9430,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/sysfs.h linux-2.6.18.1-vs2.0. struct kobject; struct module; -diff -NurpP --minimal linux-2.6.18.1/include/linux/types.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/types.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/types.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/types.h --- linux-2.6.18.1/include/linux/types.h 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/types.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/types.h 2006-09-20 17:01:45 +0200 @@ -37,6 +37,8 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; @@ -9373,9 +9442,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/types.h linux-2.6.18.1-vs2.0. #ifdef CONFIG_UID16 /* This is defined by include/asm-{arch}/posix_types.h */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vroot.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vroot.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vroot.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vroot.h --- linux-2.6.18.1/include/linux/vroot.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vroot.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vroot.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,51 @@ + +/* @@ -9428,9 +9497,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vroot.h linux-2.6.18.1-vs2.0. +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_base.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_base.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_base.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_base.h --- linux-2.6.18.1/include/linux/vs_base.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_base.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_base.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,106 @@ +#ifndef _VX_VS_BASE_H +#define _VX_VS_BASE_H @@ -9538,9 +9607,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_base.h linux-2.6.18.1-vs2. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_context.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_context.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_context.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_context.h --- linux-2.6.18.1/include/linux/vs_context.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_context.h 2006-10-20 02:33:00 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_context.h 2006-10-20 02:33:00 +0200 @@ -0,0 +1,242 @@ +#ifndef _VX_VS_CONTEXT_H +#define _VX_VS_CONTEXT_H @@ -9784,10 +9853,10 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_context.h linux-2.6.18.1-v +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_cvirt.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_cvirt.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_cvirt.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_cvirt.h --- linux-2.6.18.1/include/linux/vs_cvirt.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_cvirt.h 2006-09-20 17:01:45 +0200 -@@ -0,0 +1,108 @@ ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_cvirt.h 2006-10-25 03:48:07 +0200 +@@ -0,0 +1,158 @@ +#ifndef _VX_VS_CVIRT_H +#define _VX_VS_CVIRT_H + @@ -9893,12 +9962,62 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_cvirt.h linux-2.6.18.1-vs2 +} + + ++struct inode; ++ ++#define VXF_FAKE_INIT (VXF_INFO_INIT|VXF_STATE_INIT) ++ ++static inline ++int proc_pid_visible(struct task_struct *task, int pid) ++{ ++ if ((pid == 1) && ++ !vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT)) ++ /* show a blend through init */ ++ goto visible; ++ if (vx_check(vx_task_xid(task), VX_WATCH|VX_IDENT)) ++ goto visible; ++ return 0; ++visible: ++ return 1; ++} ++ ++static inline ++struct task_struct *find_proc_task_by_pid(int pid) ++{ ++ struct task_struct *task = find_task_by_pid(pid); ++ ++ if (task && !proc_pid_visible(task, pid)) { ++ vxdprintk(VXD_CBIT(misc, 6), ++ "dropping task %p[#%u,%u] for %p[#%u,%u]", ++ task, task->xid, task->pid, ++ current, current->xid, current->pid); ++ put_task_struct(task); ++ task = NULL; ++ } ++ return task; ++} ++ ++static inline ++struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid) ++{ ++ struct task_struct *task = get_pid_task(pid, PIDTYPE_PID); ++ ++ if (task && !proc_pid_visible(task, pid->nr)) { ++ vxdprintk(VXD_CBIT(misc, 6), ++ "dropping task %p[#%u,%u] for %p[#%u,%u]", ++ task, task->xid, task->pid, ++ current, current->xid, current->pid); ++ put_task_struct(task); ++ task = NULL; ++ } ++ return task; ++} ++ +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_dlimit.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_dlimit.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_dlimit.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_dlimit.h --- linux-2.6.18.1/include/linux/vs_dlimit.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_dlimit.h 2006-10-16 19:04:59 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_dlimit.h 2006-10-16 19:04:59 +0200 @@ -0,0 +1,213 @@ +#ifndef _VX_VS_DLIMIT_H +#define _VX_VS_DLIMIT_H @@ -10113,9 +10232,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_dlimit.h linux-2.6.18.1-vs +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_limit.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_limit.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_limit.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_limit.h --- linux-2.6.18.1/include/linux/vs_limit.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_limit.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_limit.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,107 @@ +#ifndef _VX_VS_LIMIT_H +#define _VX_VS_LIMIT_H @@ -10224,9 +10343,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_limit.h linux-2.6.18.1-vs2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_memory.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_memory.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_memory.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_memory.h --- linux-2.6.18.1/include/linux/vs_memory.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_memory.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_memory.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,107 @@ +#ifndef _VX_VS_MEMORY_H +#define _VX_VS_MEMORY_H @@ -10335,9 +10454,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_memory.h linux-2.6.18.1-vs +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_network.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_network.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_network.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_network.h --- linux-2.6.18.1/include/linux/vs_network.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_network.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_network.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,215 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -10554,9 +10673,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_network.h linux-2.6.18.1-v +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_sched.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_sched.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_sched.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_sched.h --- linux-2.6.18.1/include/linux/vs_sched.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_sched.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_sched.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,92 @@ +#ifndef _VX_VS_SCHED_H +#define _VX_VS_SCHED_H @@ -10650,9 +10769,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_sched.h linux-2.6.18.1-vs2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_socket.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_socket.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_socket.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_socket.h --- linux-2.6.18.1/include/linux/vs_socket.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vs_socket.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_socket.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,57 @@ +#ifndef _VX_VS_SOCKET_H +#define _VX_VS_SOCKET_H @@ -10711,9 +10830,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_socket.h linux-2.6.18.1-vs +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/context.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/context.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/context.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/context.h --- linux-2.6.18.1/include/linux/vserver/context.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/context.h 2006-10-17 02:05:58 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/context.h 2006-10-17 02:05:58 +0200 @@ -0,0 +1,178 @@ +#ifndef _VX_CONTEXT_H +#define _VX_CONTEXT_H @@ -10893,9 +11012,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/context.h linux-2.6.1 +#else /* _VX_CONTEXT_H */ +#warning duplicate inclusion +#endif /* _VX_CONTEXT_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/context_cmd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/context_cmd.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/context_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/context_cmd.h --- linux-2.6.18.1/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/context_cmd.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/context_cmd.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,84 @@ +#ifndef _VX_CONTEXT_CMD_H +#define _VX_CONTEXT_CMD_H @@ -10981,9 +11100,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/context_cmd.h linux-2 + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/cvirt.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/cvirt.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/cvirt.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/cvirt.h --- linux-2.6.18.1/include/linux/vserver/cvirt.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/cvirt.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/cvirt.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,26 @@ +#ifndef _VX_CVIRT_H +#define _VX_CVIRT_H @@ -11011,9 +11130,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/cvirt.h linux-2.6.18. +#else /* _VX_CVIRT_H */ +#warning duplicate inclusion +#endif /* _VX_CVIRT_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/cvirt_cmd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/cvirt_cmd.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/cvirt_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/cvirt_cmd.h --- linux-2.6.18.1/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/cvirt_cmd.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/cvirt_cmd.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,35 @@ +#ifndef _VX_CVIRT_CMD_H +#define _VX_CVIRT_CMD_H @@ -11050,9 +11169,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/cvirt_cmd.h linux-2.6 + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_CMD_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/cvirt_def.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/cvirt_def.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/cvirt_def.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/cvirt_def.h --- linux-2.6.18.1/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/cvirt_def.h 2006-10-20 03:12:44 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/cvirt_def.h 2006-10-20 03:12:44 +0200 @@ -0,0 +1,75 @@ +#ifndef _VX_CVIRT_DEF_H +#define _VX_CVIRT_DEF_H @@ -11129,9 +11248,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/cvirt_def.h linux-2.6 +}; + +#endif /* _VX_CVIRT_DEF_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/debug.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/debug.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/debug.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/debug.h --- linux-2.6.18.1/include/linux/vserver/debug.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/debug.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/debug.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,298 @@ +#ifndef _VX_DEBUG_H +#define _VX_DEBUG_H @@ -11431,9 +11550,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/debug.h linux-2.6.18. + + +#endif /* _VX_DEBUG_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/debug_cmd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/debug_cmd.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/debug_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/debug_cmd.h --- linux-2.6.18.1/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/debug_cmd.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/debug_cmd.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,14 @@ +#ifndef _VX_DEBUG_CMD_H +#define _VX_DEBUG_CMD_H @@ -11449,9 +11568,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/debug_cmd.h linux-2.6 + +#endif /* __KERNEL__ */ +#endif /* _VX_DEBUG_CMD_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/dlimit.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/dlimit.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/dlimit.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/dlimit.h --- linux-2.6.18.1/include/linux/vserver/dlimit.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/dlimit.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/dlimit.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,53 @@ +#ifndef _VX_DLIMIT_H +#define _VX_DLIMIT_H @@ -11506,10 +11625,10 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/dlimit.h linux-2.6.18 +#else /* _VX_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VX_DLIMIT_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/dlimit_cmd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/dlimit_cmd.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/dlimit_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/dlimit_cmd.h --- linux-2.6.18.1/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/dlimit_cmd.h 2006-09-20 17:01:45 +0200 -@@ -0,0 +1,69 @@ ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/dlimit_cmd.h 2006-10-29 03:10:06 +0100 +@@ -0,0 +1,71 @@ +#ifndef _VX_DLIMIT_CMD_H +#define _VX_DLIMIT_CMD_H + @@ -11542,6 +11661,8 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/dlimit_cmd.h linux-2. + +#ifdef CONFIG_COMPAT + ++#include <asm/compat.h> ++ +struct vcmd_ctx_dlimit_base_v0_x32 { + compat_uptr_t name_ptr; + uint32_t flags; @@ -11579,9 +11700,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/dlimit_cmd.h linux-2. + +#endif /* __KERNEL__ */ +#endif /* _VX_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/inode.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/inode.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/inode.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/inode.h --- linux-2.6.18.1/include/linux/vserver/inode.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/inode.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/inode.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,38 @@ +#ifndef _VX_INODE_H +#define _VX_INODE_H @@ -11621,10 +11742,10 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/inode.h linux-2.6.18. +#else /* _VX_INODE_H */ +#warning duplicate inclusion +#endif /* _VX_INODE_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/inode_cmd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/inode_cmd.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/inode_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/inode_cmd.h --- linux-2.6.18.1/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/inode_cmd.h 2006-09-20 17:01:45 +0200 -@@ -0,0 +1,59 @@ ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/inode_cmd.h 2006-10-29 03:10:06 +0100 +@@ -0,0 +1,61 @@ +#ifndef _VX_INODE_CMD_H +#define _VX_INODE_CMD_H + @@ -11658,6 +11779,8 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/inode_cmd.h linux-2.6 + +#ifdef CONFIG_COMPAT + ++#include <asm/compat.h> ++ +struct vcmd_ctx_iattr_v1_x32 { + compat_uptr_t name_ptr; + uint32_t xid; @@ -11684,9 +11807,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/inode_cmd.h linux-2.6 + +#endif /* __KERNEL__ */ +#endif /* _VX_INODE_CMD_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/legacy.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/legacy.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/legacy.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/legacy.h --- linux-2.6.18.1/include/linux/vserver/legacy.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/legacy.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/legacy.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,49 @@ +#ifndef _VX_LEGACY_H +#define _VX_LEGACY_H @@ -11737,9 +11860,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/legacy.h linux-2.6.18 + +#endif /* __KERNEL__ */ +#endif /* _VX_LEGACY_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/limit.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit.h --- linux-2.6.18.1/include/linux/vserver/limit.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/limit.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,20 @@ +#ifndef _VX_LIMIT_H +#define _VX_LIMIT_H @@ -11761,9 +11884,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit.h linux-2.6.18. + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit_cmd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/limit_cmd.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit_cmd.h --- linux-2.6.18.1/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/limit_cmd.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit_cmd.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,55 @@ +#ifndef _VX_LIMIT_CMD_H +#define _VX_LIMIT_CMD_H @@ -11820,9 +11943,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit_cmd.h linux-2.6 + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_CMD_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit_def.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/limit_def.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit_def.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit_def.h --- linux-2.6.18.1/include/linux/vserver/limit_def.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/limit_def.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit_def.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,22 @@ +#ifndef _VX_LIMIT_DEF_H +#define _VX_LIMIT_DEF_H @@ -11846,9 +11969,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit_def.h linux-2.6 + + +#endif /* _VX_LIMIT_DEF_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit_int.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/limit_int.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit_int.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit_int.h --- linux-2.6.18.1/include/linux/vserver/limit_int.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/limit_int.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit_int.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,76 @@ +#ifndef _VX_LIMIT_INT_H +#define _VX_LIMIT_INT_H @@ -11926,9 +12049,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit_int.h linux-2.6 + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/namespace.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/namespace.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/namespace.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/namespace.h --- linux-2.6.18.1/include/linux/vserver/namespace.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/namespace.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/namespace.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,15 @@ +#ifndef _VX_NAMESPACE_H +#define _VX_NAMESPACE_H @@ -11945,9 +12068,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/namespace.h linux-2.6 +#else /* _VX_NAMESPACE_H */ +#warning duplicate inclusion +#endif /* _VX_NAMESPACE_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/namespace_cmd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/namespace_cmd.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/namespace_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/namespace_cmd.h --- linux-2.6.18.1/include/linux/vserver/namespace_cmd.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/namespace_cmd.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/namespace_cmd.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,17 @@ +#ifndef _VX_NAMESPACE_CMD_H +#define _VX_NAMESPACE_CMD_H @@ -11966,9 +12089,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/namespace_cmd.h linux + +#endif /* __KERNEL__ */ +#endif /* _VX_NAMESPACE_CMD_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/network.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/network.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/network.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/network.h --- linux-2.6.18.1/include/linux/vserver/network.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/network.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/network.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,119 @@ +#ifndef _VX_NETWORK_H +#define _VX_NETWORK_H @@ -12089,9 +12212,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/network.h linux-2.6.1 +#else /* _VX_NETWORK_H */ +#warning duplicate inclusion +#endif /* _VX_NETWORK_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/network_cmd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/network_cmd.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/network_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/network_cmd.h --- linux-2.6.18.1/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/network_cmd.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/network_cmd.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,89 @@ +#ifndef _VX_NETWORK_CMD_H +#define _VX_NETWORK_CMD_H @@ -12182,9 +12305,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/network_cmd.h linux-2 + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/sched.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/sched.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/sched.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/sched.h --- linux-2.6.18.1/include/linux/vserver/sched.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/sched.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/sched.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,26 @@ +#ifndef _VX_SCHED_H +#define _VX_SCHED_H @@ -12212,9 +12335,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/sched.h linux-2.6.18. +#else /* _VX_SCHED_H */ +#warning duplicate inclusion +#endif /* _VX_SCHED_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/sched_cmd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/sched_cmd.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/sched_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/sched_cmd.h --- linux-2.6.18.1/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/sched_cmd.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/sched_cmd.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,48 @@ +#ifndef _VX_SCHED_CMD_H +#define _VX_SCHED_CMD_H @@ -12264,9 +12387,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/sched_cmd.h linux-2.6 + +#endif /* __KERNEL__ */ +#endif /* _VX_SCHED_CMD_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/sched_def.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/sched_def.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/sched_def.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/sched_def.h --- linux-2.6.18.1/include/linux/vserver/sched_def.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/sched_def.h 2006-10-20 00:46:11 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/sched_def.h 2006-10-20 00:46:11 +0200 @@ -0,0 +1,38 @@ +#ifndef _VX_SCHED_DEF_H +#define _VX_SCHED_DEF_H @@ -12306,9 +12429,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/sched_def.h linux-2.6 +}; + +#endif /* _VX_SCHED_DEF_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/signal.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/signal.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/signal.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/signal.h --- linux-2.6.18.1/include/linux/vserver/signal.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/signal.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/signal.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,14 @@ +#ifndef _VX_SIGNAL_H +#define _VX_SIGNAL_H @@ -12324,9 +12447,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/signal.h linux-2.6.18 +#else /* _VX_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VX_SIGNAL_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/signal_cmd.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/signal_cmd.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/signal_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/signal_cmd.h --- linux-2.6.18.1/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/signal_cmd.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/signal_cmd.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,26 @@ +#ifndef _VX_SIGNAL_CMD_H +#define _VX_SIGNAL_CMD_H @@ -12354,9 +12477,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/signal_cmd.h linux-2. + +#endif /* __KERNEL__ */ +#endif /* _VX_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/switch.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/switch.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/switch.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/switch.h --- linux-2.6.18.1/include/linux/vserver/switch.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/switch.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/switch.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,98 @@ +#ifndef _VX_SWITCH_H +#define _VX_SWITCH_H @@ -12456,15 +12579,13 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/switch.h linux-2.6.18 +#endif /* __KERNEL__ */ + +#endif /* _VX_SWITCH_H */ -diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/xid.h linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/xid.h +diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/xid.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/xid.h --- linux-2.6.18.1/include/linux/vserver/xid.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/linux/vserver/xid.h 2006-09-20 17:01:45 +0200 -@@ -0,0 +1,146 @@ ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/xid.h 2006-10-29 05:06:18 +0100 +@@ -0,0 +1,144 @@ +#ifndef _VX_XID_H +#define _VX_XID_H + -+#include <linux/config.h> -+ + +#define XID_TAG(in) (IS_TAGXID(in)) + @@ -12606,9 +12727,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/xid.h linux-2.6.18.1- +void vx_propagate_xid(struct nameidata *nd, struct inode *inode); + +#endif /* _VX_XID_H */ -diff -NurpP --minimal linux-2.6.18.1/include/net/af_unix.h linux-2.6.18.1-vs2.0.2.2-rc3/include/net/af_unix.h +diff -NurpP --minimal linux-2.6.18.1/include/net/af_unix.h linux-2.6.18.1-vs2.0.2.2-rc4/include/net/af_unix.h --- linux-2.6.18.1/include/net/af_unix.h 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/net/af_unix.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/net/af_unix.h 2006-09-20 17:01:45 +0200 @@ -17,9 +17,9 @@ extern spinlock_t unix_table_lock; extern atomic_t unix_tot_inflight; @@ -12651,9 +12772,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/net/af_unix.h linux-2.6.18.1-vs2.0. } #define forall_unix_sockets(i, s) \ -diff -NurpP --minimal linux-2.6.18.1/include/net/inet_hashtables.h linux-2.6.18.1-vs2.0.2.2-rc3/include/net/inet_hashtables.h +diff -NurpP --minimal linux-2.6.18.1/include/net/inet_hashtables.h linux-2.6.18.1-vs2.0.2.2-rc4/include/net/inet_hashtables.h --- linux-2.6.18.1/include/net/inet_hashtables.h 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/net/inet_hashtables.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/net/inet_hashtables.h 2006-09-20 17:01:45 +0200 @@ -271,6 +271,25 @@ static inline int inet_iif(const struct return ((struct rtable *)skb->dst)->rt_iif; } @@ -12689,9 +12810,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/net/inet_hashtables.h linux-2.6.18. (sk->sk_family == PF_INET || !ipv6_only_sock(sk)) && !sk->sk_bound_dev_if) goto sherry_cache; -diff -NurpP --minimal linux-2.6.18.1/include/net/inet_sock.h linux-2.6.18.1-vs2.0.2.2-rc3/include/net/inet_sock.h +diff -NurpP --minimal linux-2.6.18.1/include/net/inet_sock.h linux-2.6.18.1-vs2.0.2.2-rc4/include/net/inet_sock.h --- linux-2.6.18.1/include/net/inet_sock.h 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/net/inet_sock.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/net/inet_sock.h 2006-09-20 17:01:45 +0200 @@ -114,6 +114,7 @@ struct inet_sock { /* Socket demultiplex comparisons on incoming packets. */ __u32 daddr; @@ -12700,9 +12821,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/net/inet_sock.h linux-2.6.18.1-vs2. __u16 dport; __u16 num; __u32 saddr; -diff -NurpP --minimal linux-2.6.18.1/include/net/inet_timewait_sock.h linux-2.6.18.1-vs2.0.2.2-rc3/include/net/inet_timewait_sock.h +diff -NurpP --minimal linux-2.6.18.1/include/net/inet_timewait_sock.h linux-2.6.18.1-vs2.0.2.2-rc4/include/net/inet_timewait_sock.h --- linux-2.6.18.1/include/net/inet_timewait_sock.h 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/net/inet_timewait_sock.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/net/inet_timewait_sock.h 2006-09-20 17:01:45 +0200 @@ -115,6 +115,10 @@ struct inet_timewait_sock { #define tw_refcnt __tw_common.skc_refcnt #define tw_hash __tw_common.skc_hash @@ -12714,9 +12835,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/net/inet_timewait_sock.h linux-2.6. volatile unsigned char tw_substate; /* 3 bits hole, try to pack */ unsigned char tw_rcv_wscale; -diff -NurpP --minimal linux-2.6.18.1/include/net/route.h linux-2.6.18.1-vs2.0.2.2-rc3/include/net/route.h +diff -NurpP --minimal linux-2.6.18.1/include/net/route.h linux-2.6.18.1-vs2.0.2.2-rc4/include/net/route.h --- linux-2.6.18.1/include/net/route.h 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/net/route.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/net/route.h 2006-09-20 17:01:45 +0200 @@ -27,11 +27,14 @@ #include <net/dst.h> #include <net/inetpeer.h> @@ -12821,9 +12942,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/net/route.h linux-2.6.18.1-vs2.0.2. err = __ip_route_output_key(rp, &fl); if (err) return err; -diff -NurpP --minimal linux-2.6.18.1/include/net/sock.h linux-2.6.18.1-vs2.0.2.2-rc3/include/net/sock.h +diff -NurpP --minimal linux-2.6.18.1/include/net/sock.h linux-2.6.18.1-vs2.0.2.2-rc4/include/net/sock.h --- linux-2.6.18.1/include/net/sock.h 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/include/net/sock.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/include/net/sock.h 2006-09-20 17:01:45 +0200 @@ -118,6 +118,10 @@ struct sock_common { atomic_t skc_refcnt; unsigned int skc_hash; @@ -12846,9 +12967,9 @@ diff -NurpP --minimal linux-2.6.18.1/include/net/sock.h linux-2.6.18.1-vs2.0.2.2 unsigned char sk_shutdown : 2, sk_no_check : 2, sk_userlocks : 4; -diff -NurpP --minimal linux-2.6.18.1/ipc/mqueue.c linux-2.6.18.1-vs2.0.2.2-rc3/ipc/mqueue.c +diff -NurpP --minimal linux-2.6.18.1/ipc/mqueue.c linux-2.6.18.1-vs2.0.2.2-rc4/ipc/mqueue.c --- linux-2.6.18.1/ipc/mqueue.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/ipc/mqueue.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/ipc/mqueue.c 2006-09-20 17:01:45 +0200 @@ -29,6 +29,8 @@ #include <linux/audit.h> #include <linux/signal.h> @@ -12904,9 +13025,9 @@ diff -NurpP --minimal linux-2.6.18.1/ipc/mqueue.c linux-2.6.18.1-vs2.0.2.2-rc3/i out_err: dput(dentry); -diff -NurpP --minimal linux-2.6.18.1/ipc/msg.c linux-2.6.18.1-vs2.0.2.2-rc3/ipc/msg.c +diff -NurpP --minimal linux-2.6.18.1/ipc/msg.c linux-2.6.18.1-vs2.0.2.2-rc4/ipc/msg.c --- linux-2.6.18.1/ipc/msg.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/ipc/msg.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/ipc/msg.c 2006-09-20 17:01:45 +0200 @@ -103,6 +103,7 @@ static int newque(key_t key, int msgflg) msq->q_perm.mode = msgflg & S_IRWXUGO; @@ -12925,9 +13046,9 @@ diff -NurpP --minimal linux-2.6.18.1/ipc/msg.c linux-2.6.18.1-vs2.0.2.2-rc3/ipc/ return seq_printf(s, "%10d %10d %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n", msq->q_perm.key, -diff -NurpP --minimal linux-2.6.18.1/ipc/sem.c linux-2.6.18.1-vs2.0.2.2-rc3/ipc/sem.c +diff -NurpP --minimal linux-2.6.18.1/ipc/sem.c linux-2.6.18.1-vs2.0.2.2-rc4/ipc/sem.c --- linux-2.6.18.1/ipc/sem.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/ipc/sem.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/ipc/sem.c 2006-09-20 17:01:45 +0200 @@ -183,6 +183,7 @@ static int newary (key_t key, int nsems, sma->sem_perm.mode = (semflg & S_IRWXUGO); @@ -12946,9 +13067,9 @@ diff -NurpP --minimal linux-2.6.18.1/ipc/sem.c linux-2.6.18.1-vs2.0.2.2-rc3/ipc/ return seq_printf(s, "%10d %10d %4o %10lu %5u %5u %5u %5u %10lu %10lu\n", sma->sem_perm.key, -diff -NurpP --minimal linux-2.6.18.1/ipc/shm.c linux-2.6.18.1-vs2.0.2.2-rc3/ipc/shm.c +diff -NurpP --minimal linux-2.6.18.1/ipc/shm.c linux-2.6.18.1-vs2.0.2.2-rc4/ipc/shm.c --- linux-2.6.18.1/ipc/shm.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/ipc/shm.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/ipc/shm.c 2006-09-20 17:01:45 +0200 @@ -32,6 +32,8 @@ #include <linux/ptrace.h> #include <linux/seq_file.h> @@ -13014,9 +13135,9 @@ diff -NurpP --minimal linux-2.6.18.1/ipc/shm.c linux-2.6.18.1-vs2.0.2.2-rc3/ipc/ if (sizeof(size_t) <= sizeof(int)) format = SMALL_STRING; else -diff -NurpP --minimal linux-2.6.18.1/ipc/util.c linux-2.6.18.1-vs2.0.2.2-rc3/ipc/util.c +diff -NurpP --minimal linux-2.6.18.1/ipc/util.c linux-2.6.18.1-vs2.0.2.2-rc4/ipc/util.c --- linux-2.6.18.1/ipc/util.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/ipc/util.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/ipc/util.c 2006-09-20 17:01:45 +0200 @@ -157,7 +157,9 @@ int ipc_findkey(struct ipc_ids* ids, key */ for (id = 0; id <= max_id; id++) { @@ -13038,9 +13159,9 @@ diff -NurpP --minimal linux-2.6.18.1/ipc/util.c linux-2.6.18.1-vs2.0.2.2-rc3/ipc requested_mode = (flag >> 6) | (flag >> 3) | flag; granted_mode = ipcp->mode; if (current->euid == ipcp->cuid || current->euid == ipcp->uid) -diff -NurpP --minimal linux-2.6.18.1/kernel/Makefile linux-2.6.18.1-vs2.0.2.2-rc3/kernel/Makefile +diff -NurpP --minimal linux-2.6.18.1/kernel/Makefile linux-2.6.18.1-vs2.0.2.2-rc4/kernel/Makefile --- linux-2.6.18.1/kernel/Makefile 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/Makefile 2006-09-20 17:38:59 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/Makefile 2006-09-20 17:38:59 +0200 @@ -10,6 +10,8 @@ obj-y = sched.o fork.o exec_domain.o kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \ hrtimer.o rwsem.o @@ -13050,9 +13171,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/Makefile linux-2.6.18.1-vs2.0.2.2-rc obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-y += time/ obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o -diff -NurpP --minimal linux-2.6.18.1/kernel/capability.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/capability.c +diff -NurpP --minimal linux-2.6.18.1/kernel/capability.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/capability.c --- linux-2.6.18.1/kernel/capability.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/capability.c 2006-10-18 01:19:40 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/capability.c 2006-10-18 01:19:40 +0200 @@ -246,6 +246,9 @@ EXPORT_SYMBOL(__capable); int capable(int cap) @@ -13063,9 +13184,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/capability.c linux-2.6.18.1-vs2.0.2. return __capable(current, cap); } EXPORT_SYMBOL(capable); -diff -NurpP --minimal linux-2.6.18.1/kernel/exit.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/exit.c +diff -NurpP --minimal linux-2.6.18.1/kernel/exit.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/exit.c --- linux-2.6.18.1/kernel/exit.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/exit.c 2006-10-20 02:23:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/exit.c 2006-10-20 02:23:45 +0200 @@ -38,6 +38,9 @@ #include <linux/pipe_fs_i.h> #include <linux/audit.h> /* for audit_free() */ @@ -13138,9 +13259,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/exit.c linux-2.6.18.1-vs2.0.2.2-rc3/ /* PF_DEAD causes final put_task_struct after we schedule. */ preempt_disable(); BUG_ON(tsk->flags & PF_DEAD); -diff -NurpP --minimal linux-2.6.18.1/kernel/fork.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/fork.c +diff -NurpP --minimal linux-2.6.18.1/kernel/fork.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/fork.c --- linux-2.6.18.1/kernel/fork.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/fork.c 2006-09-20 17:35:08 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/fork.c 2006-09-20 17:35:08 +0200 @@ -45,6 +45,10 @@ #include <linux/cn_proc.h> #include <linux/delayacct.h> @@ -13299,9 +13420,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/fork.c linux-2.6.18.1-vs2.0.2.2-rc3/ bad_fork_free: free_task(p); fork_out: -diff -NurpP --minimal linux-2.6.18.1/kernel/irq/handle.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/irq/handle.c +diff -NurpP --minimal linux-2.6.18.1/kernel/irq/handle.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/irq/handle.c --- linux-2.6.18.1/kernel/irq/handle.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/irq/handle.c 2006-10-17 02:37:47 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/irq/handle.c 2006-10-17 02:37:47 +0200 @@ -15,6 +15,7 @@ #include <linux/random.h> #include <linux/interrupt.h> @@ -13348,9 +13469,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/irq/handle.c linux-2.6.18.1-vs2.0.2. spin_unlock(&desc->lock); return 1; -diff -NurpP --minimal linux-2.6.18.1/kernel/kthread.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/kthread.c +diff -NurpP --minimal linux-2.6.18.1/kernel/kthread.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/kthread.c --- linux-2.6.18.1/kernel/kthread.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/kthread.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/kthread.c 2006-09-20 17:01:45 +0200 @@ -123,7 +123,7 @@ static void keventd_create_kthread(void } else { wait_for_completion(&create->started); @@ -13360,9 +13481,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/kthread.c linux-2.6.18.1-vs2.0.2.2-r read_unlock(&tasklist_lock); } complete(&create->done); -diff -NurpP --minimal linux-2.6.18.1/kernel/pid.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/pid.c +diff -NurpP --minimal linux-2.6.18.1/kernel/pid.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/pid.c --- linux-2.6.18.1/kernel/pid.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/pid.c 2006-10-18 02:04:52 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/pid.c 2006-10-25 03:42:52 +0200 @@ -26,6 +26,7 @@ #include <linux/init.h> #include <linux/bootmem.h> @@ -13371,7 +13492,7 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/pid.c linux-2.6.18.1-vs2.0.2.2-rc3/k #define pid_hashfn(nr) hash_long((unsigned long)nr, pidhash_shift) static struct hlist_head *pid_hash; -@@ -260,6 +261,15 @@ struct task_struct * fastcall pid_task(s +@@ -260,6 +261,17 @@ struct task_struct * fastcall pid_task(s first = rcu_dereference(pid->tasks[type].first); if (first) result = hlist_entry(first, struct task_struct, pids[(type)].node); @@ -13379,15 +13500,17 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/pid.c linux-2.6.18.1-vs2.0.2.2-rc3/k + !vx_check(vx_task_xid(result), VX_WATCH|VX_ADMIN|VX_IDENT)) { + int warn = ((type == PIDTYPE_PID) && (current->xid)); + -+ vxwprintk(warn , "[#%u] pid_task(%d,%d) = %p[#%u]", -+ current->xid, pid->nr, type, result, vx_task_xid(result)); ++ vxwprintk(warn , ++ "pid_task(%d,%d): task %p[#%u,%u] did lookup %p[#%u,%u]", ++ pid->nr, type, current, vx_current_xid(), current->pid, ++ result, vx_task_xid(result), result->pid); + WARN_ON(warn); + result = NULL; + } } return result; } -@@ -269,6 +279,10 @@ struct task_struct * fastcall pid_task(s +@@ -269,6 +281,10 @@ struct task_struct * fastcall pid_task(s */ struct task_struct *find_task_by_pid_type(int type, int nr) { @@ -13398,9 +13521,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/pid.c linux-2.6.18.1-vs2.0.2.2-rc3/k return pid_task(find_pid(nr), type); } -diff -NurpP --minimal linux-2.6.18.1/kernel/posix-timers.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/posix-timers.c +diff -NurpP --minimal linux-2.6.18.1/kernel/posix-timers.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/posix-timers.c --- linux-2.6.18.1/kernel/posix-timers.c 2006-06-18 04:55:31 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/posix-timers.c 2006-10-17 02:39:53 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/posix-timers.c 2006-10-17 02:39:53 +0200 @@ -48,6 +48,7 @@ #include <linux/wait.h> #include <linux/workqueue.h> @@ -13459,9 +13582,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/posix-timers.c linux-2.6.18.1-vs2.0. rtn->tgid != current->tgid || (event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_SIGNAL)) return NULL; -diff -NurpP --minimal linux-2.6.18.1/kernel/printk.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/printk.c +diff -NurpP --minimal linux-2.6.18.1/kernel/printk.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/printk.c --- linux-2.6.18.1/kernel/printk.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/printk.c 2006-10-17 02:37:14 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/printk.c 2006-10-17 02:37:14 +0200 @@ -31,6 +31,8 @@ #include <linux/security.h> #include <linux/bootmem.h> @@ -13545,9 +13668,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/printk.c linux-2.6.18.1-vs2.0.2.2-rc preempt_enable(); return printed_len; } -diff -NurpP --minimal linux-2.6.18.1/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/ptrace.c +diff -NurpP --minimal linux-2.6.18.1/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/ptrace.c --- linux-2.6.18.1/kernel/ptrace.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/ptrace.c 2006-10-18 01:19:40 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/ptrace.c 2006-10-18 01:19:40 +0200 @@ -521,6 +521,10 @@ asmlinkage long sys_ptrace(long request, goto out; } @@ -13559,9 +13682,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc if (request == PTRACE_ATTACH) { ret = ptrace_attach(child); goto out_put_task_struct; -diff -NurpP --minimal linux-2.6.18.1/kernel/sched.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/sched.c +diff -NurpP --minimal linux-2.6.18.1/kernel/sched.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/sched.c --- linux-2.6.18.1/kernel/sched.c 2006-10-17 03:21:24 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/sched.c 2006-10-16 18:56:11 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/sched.c 2006-10-29 03:17:14 +0100 @@ -55,6 +55,9 @@ #include <asm/tlb.h> @@ -13892,7 +14015,15 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/sched.c linux-2.6.18.1-vs2.0.2.2-rc3 __activate_task(p, rq); /* * Reschedule if we are currently running on this runqueue and -@@ -6789,6 +6932,9 @@ void __init sched_init(void) +@@ -4949,6 +5092,7 @@ static int __migrate_task(struct task_st + p->timestamp = p->timestamp - rq_src->timestamp_last_tick + + rq_dest->timestamp_last_tick; + deactivate_task(p, rq_src); ++ vx_activate_task(p); + __activate_task(p, rq_dest); + if (TASK_PREEMPTS_CURR(p, rq_dest)) + resched_task(rq_dest->curr); +@@ -6789,6 +6933,9 @@ void __init sched_init(void) INIT_LIST_HEAD(&rq->migration_queue); #endif atomic_set(&rq->nr_iowait, 0); @@ -13902,7 +14033,7 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/sched.c linux-2.6.18.1-vs2.0.2.2-rc3 for (j = 0; j < 2; j++) { array = rq->arrays + j; -@@ -6865,6 +7011,7 @@ void normalize_rt_tasks(void) +@@ -6865,6 +7012,7 @@ void normalize_rt_tasks(void) deactivate_task(p, task_rq(p)); __setscheduler(p, SCHED_NORMAL, 0); if (array) { @@ -13910,9 +14041,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/sched.c linux-2.6.18.1-vs2.0.2.2-rc3 __activate_task(p, task_rq(p)); resched_task(rq->curr); } -diff -NurpP --minimal linux-2.6.18.1/kernel/signal.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/signal.c +diff -NurpP --minimal linux-2.6.18.1/kernel/signal.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/signal.c --- linux-2.6.18.1/kernel/signal.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/signal.c 2006-10-18 01:19:40 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/signal.c 2006-10-25 03:47:15 +0200 @@ -571,18 +571,27 @@ static int rm_from_queue(unsigned long m static int check_kill_permission(int sig, struct siginfo *info, struct task_struct *t) @@ -13943,7 +14074,26 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/signal.c linux-2.6.18.1-vs2.0.2.2-rc error = security_task_kill(t, info, sig, 0); if (!error) audit_signal_info(sig, t); /* Let audit system see the signal */ -@@ -1839,6 +1848,11 @@ relock: +@@ -1105,7 +1114,7 @@ kill_proc_info(int sig, struct siginfo * + } + p = find_task_by_pid(pid); + error = -ESRCH; +- if (p) ++ if (p && vx_check(vx_task_xid(p), VX_IDENT)) + error = group_send_sig_info(sig, info, p); + if (unlikely(acquired_tasklist_lock)) + read_unlock(&tasklist_lock); +@@ -1167,7 +1176,8 @@ static int kill_something_info(int sig, + + read_lock(&tasklist_lock); + for_each_process(p) { +- if (p->pid > 1 && p->tgid != current->tgid) { ++ if (vx_check(vx_task_xid(p), VX_ADMIN|VX_IDENT) && ++ p->pid > 1 && p->tgid != current->tgid) { + int err = group_send_sig_info(sig, info, p); + ++count; + if (err != -EPERM) +@@ -1839,6 +1849,11 @@ relock: if (current == child_reaper) continue; @@ -13955,9 +14105,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/signal.c linux-2.6.18.1-vs2.0.2.2-rc if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-2.6.18.1/kernel/softirq.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/softirq.c +diff -NurpP --minimal linux-2.6.18.1/kernel/softirq.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/softirq.c --- linux-2.6.18.1/kernel/softirq.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/softirq.c 2006-10-17 02:35:27 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/softirq.c 2006-10-17 02:35:27 +0200 @@ -17,6 +17,7 @@ #include <linux/kthread.h> #include <linux/rcupdate.h> @@ -13990,9 +14140,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/softirq.c linux-2.6.18.1-vs2.0.2.2-r account_system_vtime(current); _local_bh_enable(); } -diff -NurpP --minimal linux-2.6.18.1/kernel/sys.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/sys.c +diff -NurpP --minimal linux-2.6.18.1/kernel/sys.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/sys.c --- linux-2.6.18.1/kernel/sys.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/sys.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/sys.c 2006-09-20 17:01:45 +0200 @@ -10,6 +10,7 @@ #include <linux/mman.h> #include <linux/smp_lock.h> @@ -14218,9 +14368,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/sys.c linux-2.6.18.1-vs2.0.2.2-rc3/k return -EPERM; if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > NR_OPEN) return -EPERM; -diff -NurpP --minimal linux-2.6.18.1/kernel/sysctl.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/sysctl.c +diff -NurpP --minimal linux-2.6.18.1/kernel/sysctl.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/sysctl.c --- linux-2.6.18.1/kernel/sysctl.c 2006-10-17 03:21:24 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/sysctl.c 2006-10-16 18:56:11 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/sysctl.c 2006-10-16 18:56:11 +0200 @@ -45,6 +45,7 @@ #include <linux/syscalls.h> #include <linux/nfs_fs.h> @@ -14350,9 +14500,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/sysctl.c linux-2.6.18.1-vs2.0.2.2-rc return -EFAULT; if (len < *lenp) { if(put_user('\n', ((char __user *) buffer) + len)) -diff -NurpP --minimal linux-2.6.18.1/kernel/timer.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/timer.c +diff -NurpP --minimal linux-2.6.18.1/kernel/timer.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/timer.c --- linux-2.6.18.1/kernel/timer.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/timer.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/timer.c 2006-09-20 17:01:45 +0200 @@ -34,6 +34,8 @@ #include <linux/cpu.h> #include <linux/syscalls.h> @@ -14418,9 +14568,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/timer.c linux-2.6.18.1-vs2.0.2.2-rc3 val.uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0); val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT); -diff -NurpP --minimal linux-2.6.18.1/kernel/user.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/user.c +diff -NurpP --minimal linux-2.6.18.1/kernel/user.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/user.c --- linux-2.6.18.1/kernel/user.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/user.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/user.c 2006-09-20 17:01:45 +0200 @@ -23,8 +23,8 @@ #define UIDHASH_BITS (CONFIG_BASE_SMALL ? 3 : 8) #define UIDHASH_SZ (1 << UIDHASH_BITS) @@ -14509,9 +14659,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/user.c linux-2.6.18.1-vs2.0.2.2-rc3/ spin_unlock_irq(&uidhash_lock); return 0; -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/Kconfig linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/Kconfig +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/Kconfig --- linux-2.6.18.1/kernel/vserver/Kconfig 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/Kconfig 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/Kconfig 2006-10-29 03:18:56 +0100 @@ -0,0 +1,189 @@ +# +# Linux VServer configuration @@ -14544,14 +14694,14 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/Kconfig linux-2.6.18.1-vs2.0 + so better avoid it, unless you really, really need it + for backwards compatibility. + -+config VSERVER_NGNET -+ bool "Disable Legacy Networking Kernel API" -+ depends on EXPERIMENTAL -+ default n ++config VSERVER_LEGACYNET ++ bool "Enable Legacy Networking Kernel API" ++ default y + help -+ This disables the legacy networking API which is required -+ by the chbind tool. Do not disable it unless you exactly -+ know what you are doing. ++ This enables the legacy networking API which is required ++ by the chbind tool (for util-vserver versions prior to ++ 0.30.210). If you use an older version, don't disable ++ this option. + +config VSERVER_REMAP_SADDR + bool "Remap Source IP Address" @@ -14697,14 +14847,14 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/Kconfig linux-2.6.18.1-vs2.0 + default y + select SECURITY_CAPABILITIES + -+config VSERVER_LEGACYNET ++config VSERVER_NGNET + bool -+ depends on !VSERVER_NGNET ++ depends on EXPERIMENTAL && !VSERVER_LEGACYNET + default y + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/Makefile linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/Makefile +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/Makefile linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/Makefile --- linux-2.6.18.1/kernel/vserver/Makefile 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/Makefile 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/Makefile 2006-09-20 17:01:45 +0200 @@ -0,0 +1,16 @@ +# +# Makefile for the Linux vserver routines. @@ -14722,9 +14872,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/Makefile linux-2.6.18.1-vs2. +vserver-$(CONFIG_VSERVER_LEGACYNET) += legacynet.o +vserver-$(CONFIG_VSERVER_HISTORY) += history.o + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/context.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/context.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/context.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/context.c --- linux-2.6.18.1/kernel/vserver/context.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/context.c 2006-10-20 02:22:01 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/context.c 2006-10-20 02:22:01 +0200 @@ -0,0 +1,926 @@ +/* + * linux/kernel/vserver/context.c @@ -15652,9 +15802,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/context.c linux-2.6.18.1-vs2 + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/cvirt.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/cvirt.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/cvirt.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/cvirt.c --- linux-2.6.18.1/kernel/vserver/cvirt.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/cvirt.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/cvirt.c 2006-09-20 17:01:45 +0200 @@ -0,0 +1,260 @@ +/* + * linux/kernel/vserver/cvirt.c @@ -15916,13 +16066,10 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/cvirt.c linux-2.6.18.1-vs2.0 + put_vx_info(vxi); + return (name ? 0 : -EFAULT); +} -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/cvirt_init.h linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/cvirt_init.h +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/cvirt_init.h linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/cvirt_init.h --- linux-2.6.18.1/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/cvirt_init.h 2006-09-20 17:01:45 +0200 -@@ -0,0 +1,81 @@ -+ -+ -+#include <linux/config.h> ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/cvirt_init.h 2006-10-29 05:06:18 +0100 +@@ -0,0 +1,78 @@ + + +extern uint64_t vx_idle_jiffies(void); @@ -16001,9 +16148,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/cvirt_init.h linux-2.6.18.1- + return; +} + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/cvirt_proc.h linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/cvirt_proc.h +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/cvirt_proc.h linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/cvirt_proc.h --- linux-2.6.18.1/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/cvirt_proc.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/cvirt_proc.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,92 @@ +#ifndef _VX_CVIRT_PROC_H +#define _VX_CVIRT_PROC_H @@ -16097,9 +16244,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/cvirt_proc.h linux-2.6.18.1- +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/dlimit.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/dlimit.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/dlimit.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/dlimit.c --- linux-2.6.18.1/kernel/vserver/dlimit.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/dlimit.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/dlimit.c 2006-09-20 17:01:45 +0200 @@ -0,0 +1,548 @@ +/* + * linux/kernel/vserver/dlimit.c @@ -16649,9 +16796,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/dlimit.c linux-2.6.18.1-vs2. +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/helper.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/helper.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/helper.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/helper.c --- linux-2.6.18.1/kernel/vserver/helper.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/helper.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/helper.c 2006-09-20 17:01:45 +0200 @@ -0,0 +1,210 @@ +/* + * linux/kernel/vserver/helper.c @@ -16863,9 +17010,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/helper.c linux-2.6.18.1-vs2. + return 0; +} + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/history.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/history.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/history.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/history.c --- linux-2.6.18.1/kernel/vserver/history.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/history.c 2006-10-20 00:40:24 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/history.c 2006-10-20 00:40:24 +0200 @@ -0,0 +1,183 @@ +/* + * kernel/vserver/history.c @@ -17050,9 +17197,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/history.c linux-2.6.18.1-vs2 + +EXPORT_SYMBOL_GPL(vxh_advance); + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/init.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/init.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/init.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/init.c --- linux-2.6.18.1/kernel/vserver/init.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/init.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/init.c 2006-09-20 17:01:45 +0200 @@ -0,0 +1,43 @@ +/* + * linux/kernel/init.c @@ -17097,9 +17244,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/init.c linux-2.6.18.1-vs2.0. +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/inode.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/inode.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/inode.c --- linux-2.6.18.1/kernel/vserver/inode.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/inode.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/inode.c 2006-09-20 17:01:45 +0200 @@ -0,0 +1,368 @@ +/* + * linux/kernel/vserver/inode.c @@ -17469,9 +17616,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/inode.c linux-2.6.18.1-vs2.0 + +EXPORT_SYMBOL_GPL(vx_propagate_xid); + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/legacy.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/legacy.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/legacy.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/legacy.c --- linux-2.6.18.1/kernel/vserver/legacy.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/legacy.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/legacy.c 2006-09-20 17:01:45 +0200 @@ -0,0 +1,113 @@ +/* + * linux/kernel/vserver/legacy.c @@ -17586,9 +17733,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/legacy.c linux-2.6.18.1-vs2. + return ret; +} + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/legacynet.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/legacynet.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/legacynet.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/legacynet.c --- linux-2.6.18.1/kernel/vserver/legacynet.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/legacynet.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/legacynet.c 2006-09-20 17:01:45 +0200 @@ -0,0 +1,84 @@ + +/* @@ -17674,9 +17821,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/legacynet.c linux-2.6.18.1-v +} + + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/limit.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/limit.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/limit.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/limit.c --- linux-2.6.18.1/kernel/vserver/limit.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/limit.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/limit.c 2006-09-20 17:01:45 +0200 @@ -0,0 +1,238 @@ +/* + * linux/kernel/vserver/limit.c @@ -17916,13 +18063,10 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/limit.c linux-2.6.18.1-vs2.0 + return; +} + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/limit_init.h linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/limit_init.h +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/limit_init.h linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/limit_init.h --- linux-2.6.18.1/kernel/vserver/limit_init.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/limit_init.h 2006-09-20 17:01:45 +0200 -@@ -0,0 +1,32 @@ -+ -+ -+#include <linux/config.h> ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/limit_init.h 2006-10-29 05:06:18 +0100 +@@ -0,0 +1,29 @@ + + +static inline void vx_info_init_limit(struct _vx_limit *limit) @@ -17952,9 +18096,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/limit_init.h linux-2.6.18.1- +#endif +} + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/limit_proc.h linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/limit_proc.h +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/limit_proc.h linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/limit_proc.h --- linux-2.6.18.1/kernel/vserver/limit_proc.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/limit_proc.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/limit_proc.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,58 @@ +#ifndef _VX_LIMIT_PROC_H +#define _VX_LIMIT_PROC_H @@ -18014,9 +18158,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/limit_proc.h linux-2.6.18.1- +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/namespace.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/namespace.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/namespace.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/namespace.c --- linux-2.6.18.1/kernel/vserver/namespace.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/namespace.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/namespace.c 2006-09-20 17:01:45 +0200 @@ -0,0 +1,113 @@ +/* + * linux/kernel/vserver/namespace.c @@ -18131,9 +18275,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/namespace.c linux-2.6.18.1-v + return ret; +} + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/network.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/network.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/network.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/network.c --- linux-2.6.18.1/kernel/vserver/network.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/network.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/network.c 2006-09-20 17:01:45 +0200 @@ -0,0 +1,807 @@ +/* + * linux/kernel/vserver/network.c @@ -18942,9 +19086,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/network.c linux-2.6.18.1-vs2 +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/proc.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/proc.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/proc.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/proc.c --- linux-2.6.18.1/kernel/vserver/proc.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/proc.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/proc.c 2006-09-20 17:01:45 +0200 @@ -0,0 +1,860 @@ +/* + * linux/kernel/vserver/proc.c @@ -19806,9 +19950,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/proc.c linux-2.6.18.1-vs2.0. + return buffer - orig; +} + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sched.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/sched.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sched.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sched.c --- linux-2.6.18.1/kernel/vserver/sched.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/sched.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sched.c 2006-09-20 17:01:45 +0200 @@ -0,0 +1,217 @@ +/* + * linux/kernel/vserver/sched.c @@ -20027,13 +20171,14 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sched.c linux-2.6.18.1-vs2.0 + return 0; +} + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sched_init.h linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/sched_init.h +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sched_init.h linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sched_init.h --- linux-2.6.18.1/kernel/vserver/sched_init.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/sched_init.h 2006-10-20 00:57:38 +0200 -@@ -0,0 +1,30 @@ ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sched_init.h 2006-10-29 03:23:05 +0100 +@@ -0,0 +1,33 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) +{ ++ static struct lock_class_key tokens_lock_key; + int i; + + /* scheduling; hard code starting values as constants */ @@ -20044,6 +20189,8 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sched_init.h linux-2.6.18.1- + sched->jiffies = jiffies; + sched->tokens_lock = SPIN_LOCK_UNLOCKED; + ++ lockdep_set_class(&sched->tokens_lock, &tokens_lock_key); ++ + atomic_set(&sched->tokens, HZ >> 2); + sched->cpus_allowed = CPU_MASK_ALL; + sched->priority_bias = 0; @@ -20061,9 +20208,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sched_init.h linux-2.6.18.1- + return; +} + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sched_proc.h linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/sched_proc.h +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sched_proc.h linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sched_proc.h --- linux-2.6.18.1/kernel/vserver/sched_proc.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/sched_proc.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sched_proc.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,40 @@ +#ifndef _VX_SCHED_PROC_H +#define _VX_SCHED_PROC_H @@ -20105,9 +20252,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sched_proc.h linux-2.6.18.1- +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/signal.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/signal.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/signal.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/signal.c --- linux-2.6.18.1/kernel/vserver/signal.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/signal.c 2006-09-24 00:36:40 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/signal.c 2006-10-25 03:42:52 +0200 @@ -0,0 +1,139 @@ +/* + * linux/kernel/vserver/signal.c @@ -20248,9 +20395,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/signal.c linux-2.6.18.1-vs2. + return ret; +} + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/switch.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/switch.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/switch.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/switch.c --- linux-2.6.18.1/kernel/vserver/switch.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/switch.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/switch.c 2006-10-29 03:23:24 +0100 @@ -0,0 +1,268 @@ +/* + * linux/kernel/vserver/switch.c @@ -20493,7 +20640,7 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/switch.c linux-2.6.18.1-vs2. + return -ENOSYS; +} + -+extern asmlinkage long ++asmlinkage long +sys_vserver(uint32_t cmd, uint32_t id, void __user *data) +{ + long ret = do_vserver(cmd, id, data, 0); @@ -20507,7 +20654,7 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/switch.c linux-2.6.18.1-vs2. + +#ifdef CONFIG_COMPAT + -+extern asmlinkage long ++asmlinkage long +sys32_vserver(uint32_t cmd, uint32_t id, void __user *data) +{ + long ret = do_vserver(cmd, id, data, 1); @@ -20520,9 +20667,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/switch.c linux-2.6.18.1-vs2. +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sysctl.c linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/sysctl.c +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sysctl.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sysctl.c --- linux-2.6.18.1/kernel/vserver/sysctl.c 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/sysctl.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sysctl.c 2006-09-20 17:01:45 +0200 @@ -0,0 +1,227 @@ +/* + * kernel/vserver/sysctl.c @@ -20751,9 +20898,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sysctl.c linux-2.6.18.1-vs2. +EXPORT_SYMBOL_GPL(vx_debug_cvirt); +EXPORT_SYMBOL_GPL(vx_debug_misc); + -diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/vci_config.h linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/vci_config.h +diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/vci_config.h linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/vci_config.h --- linux-2.6.18.1/kernel/vserver/vci_config.h 1970-01-01 01:00:00 +0100 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/kernel/vserver/vci_config.h 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/vci_config.h 2006-09-20 17:01:45 +0200 @@ -0,0 +1,70 @@ + +enum { @@ -20825,9 +20972,9 @@ diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/vci_config.h linux-2.6.18.1- + 0; +} + -diff -NurpP --minimal linux-2.6.18.1/mm/filemap_xip.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/filemap_xip.c +diff -NurpP --minimal linux-2.6.18.1/mm/filemap_xip.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/filemap_xip.c --- linux-2.6.18.1/mm/filemap_xip.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/mm/filemap_xip.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/filemap_xip.c 2006-09-20 17:01:45 +0200 @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/uio.h> @@ -20836,9 +20983,9 @@ diff -NurpP --minimal linux-2.6.18.1/mm/filemap_xip.c linux-2.6.18.1-vs2.0.2.2-r #include <asm/tlbflush.h> #include "filemap.h" -diff -NurpP --minimal linux-2.6.18.1/mm/fremap.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/fremap.c +diff -NurpP --minimal linux-2.6.18.1/mm/fremap.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/fremap.c --- linux-2.6.18.1/mm/fremap.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/mm/fremap.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/fremap.c 2006-09-20 17:01:45 +0200 @@ -15,6 +15,7 @@ #include <linux/rmap.h> #include <linux/module.h> @@ -20856,9 +21003,9 @@ diff -NurpP --minimal linux-2.6.18.1/mm/fremap.c linux-2.6.18.1-vs2.0.2.2-rc3/mm if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte)) inc_mm_counter(mm, file_rss); -diff -NurpP --minimal linux-2.6.18.1/mm/hugetlb.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/hugetlb.c +diff -NurpP --minimal linux-2.6.18.1/mm/hugetlb.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/hugetlb.c --- linux-2.6.18.1/mm/hugetlb.c 2006-09-20 16:58:44 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/mm/hugetlb.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/hugetlb.c 2006-09-20 17:01:45 +0200 @@ -19,6 +19,7 @@ #include <asm/pgtable.h> @@ -20867,9 +21014,9 @@ diff -NurpP --minimal linux-2.6.18.1/mm/hugetlb.c linux-2.6.18.1-vs2.0.2.2-rc3/m #include "internal.h" const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL; -diff -NurpP --minimal linux-2.6.18.1/mm/memory.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/memory.c +diff -NurpP --minimal linux-2.6.18.1/mm/memory.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/memory.c --- linux-2.6.18.1/mm/memory.c 2006-09-20 16:58:45 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/mm/memory.c 2006-09-20 17:22:18 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/memory.c 2006-09-20 17:22:18 +0200 @@ -1958,6 +1958,11 @@ static int do_swap_page(struct mm_struct grab_swap_token(); } @@ -20901,9 +21048,9 @@ diff -NurpP --minimal linux-2.6.18.1/mm/memory.c linux-2.6.18.1-vs2.0.2.2-rc3/mm new_page = vma->vm_ops->nopage(vma, address & PAGE_MASK, &ret); /* * No smp_rmb is needed here as long as there's a full -diff -NurpP --minimal linux-2.6.18.1/mm/mlock.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/mlock.c +diff -NurpP --minimal linux-2.6.18.1/mm/mlock.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/mlock.c --- linux-2.6.18.1/mm/mlock.c 2006-04-09 13:49:58 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/mm/mlock.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/mlock.c 2006-09-20 17:01:45 +0200 @@ -10,6 +10,7 @@ #include <linux/mm.h> #include <linux/mempolicy.h> @@ -20960,9 +21107,9 @@ diff -NurpP --minimal linux-2.6.18.1/mm/mlock.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/ if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || capable(CAP_IPC_LOCK)) ret = do_mlockall(flags); -diff -NurpP --minimal linux-2.6.18.1/mm/mmap.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/mmap.c +diff -NurpP --minimal linux-2.6.18.1/mm/mmap.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/mmap.c --- linux-2.6.18.1/mm/mmap.c 2006-09-20 16:58:45 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/mm/mmap.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/mmap.c 2006-09-20 17:01:45 +0200 @@ -1137,10 +1137,10 @@ munmap_back: kmem_cache_free(vm_area_cachep, vma); } @@ -21061,9 +21208,9 @@ diff -NurpP --minimal linux-2.6.18.1/mm/mmap.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/m + return 0; return 1; } -diff -NurpP --minimal linux-2.6.18.1/mm/mremap.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/mremap.c +diff -NurpP --minimal linux-2.6.18.1/mm/mremap.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/mremap.c --- linux-2.6.18.1/mm/mremap.c 2006-09-20 16:58:45 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/mm/mremap.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/mremap.c 2006-09-20 17:01:45 +0200 @@ -18,6 +18,7 @@ #include <linux/highmem.h> #include <linux/security.h> @@ -21113,9 +21260,9 @@ diff -NurpP --minimal linux-2.6.18.1/mm/mremap.c linux-2.6.18.1-vs2.0.2.2-rc3/mm make_pages_present(addr + old_len, addr + new_len); } -diff -NurpP --minimal linux-2.6.18.1/mm/nommu.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/nommu.c +diff -NurpP --minimal linux-2.6.18.1/mm/nommu.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/nommu.c --- linux-2.6.18.1/mm/nommu.c 2006-09-20 16:58:45 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/mm/nommu.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/nommu.c 2006-09-20 17:01:45 +0200 @@ -820,7 +820,7 @@ unsigned long do_mmap_pgoff(struct file realalloc += kobjsize(vma); askedalloc += sizeof(*vma); @@ -21143,9 +21290,9 @@ diff -NurpP --minimal linux-2.6.18.1/mm/nommu.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/ while ((tmp = mm->context.vmlist)) { mm->context.vmlist = tmp->next; -diff -NurpP --minimal linux-2.6.18.1/mm/oom_kill.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/oom_kill.c +diff -NurpP --minimal linux-2.6.18.1/mm/oom_kill.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/oom_kill.c --- linux-2.6.18.1/mm/oom_kill.c 2006-09-20 16:58:45 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/mm/oom_kill.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/oom_kill.c 2006-09-20 17:01:45 +0200 @@ -67,6 +67,8 @@ unsigned long badness(struct task_struct */ task_unlock(p); @@ -21155,9 +21302,9 @@ diff -NurpP --minimal linux-2.6.18.1/mm/oom_kill.c linux-2.6.18.1-vs2.0.2.2-rc3/ /* * Processes which fork a lot of child processes are likely * a good choice. We add half the vmsize of the children if they -diff -NurpP --minimal linux-2.6.18.1/mm/page_alloc.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/page_alloc.c +diff -NurpP --minimal linux-2.6.18.1/mm/page_alloc.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/page_alloc.c --- linux-2.6.18.1/mm/page_alloc.c 2006-10-17 03:21:24 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/mm/page_alloc.c 2006-10-16 18:56:11 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/page_alloc.c 2006-10-16 18:56:11 +0200 @@ -37,6 +37,7 @@ #include <linux/vmalloc.h> #include <linux/mempolicy.h> @@ -21184,9 +21331,9 @@ diff -NurpP --minimal linux-2.6.18.1/mm/page_alloc.c linux-2.6.18.1-vs2.0.2.2-rc } #endif -diff -NurpP --minimal linux-2.6.18.1/mm/rmap.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/rmap.c +diff -NurpP --minimal linux-2.6.18.1/mm/rmap.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/rmap.c --- linux-2.6.18.1/mm/rmap.c 2006-09-20 16:58:45 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/mm/rmap.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/rmap.c 2006-09-20 17:01:45 +0200 @@ -53,6 +53,7 @@ #include <linux/rmap.h> #include <linux/rcupdate.h> @@ -21195,9 +21342,9 @@ diff -NurpP --minimal linux-2.6.18.1/mm/rmap.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/r #include <asm/tlbflush.h> -diff -NurpP --minimal linux-2.6.18.1/mm/shmem.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/shmem.c +diff -NurpP --minimal linux-2.6.18.1/mm/shmem.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/shmem.c --- linux-2.6.18.1/mm/shmem.c 2006-09-20 16:58:45 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/mm/shmem.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/shmem.c 2006-09-20 17:01:45 +0200 @@ -51,7 +51,6 @@ #include <asm/pgtable.h> @@ -21224,9 +21371,9 @@ diff -NurpP --minimal linux-2.6.18.1/mm/shmem.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/ sb->s_op = &shmem_ops; sb->s_time_gran = 1; -diff -NurpP --minimal linux-2.6.18.1/mm/swapfile.c linux-2.6.18.1-vs2.0.2.2-rc3/mm/swapfile.c +diff -NurpP --minimal linux-2.6.18.1/mm/swapfile.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/swapfile.c --- linux-2.6.18.1/mm/swapfile.c 2006-09-20 16:58:45 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/mm/swapfile.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/swapfile.c 2006-09-20 17:01:45 +0200 @@ -31,6 +31,7 @@ #include <asm/pgtable.h> #include <asm/tlbflush.h> @@ -21244,9 +21391,9 @@ diff -NurpP --minimal linux-2.6.18.1/mm/swapfile.c linux-2.6.18.1-vs2.0.2.2-rc3/ } /* -diff -NurpP --minimal linux-2.6.18.1/net/core/dev.c linux-2.6.18.1-vs2.0.2.2-rc3/net/core/dev.c +diff -NurpP --minimal linux-2.6.18.1/net/core/dev.c linux-2.6.18.1-vs2.0.2.2-rc4/net/core/dev.c --- linux-2.6.18.1/net/core/dev.c 2006-10-17 03:21:24 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/core/dev.c 2006-10-16 18:56:11 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/core/dev.c 2006-10-16 18:56:11 +0200 @@ -117,6 +117,7 @@ #include <linux/dmaengine.h> #include <linux/err.h> @@ -21276,9 +21423,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/core/dev.c linux-2.6.18.1-vs2.0.2.2-rc3 if (dev->get_stats) { struct net_device_stats *stats = dev->get_stats(dev); -diff -NurpP --minimal linux-2.6.18.1/net/core/rtnetlink.c linux-2.6.18.1-vs2.0.2.2-rc3/net/core/rtnetlink.c +diff -NurpP --minimal linux-2.6.18.1/net/core/rtnetlink.c linux-2.6.18.1-vs2.0.2.2-rc4/net/core/rtnetlink.c --- linux-2.6.18.1/net/core/rtnetlink.c 2006-09-20 16:58:50 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/core/rtnetlink.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/core/rtnetlink.c 2006-09-20 17:01:45 +0200 @@ -322,6 +322,9 @@ static int rtnetlink_dump_ifinfo(struct for (dev=dev_base, idx=0; dev; dev = dev->next, idx++) { if (idx < s_idx) @@ -21299,9 +21446,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/core/rtnetlink.c linux-2.6.18.1-vs2.0.2 skb = alloc_skb(size, GFP_KERNEL); if (!skb) return; -diff -NurpP --minimal linux-2.6.18.1/net/core/sock.c linux-2.6.18.1-vs2.0.2.2-rc3/net/core/sock.c +diff -NurpP --minimal linux-2.6.18.1/net/core/sock.c linux-2.6.18.1-vs2.0.2.2-rc4/net/core/sock.c --- linux-2.6.18.1/net/core/sock.c 2006-09-20 16:58:50 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/core/sock.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/core/sock.c 2006-09-20 17:01:45 +0200 @@ -124,6 +124,9 @@ #include <linux/ipsec.h> @@ -21367,9 +21514,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/core/sock.c linux-2.6.18.1-vs2.0.2.2-rc atomic_set(&sk->sk_refcnt, 1); } -diff -NurpP --minimal linux-2.6.18.1/net/ipv4/af_inet.c linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/af_inet.c +diff -NurpP --minimal linux-2.6.18.1/net/ipv4/af_inet.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/af_inet.c --- linux-2.6.18.1/net/ipv4/af_inet.c 2006-09-20 16:58:50 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/af_inet.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/af_inet.c 2006-09-20 17:01:45 +0200 @@ -115,6 +115,7 @@ #ifdef CONFIG_IP_MROUTE #include <linux/mroute.h> @@ -21463,9 +21610,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/ipv4/af_inet.c linux-2.6.18.1-vs2.0.2.2 if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) inet->saddr = 0; /* Use device */ -diff -NurpP --minimal linux-2.6.18.1/net/ipv4/devinet.c linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/devinet.c +diff -NurpP --minimal linux-2.6.18.1/net/ipv4/devinet.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/devinet.c --- linux-2.6.18.1/net/ipv4/devinet.c 2006-09-20 16:58:50 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/devinet.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/devinet.c 2006-09-20 17:01:45 +0200 @@ -606,6 +606,9 @@ int devinet_ioctl(unsigned int cmd, void *colon = ':'; @@ -21527,9 +21674,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/ipv4/devinet.c linux-2.6.18.1-vs2.0.2.2 if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid, -diff -NurpP --minimal linux-2.6.18.1/net/ipv4/fib_hash.c linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/fib_hash.c +diff -NurpP --minimal linux-2.6.18.1/net/ipv4/fib_hash.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/fib_hash.c --- linux-2.6.18.1/net/ipv4/fib_hash.c 2006-09-20 16:58:50 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/fib_hash.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/fib_hash.c 2006-09-20 17:01:45 +0200 @@ -987,6 +987,8 @@ static unsigned fib_flag_trans(int type, return flags; } @@ -21549,9 +21696,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/ipv4/fib_hash.c linux-2.6.18.1-vs2.0.2. snprintf(bf, sizeof(bf), "%s\t%08X\t%08X\t%04X\t%d\t%u\t%d\t%08X\t%d\t%u\t%u", fi->fib_dev ? fi->fib_dev->name : "*", prefix, -diff -NurpP --minimal linux-2.6.18.1/net/ipv4/inet_connection_sock.c linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/inet_connection_sock.c +diff -NurpP --minimal linux-2.6.18.1/net/ipv4/inet_connection_sock.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/inet_connection_sock.c --- linux-2.6.18.1/net/ipv4/inet_connection_sock.c 2006-09-20 16:58:50 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/inet_connection_sock.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/inet_connection_sock.c 2006-09-20 17:01:45 +0200 @@ -39,7 +39,6 @@ int sysctl_local_port_range[2] = { 1024, int inet_csk_bind_conflict(const struct sock *sk, const struct inet_bind_bucket *tb) @@ -21572,9 +21719,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/ipv4/inet_connection_sock.c linux-2.6.1 break; } } -diff -NurpP --minimal linux-2.6.18.1/net/ipv4/inet_diag.c linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/inet_diag.c +diff -NurpP --minimal linux-2.6.18.1/net/ipv4/inet_diag.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/inet_diag.c --- linux-2.6.18.1/net/ipv4/inet_diag.c 2006-09-20 16:58:50 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/inet_diag.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/inet_diag.c 2006-09-20 17:01:45 +0200 @@ -693,6 +693,8 @@ static int inet_diag_dump(struct sk_buff sk_for_each(sk, node, &hashinfo->listening_hash[i]) { struct inet_sock *inet = inet_sk(sk); @@ -21602,9 +21749,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/ipv4/inet_diag.c linux-2.6.18.1-vs2.0.2 if (num < s_num) goto next_dying; if (r->id.idiag_sport != tw->tw_sport && -diff -NurpP --minimal linux-2.6.18.1/net/ipv4/inet_hashtables.c linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/inet_hashtables.c +diff -NurpP --minimal linux-2.6.18.1/net/ipv4/inet_hashtables.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/inet_hashtables.c --- linux-2.6.18.1/net/ipv4/inet_hashtables.c 2006-09-20 16:58:50 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/inet_hashtables.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/inet_hashtables.c 2006-09-20 17:01:45 +0200 @@ -138,11 +138,10 @@ struct sock *__inet_lookup_listener(cons const __u32 rcv_saddr = inet->rcv_saddr; int score = sk->sk_family == PF_INET ? 1 : 0; @@ -21620,9 +21767,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/ipv4/inet_hashtables.c linux-2.6.18.1-v if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) continue; -diff -NurpP --minimal linux-2.6.18.1/net/ipv4/raw.c linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/raw.c +diff -NurpP --minimal linux-2.6.18.1/net/ipv4/raw.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/raw.c --- linux-2.6.18.1/net/ipv4/raw.c 2006-09-20 16:58:50 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/raw.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/raw.c 2006-09-20 17:01:45 +0200 @@ -102,6 +102,27 @@ static void raw_v4_unhash(struct sock *s write_unlock_bh(&raw_v4_lock); } @@ -21714,9 +21861,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/ipv4/raw.c linux-2.6.18.1-vs2.0.2.2-rc3 if (!sk && ++state->bucket < RAWV4_HTABLE_SIZE) { sk = sk_head(&raw_v4_htable[state->bucket]); -diff -NurpP --minimal linux-2.6.18.1/net/ipv4/tcp.c linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/tcp.c +diff -NurpP --minimal linux-2.6.18.1/net/ipv4/tcp.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/tcp.c --- linux-2.6.18.1/net/ipv4/tcp.c 2006-09-20 16:58:50 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/tcp.c 2006-09-20 17:02:28 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/tcp.c 2006-09-20 17:02:28 +0200 @@ -258,6 +258,7 @@ #include <linux/bootmem.h> #include <linux/cache.h> @@ -21725,9 +21872,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/ipv4/tcp.c linux-2.6.18.1-vs2.0.2.2-rc3 #include <net/icmp.h> #include <net/tcp.h> -diff -NurpP --minimal linux-2.6.18.1/net/ipv4/tcp_ipv4.c linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/tcp_ipv4.c +diff -NurpP --minimal linux-2.6.18.1/net/ipv4/tcp_ipv4.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/tcp_ipv4.c --- linux-2.6.18.1/net/ipv4/tcp_ipv4.c 2006-09-20 16:58:50 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/tcp_ipv4.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/tcp_ipv4.c 2006-09-20 17:01:45 +0200 @@ -77,6 +77,7 @@ #include <linux/stddef.h> #include <linux/proc_fs.h> @@ -21813,9 +21960,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/ipv4/tcp_ipv4.c linux-2.6.18.1-vs2.0.2. if (sk->sk_family == st->family) goto found; } -diff -NurpP --minimal linux-2.6.18.1/net/ipv4/tcp_minisocks.c linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/tcp_minisocks.c +diff -NurpP --minimal linux-2.6.18.1/net/ipv4/tcp_minisocks.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/tcp_minisocks.c --- linux-2.6.18.1/net/ipv4/tcp_minisocks.c 2006-09-20 16:58:51 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/tcp_minisocks.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/tcp_minisocks.c 2006-09-20 17:01:45 +0200 @@ -28,6 +28,10 @@ #include <net/inet_common.h> #include <net/xfrm.h> @@ -21839,9 +21986,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/ipv4/tcp_minisocks.c linux-2.6.18.1-vs2 #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.18.1/net/ipv4/udp.c linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/udp.c +diff -NurpP --minimal linux-2.6.18.1/net/ipv4/udp.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/udp.c --- linux-2.6.18.1/net/ipv4/udp.c 2006-09-20 16:58:51 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv4/udp.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/udp.c 2006-09-20 17:01:45 +0200 @@ -175,14 +175,12 @@ gotit: struct inet_sock *inet2 = inet_sk(sk2); @@ -21924,9 +22071,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/ipv4/udp.c linux-2.6.18.1-vs2.0.2.2-rc3 if (!sk && ++state->bucket < UDP_HTABLE_SIZE) { sk = sk_head(&udp_hash[state->bucket]); -diff -NurpP --minimal linux-2.6.18.1/net/ipv6/addrconf.c linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv6/addrconf.c +diff -NurpP --minimal linux-2.6.18.1/net/ipv6/addrconf.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv6/addrconf.c --- linux-2.6.18.1/net/ipv6/addrconf.c 2006-09-20 16:58:51 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/ipv6/addrconf.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv6/addrconf.c 2006-09-20 17:01:45 +0200 @@ -2698,7 +2698,10 @@ static void if6_seq_stop(struct seq_file static int if6_seq_show(struct seq_file *seq, void *v) { @@ -21961,9 +22108,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/ipv6/addrconf.c linux-2.6.18.1-vs2.0.2. read_lock(&dev_base_lock); for (dev=dev_base, idx=0; dev; dev = dev->next, idx++) { if (idx < s_idx) -diff -NurpP --minimal linux-2.6.18.1/net/netlink/af_netlink.c linux-2.6.18.1-vs2.0.2.2-rc3/net/netlink/af_netlink.c +diff -NurpP --minimal linux-2.6.18.1/net/netlink/af_netlink.c linux-2.6.18.1-vs2.0.2.2-rc4/net/netlink/af_netlink.c --- linux-2.6.18.1/net/netlink/af_netlink.c 2006-09-20 16:58:51 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/netlink/af_netlink.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/netlink/af_netlink.c 2006-09-20 17:01:45 +0200 @@ -56,6 +56,9 @@ #include <linux/types.h> #include <linux/audit.h> @@ -21974,9 +22121,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/netlink/af_netlink.c linux-2.6.18.1-vs2 #include <net/sock.h> #include <net/scm.h> -diff -NurpP --minimal linux-2.6.18.1/net/socket.c linux-2.6.18.1-vs2.0.2.2-rc3/net/socket.c +diff -NurpP --minimal linux-2.6.18.1/net/socket.c linux-2.6.18.1-vs2.0.2.2-rc4/net/socket.c --- linux-2.6.18.1/net/socket.c 2006-09-20 16:58:54 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/socket.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/socket.c 2006-09-20 17:01:45 +0200 @@ -93,6 +93,7 @@ #include <net/sock.h> @@ -22077,9 +22224,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/socket.c linux-2.6.18.1-vs2.0.2.2-rc3/n err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-2.6.18.1/net/sunrpc/auth.c linux-2.6.18.1-vs2.0.2.2-rc3/net/sunrpc/auth.c +diff -NurpP --minimal linux-2.6.18.1/net/sunrpc/auth.c linux-2.6.18.1-vs2.0.2.2-rc4/net/sunrpc/auth.c --- linux-2.6.18.1/net/sunrpc/auth.c 2006-06-18 04:55:52 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/sunrpc/auth.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/sunrpc/auth.c 2006-09-20 17:01:45 +0200 @@ -13,6 +13,7 @@ #include <linux/errno.h> #include <linux/sunrpc/clnt.h> @@ -22104,9 +22251,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/sunrpc/auth.c linux-2.6.18.1-vs2.0.2.2- .group_info = current->group_info, }; struct rpc_cred *ret; -diff -NurpP --minimal linux-2.6.18.1/net/sunrpc/auth_unix.c linux-2.6.18.1-vs2.0.2.2-rc3/net/sunrpc/auth_unix.c +diff -NurpP --minimal linux-2.6.18.1/net/sunrpc/auth_unix.c linux-2.6.18.1-vs2.0.2.2-rc4/net/sunrpc/auth_unix.c --- linux-2.6.18.1/net/sunrpc/auth_unix.c 2006-09-20 16:58:54 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/sunrpc/auth_unix.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/sunrpc/auth_unix.c 2006-09-20 17:01:45 +0200 @@ -11,12 +11,14 @@ #include <linux/module.h> #include <linux/sunrpc/clnt.h> @@ -22172,9 +22319,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/sunrpc/auth_unix.c linux-2.6.18.1-vs2.0 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.18.1/net/unix/af_unix.c linux-2.6.18.1-vs2.0.2.2-rc3/net/unix/af_unix.c +diff -NurpP --minimal linux-2.6.18.1/net/unix/af_unix.c linux-2.6.18.1-vs2.0.2.2-rc4/net/unix/af_unix.c --- linux-2.6.18.1/net/unix/af_unix.c 2006-09-20 16:58:54 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/unix/af_unix.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/unix/af_unix.c 2006-09-20 17:01:45 +0200 @@ -116,6 +116,9 @@ #include <linux/mount.h> #include <net/checksum.h> @@ -22203,9 +22350,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/unix/af_unix.c linux-2.6.18.1-vs2.0.2.2 if (err) goto out_mknod_dput; mutex_unlock(&nd.dentry->d_inode->i_mutex); -diff -NurpP --minimal linux-2.6.18.1/net/x25/af_x25.c linux-2.6.18.1-vs2.0.2.2-rc3/net/x25/af_x25.c +diff -NurpP --minimal linux-2.6.18.1/net/x25/af_x25.c linux-2.6.18.1-vs2.0.2.2-rc4/net/x25/af_x25.c --- linux-2.6.18.1/net/x25/af_x25.c 2006-09-20 16:58:54 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/net/x25/af_x25.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/net/x25/af_x25.c 2006-09-20 17:01:45 +0200 @@ -501,7 +501,10 @@ static int x25_create(struct socket *soc x25 = x25_sk(sk); @@ -22218,9 +22365,9 @@ diff -NurpP --minimal linux-2.6.18.1/net/x25/af_x25.c linux-2.6.18.1-vs2.0.2.2-r x25_init_timers(sk); -diff -NurpP --minimal linux-2.6.18.1/security/commoncap.c linux-2.6.18.1-vs2.0.2.2-rc3/security/commoncap.c +diff -NurpP --minimal linux-2.6.18.1/security/commoncap.c linux-2.6.18.1-vs2.0.2.2-rc4/security/commoncap.c --- linux-2.6.18.1/security/commoncap.c 2006-09-20 16:58:54 +0200 -+++ linux-2.6.18.1-vs2.0.2.2-rc3/security/commoncap.c 2006-09-20 17:01:45 +0200 ++++ linux-2.6.18.1-vs2.0.2.2-rc4/security/commoncap.c 2006-09-20 17:01:45 +0200 @@ -142,7 +142,7 @@ void cap_bprm_apply_creds (struct linux_ /* Derived from fs/exec.c:compute_creds. */ kernel_cap_t new_permitted, working; diff --git a/debian/patches/series/3-extra b/debian/patches/series/3-extra index 06c04f63f9fa..c81a4d594b4e 100644 --- a/debian/patches/series/3-extra +++ b/debian/patches/series/3-extra @@ -1,5 +1 @@ + hppa-fix-cross-compile.patch hppa -+ features/all/vserver/vs2.0.2.2-rc3.patch *_vserver *_xen-vserver -+ features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver -+ features/all/xen/vserver-clash.patch *_xen-vserver -+ features/all/xen/fedora-36252.patch *_xen *_xen-vserver diff --git a/debian/patches/series/4-extra b/debian/patches/series/4-extra new file mode 100644 index 000000000000..f2f60c24ff6c --- /dev/null +++ b/debian/patches/series/4-extra @@ -0,0 +1,4 @@ ++ features/all/vserver/vs2.0.2.2-rc4.patch *_vserver *_xen-vserver ++ features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver ++ features/all/xen/vserver-clash.patch *_xen-vserver ++ features/all/xen/fedora-36252.patch *_xen *_xen-vserver |