[kernel] r7885 - in dists/sid/linux-2.6/debian: .
patches/features/all/vserver patches/series
Bastian Blank
waldi at alioth.debian.org
Sun Nov 26 09:44:46 UTC 2006
Author: waldi
Date: Sun Nov 26 10:44:45 2006
New Revision: 7885
Added:
dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc8.patch
- copied, changed from r7815, dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc6.patch
dists/sid/linux-2.6/debian/patches/series/7-extra
- copied, changed from r7815, dists/sid/linux-2.6/debian/patches/series/5-extra
Removed:
dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc6.patch
dists/sid/linux-2.6/debian/patches/series/5-extra
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/features/all/vserver/gen-patch
Log:
Update vserver patch to 2.0.2.2-rc8.
* debian/changelog: Update.
* debian/patches/features/all/vserver/gen-patch: Remove some non-diff lines.
* debian/patches/features/all/vserver/vs2.0.2.2-rc6.patch: Remove.
* debian/patches/features/all/vserver/vs2.0.2.2-rc8.patch: Add.
* debian/patches/series/5-extra: Remove.
* debian/patches/series/7-extra: Add, move infos from 5-extra.
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog (original)
+++ dists/sid/linux-2.6/debian/changelog Sun Nov 26 10:44:45 2006
@@ -1,8 +1,9 @@
linux-2.6 (2.6.18-7) UNRELEASED; urgency=low
- * Emit conflict lines for initramfs generators. (closes: #400305)
+ * Emit conflict lines for initramfs generators. (closes: #400305)
+ * Update vserver patch to 2.0.2.2-rc8.
- -- Bastian Blank <waldi at debian.org> Sat, 25 Nov 2006 17:53:24 +0100
+ -- Bastian Blank <waldi at debian.org> Sun, 26 Nov 2006 10:39:33 +0100
linux-2.6 (2.6.18-6) unstable; urgency=low
Modified: dists/sid/linux-2.6/debian/patches/features/all/vserver/gen-patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/vserver/gen-patch (original)
+++ dists/sid/linux-2.6/debian/patches/features/all/vserver/gen-patch Sun Nov 26 10:44:45 2006
@@ -11,4 +11,4 @@
file="$(dirname $0)/$version.patch"
-filterdiff -p 1 -x Makefile -x init/version.c "$patch" > "$file"
+filterdiff -p 1 -x Makefile -x init/version.c "$patch" | grep -v "^diff" > "$file"
Copied: dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc8.patch (from r7815, dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc6.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc6.patch (original)
+++ dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc8.patch Sun Nov 26 10:44:45 2006
@@ -1,6 +1,5 @@
-diff -NurpP --minimal linux-2.6.18.2/arch/alpha/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/alpha/Kconfig
---- linux-2.6.18.2/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/alpha/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 +9,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/entry.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/alpha/kernel/entry.S
---- linux-2.6.18.2/arch/alpha/kernel/entry.S 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/alpha/kernel/entry.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/alpha/kernel/entry.S 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 +43,8 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/osf_sys.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/alpha/kernel/osf_sys.c
---- linux-2.6.18.2/arch/alpha/kernel/osf_sys.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/alpha/kernel/osf_sys.c 2006-09-20 20:11:48 +0200
+--- linux-2.6.18.3/arch/alpha/kernel/osf_sys.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 +144,8 @@
len = strlen(res)+1;
if (len > count)
len = count;
-diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/alpha/kernel/ptrace.c
---- linux-2.6.18.2/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/alpha/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 +158,8 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/systbls.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/alpha/kernel/systbls.S
---- linux-2.6.18.2/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/alpha/kernel/systbls.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 +169,8 @@
.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.2/arch/alpha/mm/init.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/alpha/mm/init.c
---- linux-2.6.18.2/arch/alpha/mm/init.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/alpha/mm/init.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/alpha/mm/init.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 +179,8 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.18.2/arch/arm/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/arm/Kconfig
---- linux-2.6.18.2/arch/arm/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/arm/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/arm/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 +190,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/arm/kernel/calls.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/arm/kernel/calls.S
---- linux-2.6.18.2/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/arm/kernel/calls.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 +201,8 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.18.2/arch/arm/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/arm/kernel/irq.c
---- linux-2.6.18.2/arch/arm/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/arm/kernel/irq.c 2006-11-07 18:55:37 +0100
+--- linux-2.6.18.3/arch/arm/kernel/irq.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/arm/kernel/irq.c 2006-11-07 18:55:37 +0100
@@ -37,6 +37,7 @@
#include <linux/list.h>
#include <linux/kallsyms.h>
@@ -245,9 +236,8 @@
irq_exit();
}
-diff -NurpP --minimal linux-2.6.18.2/arch/arm26/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/arm26/Kconfig
---- linux-2.6.18.2/arch/arm26/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/arm26/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/arm26/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/arm26/Kconfig 2006-09-20 17:01:44 +0200
@@ -234,6 +234,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -257,9 +247,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/arm26/kernel/calls.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/arm26/kernel/calls.S
---- linux-2.6.18.2/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/arm26/kernel/calls.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/arm26/kernel/calls.S 2006-09-20 17:01:44 +0200
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -272,9 +261,8 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.18.2/arch/arm26/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/arm26/kernel/irq.c
---- linux-2.6.18.2/arch/arm26/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/arm26/kernel/irq.c 2006-11-07 19:00:31 +0100
+--- linux-2.6.18.3/arch/arm26/kernel/irq.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/arm26/kernel/irq.c 2006-11-07 19:00:31 +0100
@@ -31,6 +31,7 @@
#include <linux/init.h>
#include <linux/seq_file.h>
@@ -301,9 +289,8 @@
spin_unlock(&irq_controller_lock);
irq_exit();
}
-diff -NurpP --minimal linux-2.6.18.2/arch/arm26/kernel/traps.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/arm26/kernel/traps.c
---- linux-2.6.18.2/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/arm26/kernel/traps.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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());
@@ -316,9 +303,8 @@
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.18.2/arch/cris/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/cris/Kconfig
---- linux-2.6.18.2/arch/cris/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/cris/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/cris/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/cris/Kconfig 2006-09-20 17:01:44 +0200
@@ -185,6 +185,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -328,9 +314,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/cris/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/cris/kernel/irq.c
---- linux-2.6.18.2/arch/cris/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/cris/kernel/irq.c 2006-11-07 18:59:56 +0100
+--- linux-2.6.18.3/arch/cris/kernel/irq.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/cris/kernel/irq.c 2006-11-07 18:59:56 +0100
@@ -92,6 +92,7 @@ skip:
asmlinkage void do_IRQ(int irq, struct pt_regs * regs)
{
@@ -339,9 +324,8 @@
irq_enter();
sp = rdsp();
if (unlikely((sp & (PAGE_SIZE - 1)) < (PAGE_SIZE/8))) {
-diff -NurpP --minimal linux-2.6.18.2/arch/frv/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/frv/kernel/irq.c
---- linux-2.6.18.2/arch/frv/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/frv/kernel/irq.c 2006-10-17 02:35:27 +0200
+--- linux-2.6.18.3/arch/frv/kernel/irq.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -369,9 +353,8 @@
__clr_MASK(level);
-diff -NurpP --minimal linux-2.6.18.2/arch/h8300/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/h8300/Kconfig
---- linux-2.6.18.2/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/h8300/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/h8300/Kconfig 2006-09-20 17:01:44 +0200
@@ -199,6 +199,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -381,9 +364,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/h8300/kernel/ints.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/h8300/kernel/ints.c
---- linux-2.6.18.2/arch/h8300/kernel/ints.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/h8300/kernel/ints.c 2006-11-07 19:03:38 +0100
+--- linux-2.6.18.3/arch/h8300/kernel/ints.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/h8300/kernel/ints.c 2006-11-07 19:03:38 +0100
@@ -23,6 +23,7 @@
#include <linux/random.h>
#include <linux/bootmem.h>
@@ -411,9 +393,8 @@
irq_exit();
}
-diff -NurpP --minimal linux-2.6.18.2/arch/h8300/platform/h8s/ints.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/h8300/platform/h8s/ints.c
---- linux-2.6.18.2/arch/h8300/platform/h8s/ints.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/h8300/platform/h8s/ints.c 2006-11-07 19:04:16 +0100
+--- linux-2.6.18.3/arch/h8300/platform/h8s/ints.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/h8300/platform/h8s/ints.c 2006-11-07 19:04:16 +0100
@@ -23,6 +23,7 @@
#include <linux/bootmem.h>
#include <linux/random.h>
@@ -443,9 +424,8 @@
irq_exit();
}
-diff -NurpP --minimal linux-2.6.18.2/arch/i386/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/i386/Kconfig
---- linux-2.6.18.2/arch/i386/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/i386/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/i386/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/i386/Kconfig 2006-09-20 17:01:44 +0200
@@ -1142,6 +1142,8 @@ endmenu
source "arch/i386/Kconfig.debug"
@@ -455,9 +435,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/i386/kernel/irq.c
---- linux-2.6.18.2/arch/i386/kernel/irq.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/i386/kernel/irq.c 2006-10-17 02:35:27 +0200
+--- linux-2.6.18.3/arch/i386/kernel/irq.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/i386/kernel/irq.c 2006-10-17 02:35:27 +0200
@@ -18,6 +18,7 @@
#include <linux/notifier.h>
#include <linux/cpu.h>
@@ -491,9 +470,8 @@
irq_exit();
-diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/sys_i386.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/i386/kernel/sys_i386.c
---- linux-2.6.18.2/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/i386/kernel/sys_i386.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -541,9 +519,8 @@
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/syscall_table.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/i386/kernel/syscall_table.S
---- linux-2.6.18.2/arch/i386/kernel/syscall_table.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/i386/kernel/syscall_table.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/i386/kernel/syscall_table.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -553,9 +530,8 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/sysenter.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/i386/kernel/sysenter.c
---- linux-2.6.18.2/arch/i386/kernel/sysenter.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/i386/kernel/sysenter.c 2006-09-20 21:46:26 +0200
+--- linux-2.6.18.3/arch/i386/kernel/sysenter.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/i386/kernel/sysenter.c 2006-09-20 21:46:26 +0200
@@ -17,6 +17,7 @@
#include <linux/elf.h>
#include <linux/mm.h>
@@ -573,9 +549,8 @@
up_fail:
up_write(&mm->mmap_sem);
return ret;
-diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/traps.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/i386/kernel/traps.c
---- linux-2.6.18.2/arch/i386/kernel/traps.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/i386/kernel/traps.c 2006-09-20 20:10:14 +0200
+--- linux-2.6.18.3/arch/i386/kernel/traps.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/i386/kernel/traps.c 2006-09-20 20:10:14 +0200
@@ -53,6 +53,7 @@
#include <asm/kdebug.h>
@@ -616,9 +591,8 @@
/* Executive summary in case the oops scrolled away */
esp = (unsigned long) (®s->esp);
savesegment(ss, ss);
-diff -NurpP --minimal linux-2.6.18.2/arch/ia64/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/Kconfig
---- linux-2.6.18.2/arch/ia64/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/ia64/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/ia64/Kconfig 2006-09-20 17:01:44 +0200
@@ -525,6 +525,8 @@ endmenu
source "arch/ia64/Kconfig.debug"
@@ -628,9 +602,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/ia64/ia32/binfmt_elf32.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.18.2/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -641,9 +614,8 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.18.2/arch/ia64/ia32/ia32_entry.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.18.2/arch/ia64/ia32/ia32_entry.S 2006-06-18 04:51:55 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/ia32/ia32_entry.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/ia64/ia32/ia32_entry.S 2006-06-18 04:51:55 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -653,9 +625,8 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.18.2/arch/ia64/kernel/entry.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/kernel/entry.S
---- linux-2.6.18.2/arch/ia64/kernel/entry.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/kernel/entry.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/ia64/kernel/entry.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -665,9 +636,8 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.18.2/arch/ia64/kernel/perfmon.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/kernel/perfmon.c
---- linux-2.6.18.2/arch/ia64/kernel/perfmon.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/kernel/perfmon.c 2006-10-18 01:19:40 +0200
+--- linux-2.6.18.3/arch/ia64/kernel/perfmon.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/ia64/kernel/perfmon.c 2006-10-18 01:19:40 +0200
@@ -40,6 +40,7 @@
#include <linux/capability.h>
#include <linux/rcupdate.h>
@@ -685,9 +655,8 @@
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.2/arch/ia64/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/kernel/ptrace.c
---- linux-2.6.18.2/arch/ia64/kernel/ptrace.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/kernel/ptrace.c 2006-10-18 01:19:40 +0200
+--- linux-2.6.18.3/arch/ia64/kernel/ptrace.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -698,9 +667,8 @@
ret = -EPERM;
if (pid == 1) /* no messing around with init! */
goto out_tsk;
-diff -NurpP --minimal linux-2.6.18.2/arch/ia64/mm/fault.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/mm/fault.c
---- linux-2.6.18.2/arch/ia64/mm/fault.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/mm/fault.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/ia64/mm/fault.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -709,9 +677,8 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.18.2/arch/ia64/sn/kernel/xpc_main.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/sn/kernel/xpc_main.c
---- linux-2.6.18.2/arch/ia64/sn/kernel/xpc_main.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/ia64/sn/kernel/xpc_main.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/ia64/sn/kernel/xpc_main.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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,
@@ -736,9 +703,8 @@
&sysctl_intvec,
NULL,
&xpc_disengage_request_min_timelimit,
-diff -NurpP --minimal linux-2.6.18.2/arch/m32r/kernel/sys_m32r.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/m32r/kernel/sys_m32r.c
---- linux-2.6.18.2/arch/m32r/kernel/sys_m32r.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/m32r/kernel/sys_m32r.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/m32r/kernel/sys_m32r.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -756,9 +722,8 @@
up_read(&uts_sem);
return err?-EFAULT:0;
}
-diff -NurpP --minimal linux-2.6.18.2/arch/m68k/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/m68k/Kconfig
---- linux-2.6.18.2/arch/m68k/Kconfig 2006-06-18 04:51:57 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/m68k/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/m68k/Kconfig 2006-06-18 04:51:57 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/m68k/Kconfig 2006-09-20 17:01:44 +0200
@@ -654,6 +654,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -768,9 +733,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/m68k/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/m68k/kernel/ptrace.c
---- linux-2.6.18.2/arch/m68k/kernel/ptrace.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/m68k/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/m68k/kernel/ptrace.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -780,9 +744,8 @@
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.18.2/arch/m68knommu/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/m68knommu/Kconfig
---- linux-2.6.18.2/arch/m68knommu/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/m68knommu/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/m68knommu/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/m68knommu/Kconfig 2006-09-20 17:01:44 +0200
@@ -663,6 +663,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -792,9 +755,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/mips/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/Kconfig
---- linux-2.6.18.2/arch/mips/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/mips/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/mips/Kconfig 2006-09-20 17:01:44 +0200
@@ -2057,6 +2057,8 @@ source "arch/mips/oprofile/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -804,9 +766,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/linux32.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/linux32.c
---- linux-2.6.18.2/arch/mips/kernel/linux32.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/linux32.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/mips/kernel/linux32.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/mips/kernel/linux32.c 2006-09-20 17:01:44 +0200
@@ -35,6 +35,7 @@
#include <linux/security.h>
#include <linux/compat.h>
@@ -824,9 +785,8 @@
ret = -EFAULT;
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/ptrace.c
---- linux-2.6.18.2/arch/mips/kernel/ptrace.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/ptrace.c 2006-11-06 05:10:07 +0100
+--- linux-2.6.18.3/arch/mips/kernel/ptrace.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/mips/kernel/ptrace.c 2006-11-06 05:10:07 +0100
@@ -171,6 +171,9 @@ long arch_ptrace(struct task_struct *chi
{
int ret;
@@ -837,9 +797,8 @@
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.2/arch/mips/kernel/scall32-o32.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/scall32-o32.S
---- linux-2.6.18.2/arch/mips/kernel/scall32-o32.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/scall32-o32.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/mips/kernel/scall32-o32.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 */
@@ -849,9 +808,8 @@
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.2/arch/mips/kernel/scall64-64.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/scall64-64.S
---- linux-2.6.18.2/arch/mips/kernel/scall64-64.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/scall64-64.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/mips/kernel/scall64-64.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -861,9 +819,8 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/scall64-n32.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/scall64-n32.S
---- linux-2.6.18.2/arch/mips/kernel/scall64-n32.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/scall64-n32.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/mips/kernel/scall64-n32.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -873,9 +830,8 @@
PTR sysn32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/scall64-o32.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/scall64-o32.S
---- linux-2.6.18.2/arch/mips/kernel/scall64-o32.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/scall64-o32.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/mips/kernel/scall64-o32.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 */
@@ -885,9 +841,8 @@
PTR sys32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/syscall.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/syscall.c
---- linux-2.6.18.2/arch/mips/kernel/syscall.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/syscall.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/mips/kernel/syscall.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/mips/kernel/syscall.c 2006-09-20 17:01:44 +0200
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/compiler.h>
@@ -934,9 +889,8 @@
error = __put_user(0,name->machine+__OLD_UTS_LEN);
error = error ? -EFAULT : 0;
-diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/sysirix.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/sysirix.c
---- linux-2.6.18.2/arch/mips/kernel/sysirix.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/mips/kernel/sysirix.c 2006-09-20 20:02:24 +0200
+--- linux-2.6.18.3/arch/mips/kernel/sysirix.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/mips/kernel/sysirix.c 2006-09-20 20:02:24 +0200
@@ -32,6 +32,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -971,9 +925,8 @@
return -EFAULT;
}
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.18.2/arch/parisc/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/parisc/Kconfig
---- linux-2.6.18.2/arch/parisc/Kconfig 2006-09-20 16:58:00 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/parisc/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/parisc/Kconfig 2006-09-20 16:58:00 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/parisc/Kconfig 2006-09-20 17:01:44 +0200
@@ -257,6 +257,8 @@ source "arch/parisc/oprofile/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -983,9 +936,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/parisc/hpux/sys_hpux.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/parisc/hpux/sys_hpux.c
---- linux-2.6.18.2/arch/parisc/hpux/sys_hpux.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/parisc/hpux/sys_hpux.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/parisc/hpux/sys_hpux.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -1053,9 +1005,8 @@
goto done;
err = 0;
done:
-diff -NurpP --minimal linux-2.6.18.2/arch/parisc/kernel/sys_parisc32.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/parisc/kernel/sys_parisc32.c
---- linux-2.6.18.2/arch/parisc/kernel/sys_parisc32.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/parisc/kernel/sys_parisc32.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/parisc/kernel/sys_parisc32.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/parisc/kernel/sys_parisc32.c 2006-09-20 17:01:44 +0200
@@ -598,6 +598,7 @@ asmlinkage int sys32_sysinfo(struct sysi
do {
@@ -1064,9 +1015,8 @@
val.uptime = jiffies / HZ;
val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
-diff -NurpP --minimal linux-2.6.18.2/arch/parisc/kernel/syscall_table.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/parisc/kernel/syscall_table.S
---- linux-2.6.18.2/arch/parisc/kernel/syscall_table.S 2006-06-18 04:52:15 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/parisc/kernel/syscall_table.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/parisc/kernel/syscall_table.S 2006-06-18 04:52:15 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -1076,9 +1026,8 @@
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.18.2/arch/powerpc/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/powerpc/Kconfig
---- linux-2.6.18.2/arch/powerpc/Kconfig 2006-11-04 19:43:22 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/powerpc/Kconfig 2006-11-06 04:47:17 +0100
+--- linux-2.6.18.3/arch/powerpc/Kconfig 2006-11-04 19:43:22 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/powerpc/Kconfig 2006-11-06 04:47:17 +0100
@@ -1078,6 +1078,8 @@ endmenu
source "arch/powerpc/Kconfig.debug"
@@ -1088,9 +1037,8 @@
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.18.2/arch/powerpc/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/powerpc/kernel/irq.c
---- linux-2.6.18.2/arch/powerpc/kernel/irq.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/powerpc/kernel/irq.c 2006-11-07 19:11:37 +0100
+--- linux-2.6.18.3/arch/powerpc/kernel/irq.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/powerpc/kernel/irq.c 2006-11-07 19:11:37 +0100
@@ -52,6 +52,7 @@
#include <linux/radix-tree.h>
#include <linux/mutex.h>
@@ -1125,9 +1073,8 @@
get_lppaca()->int_dword.fields.decr_int = 0;
/* Signal a fake decrementer interrupt */
timer_interrupt(regs);
-diff -NurpP --minimal linux-2.6.18.2/arch/powerpc/kernel/process.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/powerpc/kernel/process.c
---- linux-2.6.18.2/arch/powerpc/kernel/process.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/powerpc/kernel/process.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/powerpc/kernel/process.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -1140,9 +1087,8 @@
#ifdef CONFIG_SMP
printk(" CPU: %d", smp_processor_id());
-diff -NurpP --minimal linux-2.6.18.2/arch/powerpc/kernel/syscalls.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/powerpc/kernel/syscalls.c
---- linux-2.6.18.2/arch/powerpc/kernel/syscalls.c 2006-06-18 04:52:17 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/powerpc/kernel/syscalls.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/powerpc/kernel/syscalls.c 2006-06-18 04:52:17 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/powerpc/kernel/syscalls.c 2006-09-20 17:01:44 +0200
@@ -36,6 +36,7 @@
#include <linux/file.h>
#include <linux/init.h>
@@ -1202,9 +1148,8 @@
error |= override_machine(name->machine);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.18.2/arch/powerpc/kernel/vdso.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/powerpc/kernel/vdso.c
---- linux-2.6.18.2/arch/powerpc/kernel/vdso.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/powerpc/kernel/vdso.c 2006-09-20 19:58:24 +0200
+--- linux-2.6.18.3/arch/powerpc/kernel/vdso.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/powerpc/kernel/vdso.c 2006-09-20 19:58:24 +0200
@@ -22,6 +22,7 @@
#include <linux/elf.h>
#include <linux/security.h>
@@ -1222,9 +1167,8 @@
up_write(&mm->mmap_sem);
return 0;
-diff -NurpP --minimal linux-2.6.18.2/arch/ppc/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/ppc/Kconfig
---- linux-2.6.18.2/arch/ppc/Kconfig 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/ppc/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/ppc/Kconfig 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/ppc/Kconfig 2006-09-20 17:01:44 +0200
@@ -1418,6 +1418,8 @@ source "arch/powerpc/oprofile/Kconfig"
source "arch/ppc/Kconfig.debug"
@@ -1234,9 +1178,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/s390/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/s390/Kconfig
---- linux-2.6.18.2/arch/s390/Kconfig 2006-11-04 19:43:22 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/s390/Kconfig 2006-11-06 04:47:17 +0100
+--- linux-2.6.18.3/arch/s390/Kconfig 2006-11-04 19:43:22 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/s390/Kconfig 2006-11-06 04:47:17 +0100
@@ -495,6 +495,8 @@ source "arch/s390/oprofile/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -1246,9 +1189,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/s390/kernel/process.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/s390/kernel/process.c
---- linux-2.6.18.2/arch/s390/kernel/process.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/s390/kernel/process.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/s390/kernel/process.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -1262,9 +1204,8 @@
show_registers(regs);
/* Show stack backtrace if pt_regs is from kernel mode */
-diff -NurpP --minimal linux-2.6.18.2/arch/s390/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/s390/kernel/ptrace.c
---- linux-2.6.18.2/arch/s390/kernel/ptrace.c 2006-06-18 04:52:33 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/s390/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/s390/kernel/ptrace.c 2006-06-18 04:52:33 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
}
@@ -1279,9 +1220,8 @@
put_task_struct(child);
out:
unlock_kernel();
-diff -NurpP --minimal linux-2.6.18.2/arch/s390/kernel/s390_ext.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/s390/kernel/s390_ext.c
---- linux-2.6.18.2/arch/s390/kernel/s390_ext.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/s390/kernel/s390_ext.c 2006-11-07 19:13:22 +0100
+--- linux-2.6.18.3/arch/s390/kernel/s390_ext.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/s390/kernel/s390_ext.c 2006-11-07 19:13:22 +0100
@@ -13,6 +13,7 @@
#include <linux/errno.h>
#include <linux/kernel_stat.h>
@@ -1313,9 +1253,8 @@
irq_exit();
}
-diff -NurpP --minimal linux-2.6.18.2/arch/s390/kernel/syscalls.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/s390/kernel/syscalls.S
---- linux-2.6.18.2/arch/s390/kernel/syscalls.S 2006-06-18 04:52:33 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/s390/kernel/syscalls.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/s390/kernel/syscalls.S 2006-06-18 04:52:33 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -1325,9 +1264,8 @@
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.2/arch/sh/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/sh/Kconfig
---- linux-2.6.18.2/arch/sh/Kconfig 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sh/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sh/Kconfig 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/sh/Kconfig 2006-09-20 17:01:44 +0200
@@ -646,6 +646,8 @@ source "arch/sh/oprofile/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -1337,9 +1275,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/sh/kernel/kgdb_stub.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sh/kernel/kgdb_stub.c
---- linux-2.6.18.2/arch/sh/kernel/kgdb_stub.c 2004-08-14 12:54:51 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sh/kernel/kgdb_stub.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sh/kernel/kgdb_stub.c 2004-08-14 12:54:51 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -1349,9 +1286,8 @@
if (thread)
return thread;
-diff -NurpP --minimal linux-2.6.18.2/arch/sh/kernel/setup.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sh/kernel/setup.c
---- linux-2.6.18.2/arch/sh/kernel/setup.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sh/kernel/setup.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sh/kernel/setup.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/sh/kernel/setup.c 2006-09-20 17:01:44 +0200
@@ -21,6 +21,7 @@
#include <linux/utsname.h>
#include <linux/cpu.h>
@@ -1369,9 +1305,8 @@
seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype());
show_cpuflags(m);
-diff -NurpP --minimal linux-2.6.18.2/arch/sh/kernel/sys_sh.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sh/kernel/sys_sh.c
---- linux-2.6.18.2/arch/sh/kernel/sys_sh.c 2005-08-29 22:24:55 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sh/kernel/sys_sh.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sh/kernel/sys_sh.c 2005-08-29 22:24:55 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -1389,9 +1324,8 @@
up_read(&uts_sem);
return err?-EFAULT:0;
}
-diff -NurpP --minimal linux-2.6.18.2/arch/sh64/kernel/sys_sh64.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sh64/kernel/sys_sh64.c
---- linux-2.6.18.2/arch/sh64/kernel/sys_sh64.c 2005-06-22 02:37:59 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sh64/kernel/sys_sh64.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sh64/kernel/sys_sh64.c 2005-06-22 02:37:59 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -1409,9 +1343,8 @@
up_read(&uts_sem);
return err?-EFAULT:0;
}
-diff -NurpP --minimal linux-2.6.18.2/arch/sparc/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc/Kconfig
---- linux-2.6.18.2/arch/sparc/Kconfig 2006-06-18 04:52:33 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sparc/Kconfig 2006-06-18 04:52:33 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/sparc/Kconfig 2006-09-20 17:01:44 +0200
@@ -291,6 +291,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -1421,9 +1354,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/sparc/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc/kernel/irq.c
---- linux-2.6.18.2/arch/sparc/kernel/irq.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc/kernel/irq.c 2006-11-07 19:15:34 +0100
+--- linux-2.6.18.3/arch/sparc/kernel/irq.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/sparc/kernel/irq.c 2006-11-07 19:15:34 +0100
@@ -29,6 +29,7 @@
#include <linux/threads.h>
#include <linux/spinlock.h>
@@ -1470,9 +1402,8 @@
irq_exit();
enable_pil_irq(irq);
// XXX Eek, it's totally changed with preempt_count() and such
-diff -NurpP --minimal linux-2.6.18.2/arch/sparc/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc/kernel/ptrace.c
---- linux-2.6.18.2/arch/sparc/kernel/ptrace.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sparc/kernel/ptrace.c 2006-04-09 13:49:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -1484,9 +1415,8 @@
if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
|| (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
-diff -NurpP --minimal linux-2.6.18.2/arch/sparc/kernel/sun4d_irq.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc/kernel/sun4d_irq.c
---- linux-2.6.18.2/arch/sparc/kernel/sun4d_irq.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc/kernel/sun4d_irq.c 2006-11-07 19:16:21 +0100
+--- linux-2.6.18.3/arch/sparc/kernel/sun4d_irq.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/sparc/kernel/sun4d_irq.c 2006-11-07 19:16:21 +0100
@@ -20,6 +20,7 @@
#include <linux/smp_lock.h>
#include <linux/spinlock.h>
@@ -1519,9 +1449,8 @@
irq_exit();
}
-diff -NurpP --minimal linux-2.6.18.2/arch/sparc/kernel/sys_sparc.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc/kernel/sys_sparc.c
---- linux-2.6.18.2/arch/sparc/kernel/sys_sparc.c 2006-09-20 16:58:04 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc/kernel/sys_sparc.c 2006-09-20 19:57:58 +0200
+--- linux-2.6.18.3/arch/sparc/kernel/sys_sparc.c 2006-09-20 16:58:04 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -1546,9 +1475,8 @@
err = 0;
out:
-diff -NurpP --minimal linux-2.6.18.2/arch/sparc/kernel/sys_sunos.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc/kernel/sys_sunos.c
---- linux-2.6.18.2/arch/sparc/kernel/sys_sunos.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc/kernel/sys_sunos.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sparc/kernel/sys_sunos.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -1579,9 +1507,8 @@
}
up_read(&uts_sem);
return ret ? -EFAULT : 0;
-diff -NurpP --minimal linux-2.6.18.2/arch/sparc/kernel/systbls.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc/kernel/systbls.S
---- linux-2.6.18.2/arch/sparc/kernel/systbls.S 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc/kernel/systbls.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sparc/kernel/systbls.S 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -1591,9 +1518,8 @@
/*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.2/arch/sparc64/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/Kconfig
---- linux-2.6.18.2/arch/sparc64/Kconfig 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sparc64/Kconfig 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/sparc64/Kconfig 2006-09-20 17:01:44 +0200
@@ -431,6 +431,8 @@ endmenu
source "arch/sparc64/Kconfig.debug"
@@ -1603,9 +1529,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/sparc64/kernel/binfmt_aout32.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/kernel/binfmt_aout32.c
---- linux-2.6.18.2/arch/sparc64/kernel/binfmt_aout32.c 2006-06-18 04:52:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/kernel/binfmt_aout32.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sparc64/kernel/binfmt_aout32.c 2006-06-18 04:52:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -1614,9 +1539,8 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.18.2/arch/sparc64/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/kernel/ptrace.c
---- linux-2.6.18.2/arch/sparc64/kernel/ptrace.c 2006-06-18 04:52:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sparc64/kernel/ptrace.c 2006-06-18 04:52:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -1628,9 +1552,8 @@
if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
|| (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
-diff -NurpP --minimal linux-2.6.18.2/arch/sparc64/kernel/sys_sparc.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/kernel/sys_sparc.c
---- linux-2.6.18.2/arch/sparc64/kernel/sys_sparc.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/kernel/sys_sparc.c 2006-09-20 19:57:05 +0200
+--- linux-2.6.18.3/arch/sparc64/kernel/sys_sparc.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -1655,9 +1578,8 @@
err = 0;
out:
-diff -NurpP --minimal linux-2.6.18.2/arch/sparc64/kernel/sys_sunos32.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/kernel/sys_sunos32.c
---- linux-2.6.18.2/arch/sparc64/kernel/sys_sunos32.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/kernel/sys_sunos32.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sparc64/kernel/sys_sunos32.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -1692,9 +1614,8 @@
sizeof(name->mach) - 1);
up_read(&uts_sem);
return (ret ? -EFAULT : 0);
-diff -NurpP --minimal linux-2.6.18.2/arch/sparc64/kernel/systbls.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/kernel/systbls.S
---- linux-2.6.18.2/arch/sparc64/kernel/systbls.S 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/kernel/systbls.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sparc64/kernel/systbls.S 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -1713,9 +1634,8 @@
/*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.2/arch/sparc64/solaris/fs.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/solaris/fs.c
---- linux-2.6.18.2/arch/sparc64/solaris/fs.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/solaris/fs.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sparc64/solaris/fs.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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);
@@ -1734,9 +1654,8 @@
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.2/arch/sparc64/solaris/misc.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/solaris/misc.c
---- linux-2.6.18.2/arch/sparc64/solaris/misc.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/sparc64/solaris/misc.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/sparc64/solaris/misc.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/sparc64/solaris/misc.c 2006-09-20 17:01:44 +0200
@@ -16,6 +16,7 @@
#include <linux/timex.h>
#include <linux/major.h>
@@ -1772,9 +1691,8 @@
q < r && *p && *p != '.'; *q++ = *p++);
up_read(&uts_sem);
*q = 0;
-diff -NurpP --minimal linux-2.6.18.2/arch/um/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/um/Kconfig
---- linux-2.6.18.2/arch/um/Kconfig 2006-11-04 19:43:22 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/um/Kconfig 2006-10-16 18:56:10 +0200
+--- linux-2.6.18.3/arch/um/Kconfig 2006-11-04 19:43:22 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/um/Kconfig 2006-10-16 18:56:10 +0200
@@ -284,6 +284,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
@@ -1784,9 +1702,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/um/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/um/kernel/irq.c
---- linux-2.6.18.2/arch/um/kernel/irq.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/um/kernel/irq.c 2006-11-07 19:17:23 +0100
+--- linux-2.6.18.3/arch/um/kernel/irq.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/um/kernel/irq.c 2006-11-07 19:17:23 +0100
@@ -370,10 +370,11 @@ void forward_interrupts(int pid)
*/
unsigned int do_IRQ(int irq, union uml_pt_regs *regs)
@@ -1803,9 +1720,8 @@
}
int um_request_irq(unsigned int irq, int fd, int type,
-diff -NurpP --minimal linux-2.6.18.2/arch/um/kernel/syscall.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/um/kernel/syscall.c
---- linux-2.6.18.2/arch/um/kernel/syscall.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/um/kernel/syscall.c 2006-09-21 16:41:49 +0200
+--- linux-2.6.18.3/arch/um/kernel/syscall.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/um/kernel/syscall.c 2006-09-21 16:41:49 +0200
@@ -15,6 +15,8 @@
#include "linux/unistd.h"
#include "linux/slab.h"
@@ -1858,9 +1774,8 @@
__OLD_UTS_LEN);
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
-diff -NurpP --minimal linux-2.6.18.2/arch/um/sys-x86_64/syscalls.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/um/sys-x86_64/syscalls.c
---- linux-2.6.18.2/arch/um/sys-x86_64/syscalls.c 2006-06-18 04:52:42 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/um/sys-x86_64/syscalls.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/um/sys-x86_64/syscalls.c 2006-06-18 04:52:42 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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"
@@ -1878,9 +1793,8 @@
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.2/arch/v850/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/v850/Kconfig
---- linux-2.6.18.2/arch/v850/Kconfig 2006-06-18 04:52:42 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/v850/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/v850/Kconfig 2006-06-18 04:52:42 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/v850/Kconfig 2006-09-20 17:01:44 +0200
@@ -326,6 +326,8 @@ source "drivers/usb/Kconfig"
source "arch/v850/Kconfig.debug"
@@ -1890,9 +1804,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/v850/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/v850/kernel/ptrace.c
---- linux-2.6.18.2/arch/v850/kernel/ptrace.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/v850/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/v850/kernel/ptrace.c 2006-04-09 13:49:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -1903,9 +1816,8 @@
switch (request) {
unsigned long val, copied;
-diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/Kconfig
---- linux-2.6.18.2/arch/x86_64/Kconfig 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/x86_64/Kconfig 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/x86_64/Kconfig 2006-09-20 17:01:44 +0200
@@ -654,6 +654,8 @@ endmenu
source "arch/x86_64/Kconfig.debug"
@@ -1915,9 +1827,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/ia32/ia32_aout.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/ia32/ia32_aout.c
---- linux-2.6.18.2/arch/x86_64/ia32/ia32_aout.c 2006-01-03 17:29:20 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/ia32/ia32_aout.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/x86_64/ia32/ia32_aout.c 2006-01-03 17:29:20 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -1926,9 +1837,8 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/ia32/ia32_binfmt.c
---- linux-2.6.18.2/arch/x86_64/ia32/ia32_binfmt.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/ia32/ia32_binfmt.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/x86_64/ia32/ia32_binfmt.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -1939,9 +1849,8 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/ia32/ia32entry.S linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/ia32/ia32entry.S
---- linux-2.6.18.2/arch/x86_64/ia32/ia32entry.S 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/ia32/ia32entry.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/x86_64/ia32/ia32entry.S 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -1951,9 +1860,8 @@
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/ia32/sys_ia32.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/ia32/sys_ia32.c
---- linux-2.6.18.2/arch/x86_64/ia32/sys_ia32.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/ia32/sys_ia32.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/x86_64/ia32/sys_ia32.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -1998,9 +1906,8 @@
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.2/arch/x86_64/ia32/syscall32.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/ia32/syscall32.c
---- linux-2.6.18.2/arch/x86_64/ia32/syscall32.c 2005-10-28 20:49:18 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/ia32/syscall32.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/x86_64/ia32/syscall32.c 2005-10-28 20:49:18 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -2018,9 +1925,8 @@
up_write(&mm->mmap_sem);
return 0;
}
-diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/kernel/sys_x86_64.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/kernel/sys_x86_64.c
---- linux-2.6.18.2/arch/x86_64/kernel/sys_x86_64.c 2006-01-03 17:29:20 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/kernel/sys_x86_64.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/x86_64/kernel/sys_x86_64.c 2006-01-03 17:29:20 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -2038,9 +1944,8 @@
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.2/arch/x86_64/kernel/traps.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/kernel/traps.c
---- linux-2.6.18.2/arch/x86_64/kernel/traps.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/x86_64/kernel/traps.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/x86_64/kernel/traps.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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);
@@ -2053,9 +1958,8 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.18.2/arch/xtensa/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/xtensa/kernel/irq.c
---- linux-2.6.18.2/arch/xtensa/kernel/irq.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/xtensa/kernel/irq.c 2006-11-07 19:19:14 +0100
+--- linux-2.6.18.3/arch/xtensa/kernel/irq.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/xtensa/kernel/irq.c 2006-11-07 19:19:14 +0100
@@ -63,9 +63,7 @@ unsigned int do_IRQ(int irq, struct pt_
sp - sizeof(struct thread_info));
}
@@ -2066,9 +1970,8 @@
irq_exit();
return 1;
-diff -NurpP --minimal linux-2.6.18.2/arch/xtensa/kernel/syscalls.c linux-2.6.18.2-vs2.0.2.2-rc6/arch/xtensa/kernel/syscalls.c
---- linux-2.6.18.2/arch/xtensa/kernel/syscalls.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/arch/xtensa/kernel/syscalls.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/arch/xtensa/kernel/syscalls.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/arch/xtensa/kernel/syscalls.c 2006-09-20 17:01:44 +0200
@@ -34,6 +34,7 @@
#include <linux/msg.h>
#include <linux/shm.h>
@@ -2086,9 +1989,8 @@
return 0;
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.18.2/block/cfq-iosched.c linux-2.6.18.2-vs2.0.2.2-rc6/block/cfq-iosched.c
---- linux-2.6.18.2/block/cfq-iosched.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/block/cfq-iosched.c 2006-10-17 01:20:07 +0200
+--- linux-2.6.18.3/block/cfq-iosched.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -2098,9 +2000,8 @@
if (rw == READ || rw == WRITE_SYNC)
return task->pid;
-diff -NurpP --minimal linux-2.6.18.2/drivers/block/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/drivers/block/Kconfig
---- linux-2.6.18.2/drivers/block/Kconfig 2006-09-20 16:58:07 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/drivers/block/Kconfig 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/drivers/block/Kconfig 2006-09-20 16:58:07 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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.
@@ -2115,18 +2016,16 @@
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-2.6.18.2/drivers/block/Makefile linux-2.6.18.2-vs2.0.2.2-rc6/drivers/block/Makefile
---- linux-2.6.18.2/drivers/block/Makefile 2006-06-18 04:52:46 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/drivers/block/Makefile 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/drivers/block/Makefile 2006-06-18 04:52:46 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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.2/drivers/block/loop.c linux-2.6.18.2-vs2.0.2.2-rc6/drivers/block/loop.c
---- linux-2.6.18.2/drivers/block/loop.c 2006-09-20 16:58:07 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/drivers/block/loop.c 2006-10-17 02:40:33 +0200
+--- linux-2.6.18.3/drivers/block/loop.c 2006-09-20 16:58:07 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/drivers/block/loop.c 2006-10-17 02:40:33 +0200
@@ -72,6 +72,7 @@
#include <linux/completion.h>
#include <linux/highmem.h>
@@ -2153,9 +2052,8 @@
if (error < 0)
goto out_putf;
wait_for_completion(&lo->lo_done);
-diff -NurpP --minimal linux-2.6.18.2/drivers/block/vroot.c linux-2.6.18.2-vs2.0.2.2-rc6/drivers/block/vroot.c
---- linux-2.6.18.2/drivers/block/vroot.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/drivers/block/vroot.c 2006-09-21 01:26:54 +0200
+--- linux-2.6.18.3/drivers/block/vroot.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/drivers/block/vroot.c 2006-09-21 01:26:54 +0200
@@ -0,0 +1,281 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -2438,9 +2336,8 @@
+
+#endif
+
-diff -NurpP --minimal linux-2.6.18.2/drivers/char/random.c linux-2.6.18.2-vs2.0.2.2-rc6/drivers/char/random.c
---- linux-2.6.18.2/drivers/char/random.c 2006-09-20 16:58:13 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/drivers/char/random.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/drivers/char/random.c 2006-09-20 16:58:13 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -2450,9 +2347,8 @@
unsigned char buf[64], tmp_uuid[16], *uuid;
uuid = table->data;
-diff -NurpP --minimal linux-2.6.18.2/drivers/char/tty_io.c linux-2.6.18.2-vs2.0.2.2-rc6/drivers/char/tty_io.c
---- linux-2.6.18.2/drivers/char/tty_io.c 2006-09-20 16:58:13 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/drivers/char/tty_io.c 2006-09-20 19:55:41 +0200
+--- linux-2.6.18.3/drivers/char/tty_io.c 2006-09-20 16:58:13 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/drivers/char/tty_io.c 2006-09-20 19:55:41 +0200
@@ -103,6 +103,7 @@
#include <linux/selection.h>
@@ -2488,9 +2384,8 @@
if (pgrp < 0)
return -EINVAL;
if (session_of_pgrp(pgrp) != current->signal->session)
-diff -NurpP --minimal linux-2.6.18.2/drivers/infiniband/core/uverbs_mem.c linux-2.6.18.2-vs2.0.2.2-rc6/drivers/infiniband/core/uverbs_mem.c
---- linux-2.6.18.2/drivers/infiniband/core/uverbs_mem.c 2006-06-18 04:53:04 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/drivers/infiniband/core/uverbs_mem.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/drivers/infiniband/core/uverbs_mem.c 2006-06-18 04:53:04 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/drivers/infiniband/core/uverbs_mem.c 2006-09-20 17:01:44 +0200
@@ -36,6 +36,7 @@
#include <linux/mm.h>
@@ -2528,9 +2423,8 @@
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
-diff -NurpP --minimal linux-2.6.18.2/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.18.2-vs2.0.2.2-rc6/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-2.6.18.2/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 16:58:14 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 16:58:14 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 17:01:44 +0200
@@ -33,6 +33,7 @@
#include <linux/mm.h>
@@ -2576,9 +2470,8 @@
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
-diff -NurpP --minimal linux-2.6.18.2/drivers/s390/cio/cio.c linux-2.6.18.2-vs2.0.2.2-rc6/drivers/s390/cio/cio.c
---- linux-2.6.18.2/drivers/s390/cio/cio.c 2006-09-20 16:58:27 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/drivers/s390/cio/cio.c 2006-11-07 05:13:49 +0100
+--- linux-2.6.18.3/drivers/s390/cio/cio.c 2006-09-20 16:58:27 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/drivers/s390/cio/cio.c 2006-11-07 05:13:49 +0100
@@ -16,6 +16,7 @@
#include <linux/device.h>
#include <linux/kernel_stat.h>
@@ -2604,9 +2497,8 @@
}
if (sch)
spin_unlock(&sch->lock);
-diff -NurpP --minimal linux-2.6.18.2/fs/attr.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/attr.c
---- linux-2.6.18.2/fs/attr.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/attr.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/attr.c 2006-04-09 13:49:53 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/attr.c 2006-09-20 17:01:44 +0200
@@ -15,6 +15,9 @@
#include <linux/fcntl.h>
#include <linux/quotaops.h>
@@ -2665,9 +2557,8 @@
error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
if (!error)
error = inode_setattr(inode, attr);
-diff -NurpP --minimal linux-2.6.18.2/fs/binfmt_aout.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/binfmt_aout.c
---- linux-2.6.18.2/fs/binfmt_aout.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/binfmt_aout.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/binfmt_aout.c 2006-04-09 13:49:53 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/binfmt_aout.c 2006-09-20 17:01:44 +0200
@@ -24,6 +24,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -2676,9 +2567,8 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.18.2/fs/binfmt_elf.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/binfmt_elf.c
---- linux-2.6.18.2/fs/binfmt_elf.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/binfmt_elf.c 2006-09-20 18:28:33 +0200
+--- linux-2.6.18.3/fs/binfmt_elf.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/binfmt_elf.c 2006-09-20 18:28:33 +0200
@@ -39,6 +39,8 @@
#include <linux/syscalls.h>
#include <linux/random.h>
@@ -2688,9 +2578,8 @@
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-2.6.18.2/fs/binfmt_elf_fdpic.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/binfmt_elf_fdpic.c
---- linux-2.6.18.2/fs/binfmt_elf_fdpic.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/binfmt_elf_fdpic.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/binfmt_elf_fdpic.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -2699,9 +2588,8 @@
#include <asm/uaccess.h>
#include <asm/param.h>
-diff -NurpP --minimal linux-2.6.18.2/fs/binfmt_flat.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/binfmt_flat.c
---- linux-2.6.18.2/fs/binfmt_flat.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/binfmt_flat.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/binfmt_flat.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/binfmt_flat.c 2006-09-20 17:01:44 +0200
@@ -36,6 +36,7 @@
#include <linux/init.h>
#include <linux/flat.h>
@@ -2710,9 +2598,8 @@
#include <asm/byteorder.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.18.2/fs/binfmt_som.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/binfmt_som.c
---- linux-2.6.18.2/fs/binfmt_som.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/binfmt_som.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/binfmt_som.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/binfmt_som.c 2006-09-20 17:01:44 +0200
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
@@ -2721,9 +2608,8 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.18.2/fs/devpts/inode.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/devpts/inode.c
---- linux-2.6.18.2/fs/devpts/inode.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/devpts/inode.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/devpts/inode.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/devpts/inode.c 2006-09-20 17:01:44 +0200
@@ -20,7 +20,19 @@
#include <linux/devpts_fs.h>
#include <linux/parser.h>
@@ -2790,9 +2676,8 @@
inode->u.generic_ip = tty;
dentry = get_node(number);
-diff -NurpP --minimal linux-2.6.18.2/fs/exec.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/exec.c
---- linux-2.6.18.2/fs/exec.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/exec.c 2006-09-20 18:03:28 +0200
+--- linux-2.6.18.3/fs/exec.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/exec.c 2006-09-20 18:03:28 +0200
@@ -49,6 +49,8 @@
#include <linux/acct.h>
#include <linux/cn_proc.h>
@@ -2821,9 +2706,8 @@
up_read(&uts_sem);
if (rc > out_end - out_ptr)
goto out;
-diff -NurpP --minimal linux-2.6.18.2/fs/ext2/balloc.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/balloc.c
---- linux-2.6.18.2/fs/ext2/balloc.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/balloc.c 2006-10-16 19:05:41 +0200
+--- linux-2.6.18.3/fs/ext2/balloc.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/ext2/balloc.c 2006-10-16 19:05:41 +0200
@@ -16,6 +16,7 @@
#include <linux/sched.h>
#include <linux/buffer_head.h>
@@ -2877,9 +2761,8 @@
release_blocks(sb, es_alloc);
out_dquot:
DQUOT_FREE_BLOCK(inode, dq_alloc);
-diff -NurpP --minimal linux-2.6.18.2/fs/ext2/ext2.h linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/ext2.h
---- linux-2.6.18.2/fs/ext2/ext2.h 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/ext2.h 2006-09-20 19:55:12 +0200
+--- linux-2.6.18.3/fs/ext2/ext2.h 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -2888,18 +2771,16 @@
/* namei.c */
extern struct inode_operations ext2_dir_inode_operations;
-diff -NurpP --minimal linux-2.6.18.2/fs/ext2/file.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/file.c
---- linux-2.6.18.2/fs/ext2/file.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/file.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ext2/file.c 2006-06-18 04:54:33 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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.2/fs/ext2/ialloc.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/ialloc.c
---- linux-2.6.18.2/fs/ext2/ialloc.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/ialloc.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ext2/ialloc.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -2955,9 +2836,8 @@
make_bad_inode(inode);
iput(inode);
return ERR_PTR(err);
-diff -NurpP --minimal linux-2.6.18.2/fs/ext2/inode.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/inode.c
---- linux-2.6.18.2/fs/ext2/inode.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/inode.c 2006-11-06 05:08:58 +0100
+--- linux-2.6.18.3/fs/ext2/inode.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/ext2/inode.c 2006-11-06 05:08:58 +0100
@@ -31,6 +31,7 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3102,9 +2982,8 @@
error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0;
if (error)
return error;
-diff -NurpP --minimal linux-2.6.18.2/fs/ext2/ioctl.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/ioctl.c
---- linux-2.6.18.2/fs/ext2/ioctl.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/ioctl.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ext2/ioctl.c 2006-04-09 13:49:53 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/ext2/ioctl.c 2006-09-20 17:01:44 +0200
@@ -11,6 +11,7 @@
#include <linux/capability.h>
#include <linux/time.h>
@@ -3144,9 +3023,8 @@
return -EROFS;
if (get_user(inode->i_generation, (int __user *) arg))
return -EFAULT;
-diff -NurpP --minimal linux-2.6.18.2/fs/ext2/namei.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/namei.c
---- linux-2.6.18.2/fs/ext2/namei.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/namei.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ext2/namei.c 2006-06-18 04:54:33 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/ext2/namei.c 2006-09-20 17:01:44 +0200
@@ -31,6 +31,7 @@
*/
@@ -3177,9 +3055,8 @@
.permission = ext2_permission,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.2/fs/ext2/super.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/super.c
---- linux-2.6.18.2/fs/ext2/super.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/super.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ext2/super.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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,
@@ -3232,9 +3109,8 @@
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.2/fs/ext2/symlink.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/symlink.c
---- linux-2.6.18.2/fs/ext2/symlink.c 2005-08-29 22:25:30 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/symlink.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ext2/symlink.c 2005-08-29 22:25:30 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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,
@@ -3249,9 +3125,8 @@
#endif
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.2/fs/ext2/xattr.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/xattr.c
---- linux-2.6.18.2/fs/ext2/xattr.c 2006-02-18 14:40:21 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext2/xattr.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ext2/xattr.c 2006-02-18 14:40:21 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/ext2/xattr.c 2006-09-20 17:01:44 +0200
@@ -60,6 +60,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
@@ -3289,9 +3164,8 @@
DQUOT_FREE_BLOCK(inode, 1);
}
EXT2_I(inode)->i_file_acl = 0;
-diff -NurpP --minimal linux-2.6.18.2/fs/ext3/balloc.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/balloc.c
---- linux-2.6.18.2/fs/ext3/balloc.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/balloc.c 2006-10-16 19:06:32 +0200
+--- linux-2.6.18.3/fs/ext3/balloc.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/ext3/balloc.c 2006-10-16 19:06:32 +0200
@@ -19,6 +19,7 @@
#include <linux/ext3_jbd.h>
#include <linux/quotaops.h>
@@ -3390,9 +3264,8 @@
if (fatal) {
*errp = fatal;
ext3_std_error(sb, fatal);
-diff -NurpP --minimal linux-2.6.18.2/fs/ext3/file.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/file.c
---- linux-2.6.18.2/fs/ext3/file.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/file.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ext3/file.c 2006-06-18 04:54:33 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -3400,9 +3273,8 @@
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.2/fs/ext3/ialloc.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/ialloc.c
---- linux-2.6.18.2/fs/ext3/ialloc.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/ialloc.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ext3/ialloc.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/ext3/ialloc.c 2006-09-20 17:01:44 +0200
@@ -23,6 +23,8 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
@@ -3460,9 +3332,8 @@
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
-diff -NurpP --minimal linux-2.6.18.2/fs/ext3/inode.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/inode.c
---- linux-2.6.18.2/fs/ext3/inode.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/inode.c 2006-11-06 05:08:58 +0100
+--- linux-2.6.18.3/fs/ext3/inode.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/ext3/inode.c 2006-11-06 05:08:58 +0100
@@ -36,6 +36,7 @@
#include <linux/writeback.h>
#include <linux/mpage.h>
@@ -3659,9 +3530,8 @@
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.18.2/fs/ext3/ioctl.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/ioctl.c
---- linux-2.6.18.2/fs/ext3/ioctl.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/ioctl.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ext3/ioctl.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/ext3/ioctl.c 2006-09-20 17:01:44 +0200
@@ -8,11 +8,13 @@
*/
@@ -3776,9 +3646,8 @@
default:
return -ENOTTY;
-diff -NurpP --minimal linux-2.6.18.2/fs/ext3/namei.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/namei.c
---- linux-2.6.18.2/fs/ext3/namei.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/namei.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ext3/namei.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/ext3/namei.c 2006-09-20 17:01:44 +0200
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3809,9 +3678,8 @@
.permission = ext3_permission,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.2/fs/ext3/super.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/super.c
---- linux-2.6.18.2/fs/ext3/super.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/super.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ext3/super.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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,
@@ -3864,9 +3732,8 @@
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.2/fs/ext3/symlink.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/symlink.c
---- linux-2.6.18.2/fs/ext3/symlink.c 2005-08-29 22:25:30 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/symlink.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ext3/symlink.c 2005-08-29 22:25:30 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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,
@@ -3881,9 +3748,8 @@
#endif
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.2/fs/ext3/xattr.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/xattr.c
---- linux-2.6.18.2/fs/ext3/xattr.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ext3/xattr.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ext3/xattr.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/ext3/xattr.c 2006-09-20 17:01:44 +0200
@@ -58,6 +58,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
@@ -3925,9 +3791,8 @@
goto cleanup;
bad_block:
-diff -NurpP --minimal linux-2.6.18.2/fs/fcntl.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/fcntl.c
---- linux-2.6.18.2/fs/fcntl.c 2006-06-18 04:54:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/fcntl.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/fcntl.c 2006-06-18 04:54:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/fcntl.c 2006-09-20 17:01:44 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/signal.h>
@@ -3981,9 +3846,8 @@
if (p) {
send_sigurg_to_task(p, fown);
}
-diff -NurpP --minimal linux-2.6.18.2/fs/file_table.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/file_table.c
---- linux-2.6.18.2/fs/file_table.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/file_table.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/file_table.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/file_table.c 2006-09-20 17:01:44 +0200
@@ -21,6 +21,8 @@
#include <linux/fsnotify.h>
#include <linux/sysctl.h>
@@ -4020,9 +3884,8 @@
file_kill(file);
file_free(file);
}
-diff -NurpP --minimal linux-2.6.18.2/fs/hfsplus/ioctl.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/hfsplus/ioctl.c
---- linux-2.6.18.2/fs/hfsplus/ioctl.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/hfsplus/ioctl.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/hfsplus/ioctl.c 2006-04-09 13:49:53 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/hfsplus/ioctl.c 2006-09-20 17:01:44 +0200
@@ -16,6 +16,7 @@
#include <linux/fs.h>
#include <linux/sched.h>
@@ -4041,9 +3904,8 @@
return -EROFS;
if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-diff -NurpP --minimal linux-2.6.18.2/fs/inode.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/inode.c
---- linux-2.6.18.2/fs/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/inode.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -4063,9 +3925,8 @@
/**
* clear_inode - clear an inode
* @inode: inode to clear
-diff -NurpP --minimal linux-2.6.18.2/fs/ioctl.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ioctl.c
---- linux-2.6.18.2/fs/ioctl.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ioctl.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/ioctl.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/ioctl.c 2006-09-20 17:01:44 +0200
@@ -12,10 +12,19 @@
#include <linux/fs.h>
#include <linux/security.h>
@@ -4135,9 +3996,8 @@
default:
if (S_ISREG(filp->f_dentry->d_inode->i_mode))
error = file_ioctl(filp, cmd, arg);
-diff -NurpP --minimal linux-2.6.18.2/fs/ioprio.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/ioprio.c
---- linux-2.6.18.2/fs/ioprio.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/ioprio.c 2006-10-18 01:19:40 +0200
+--- linux-2.6.18.3/fs/ioprio.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -4156,9 +4016,8 @@
if (!user)
break;
-diff -NurpP --minimal linux-2.6.18.2/fs/jfs/acl.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/acl.c
---- linux-2.6.18.2/fs/jfs/acl.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/acl.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/jfs/acl.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/jfs/acl.c 2006-09-20 17:01:44 +0200
@@ -232,7 +232,8 @@ int jfs_setattr(struct dentry *dentry, s
return rc;
@@ -4169,9 +4028,8 @@
if (DQUOT_TRANSFER(inode, iattr))
return -EDQUOT;
}
-diff -NurpP --minimal linux-2.6.18.2/fs/jfs/file.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/file.c
---- linux-2.6.18.2/fs/jfs/file.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/file.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/jfs/file.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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,
@@ -4180,9 +4038,8 @@
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-2.6.18.2/fs/jfs/inode.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/inode.c
---- linux-2.6.18.2/fs/jfs/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/inode.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/jfs/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/jfs/inode.c 2006-09-20 17:01:44 +0200
@@ -22,6 +22,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
@@ -4199,9 +4056,8 @@
}
clear_inode(inode);
-diff -NurpP --minimal linux-2.6.18.2/fs/jfs/ioctl.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/ioctl.c
---- linux-2.6.18.2/fs/jfs/ioctl.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/ioctl.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/jfs/ioctl.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/jfs/ioctl.c 2006-09-20 17:01:44 +0200
@@ -10,6 +10,7 @@
#include <linux/ctype.h>
#include <linux/capability.h>
@@ -4231,9 +4087,8 @@
if (!capable(CAP_LINUX_IMMUTABLE))
return -EPERM;
}
-diff -NurpP --minimal linux-2.6.18.2/fs/jfs/jfs_dinode.h linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_dinode.h
---- linux-2.6.18.2/fs/jfs/jfs_dinode.h 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_dinode.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/jfs/jfs_dinode.h 2006-06-18 04:54:36 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 */
@@ -4249,9 +4104,8 @@
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
#define JFS_IOC_GETFLAGS _IOR('f', 1, long)
-diff -NurpP --minimal linux-2.6.18.2/fs/jfs/jfs_dtree.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_dtree.c
---- linux-2.6.18.2/fs/jfs/jfs_dtree.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_dtree.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/jfs/jfs_dtree.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/jfs/jfs_dtree.c 2006-09-20 17:01:44 +0200
@@ -102,6 +102,7 @@
#include <linux/fs.h>
@@ -4361,9 +4215,8 @@
/* Free quota allocation */
DQUOT_FREE_BLOCK(ip, xlen);
-diff -NurpP --minimal linux-2.6.18.2/fs/jfs/jfs_extent.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_extent.c
---- linux-2.6.18.2/fs/jfs/jfs_extent.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_extent.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/jfs/jfs_extent.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/jfs/jfs_extent.c 2006-09-20 17:01:44 +0200
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -4424,9 +4277,8 @@
DQUOT_FREE_BLOCK(ip, nxlen);
goto exit;
}
-diff -NurpP --minimal linux-2.6.18.2/fs/jfs/jfs_filsys.h linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_filsys.h
---- linux-2.6.18.2/fs/jfs/jfs_filsys.h 2005-10-28 20:49:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_filsys.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/jfs/jfs_filsys.h 2005-10-28 20:49:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 */
@@ -4435,9 +4287,8 @@
/*
* buffer cache configuration
-diff -NurpP --minimal linux-2.6.18.2/fs/jfs/jfs_imap.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_imap.c
---- linux-2.6.18.2/fs/jfs/jfs_imap.c 2006-11-04 19:43:23 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_imap.c 2006-11-06 04:47:17 +0100
+--- linux-2.6.18.3/fs/jfs/jfs_imap.c 2006-11-04 19:43:23 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/jfs/jfs_imap.c 2006-11-06 04:47:17 +0100
@@ -45,6 +45,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
@@ -4497,9 +4348,8 @@
/*
* 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.2/fs/jfs/jfs_inode.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_inode.c
---- linux-2.6.18.2/fs/jfs/jfs_inode.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_inode.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/jfs/jfs_inode.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/jfs/jfs_inode.c 2006-09-20 17:01:44 +0200
@@ -18,6 +18,8 @@
#include <linux/fs.h>
@@ -4591,9 +4441,8 @@
DQUOT_DROP(inode);
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
-diff -NurpP --minimal linux-2.6.18.2/fs/jfs/jfs_inode.h linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_inode.h
---- linux-2.6.18.2/fs/jfs/jfs_inode.h 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_inode.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/jfs/jfs_inode.h 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 *);
@@ -4602,9 +4451,8 @@
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.2/fs/jfs/jfs_xtree.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_xtree.c
---- linux-2.6.18.2/fs/jfs/jfs_xtree.c 2006-01-03 17:29:57 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/jfs_xtree.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/jfs/jfs_xtree.c 2006-01-03 17:29:57 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/jfs/jfs_xtree.c 2006-09-20 17:01:44 +0200
@@ -21,6 +21,7 @@
#include <linux/fs.h>
@@ -4688,9 +4536,8 @@
/* update quota allocation to reflect freed blocks */
DQUOT_FREE_BLOCK(ip, nfreed);
-diff -NurpP --minimal linux-2.6.18.2/fs/jfs/namei.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/namei.c
---- linux-2.6.18.2/fs/jfs/namei.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/namei.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/jfs/namei.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/jfs/namei.c 2006-09-20 17:01:44 +0200
@@ -20,6 +20,7 @@
#include <linux/fs.h>
#include <linux/ctype.h>
@@ -4715,9 +4562,8 @@
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-2.6.18.2/fs/jfs/super.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/super.c
---- linux-2.6.18.2/fs/jfs/super.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/super.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/jfs/super.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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,
@@ -4772,9 +4618,8 @@
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-2.6.18.2/fs/jfs/xattr.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/xattr.c
---- linux-2.6.18.2/fs/jfs/xattr.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/jfs/xattr.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/jfs/xattr.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -4852,9 +4697,8 @@
inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-2.6.18.2/fs/libfs.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/libfs.c
---- linux-2.6.18.2/fs/libfs.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/libfs.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/libfs.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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.
*/
@@ -4901,9 +4745,8 @@
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(get_sb_pseudo);
EXPORT_SYMBOL(simple_commit_write);
-diff -NurpP --minimal linux-2.6.18.2/fs/lockd/clntproc.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/lockd/clntproc.c
---- linux-2.6.18.2/fs/lockd/clntproc.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/lockd/clntproc.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/lockd/clntproc.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -4926,9 +4769,8 @@
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.2/fs/locks.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/locks.c
---- linux-2.6.18.2/fs/locks.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/locks.c 2006-09-20 18:02:37 +0200
+--- linux-2.6.18.3/fs/locks.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/locks.c 2006-09-20 18:02:37 +0200
@@ -125,6 +125,7 @@
#include <linux/syscalls.h>
#include <linux/time.h>
@@ -5087,9 +4929,8 @@
lock_get_status(q, fl, ++i, "");
move_lock_status(&q, &pos, offset);
-diff -NurpP --minimal linux-2.6.18.2/fs/namei.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/namei.c
---- linux-2.6.18.2/fs/namei.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/namei.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/namei.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/namei.c 2006-11-21 10:50:41 +0100
@@ -32,6 +32,9 @@
#include <linux/file.h>
#include <linux/fcntl.h>
@@ -5106,7 +4947,7 @@
+static inline int vx_barrier(struct inode *inode)
+{
-+ if (IS_BARRIER(inode) && !vx_check(0, VX_ADMIN)) {
++ if (IS_BARRIER(inode) && !vx_check(0, VX_ADMIN|VX_WATCH)) {
+ vxwprintk(1, "xid=%d did hit the barrier.",
+ vx_current_xid());
+ return 1;
@@ -5424,9 +5265,8 @@
new_dentry = lookup_hash(&newnd);
error = PTR_ERR(new_dentry);
if (IS_ERR(new_dentry))
-diff -NurpP --minimal linux-2.6.18.2/fs/namespace.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/namespace.c
---- linux-2.6.18.2/fs/namespace.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/namespace.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/namespace.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/namespace.c 2006-09-20 17:01:44 +0200
@@ -22,6 +22,8 @@
#include <linux/namei.h>
#include <linux/security.h>
@@ -5738,9 +5578,8 @@
err = -EPERM;
goto out;
}
-diff -NurpP --minimal linux-2.6.18.2/fs/nfs/dir.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfs/dir.c
---- linux-2.6.18.2/fs/nfs/dir.c 2006-11-04 19:43:23 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfs/dir.c 2006-11-06 04:47:17 +0100
+--- linux-2.6.18.3/fs/nfs/dir.c 2006-11-04 19:43:23 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/nfs/dir.c 2006-11-06 04:47:17 +0100
@@ -28,9 +28,11 @@
#include <linux/sunrpc/clnt.h>
#include <linux/nfs_fs.h>
@@ -5771,9 +5610,8 @@
return 0;
return 1;
}
-diff -NurpP --minimal linux-2.6.18.2/fs/nfs/inode.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfs/inode.c
---- linux-2.6.18.2/fs/nfs/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfs/inode.c 2006-09-21 01:31:36 +0200
+--- linux-2.6.18.3/fs/nfs/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/nfs/inode.c 2006-09-21 01:31:36 +0200
@@ -37,6 +37,7 @@
#include <linux/vfs.h>
#include <linux/inet.h>
@@ -5868,9 +5706,8 @@
if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
/*
-diff -NurpP --minimal linux-2.6.18.2/fs/nfs/nfs3xdr.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfs/nfs3xdr.c
---- linux-2.6.18.2/fs/nfs/nfs3xdr.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfs/nfs3xdr.c 2006-09-20 19:47:41 +0200
+--- linux-2.6.18.3/fs/nfs/nfs3xdr.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/nfs/nfs3xdr.c 2006-09-20 19:47:41 +0200
@@ -22,6 +22,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -5960,9 +5797,8 @@
if (args->type == NF3CHR || args->type == NF3BLK) {
*p++ = htonl(MAJOR(args->rdev));
*p++ = htonl(MINOR(args->rdev));
-diff -NurpP --minimal linux-2.6.18.2/fs/nfs/nfsroot.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfs/nfsroot.c
---- linux-2.6.18.2/fs/nfs/nfsroot.c 2006-02-18 14:40:23 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfs/nfsroot.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/nfs/nfsroot.c 2006-02-18 14:40:23 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/nfs/nfsroot.c 2006-09-20 17:01:44 +0200
@@ -87,6 +87,7 @@
#include <linux/root_dev.h>
#include <net/ipconfig.h>
@@ -6009,9 +5845,8 @@
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.2/fs/nfs/super.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfs/super.c
---- linux-2.6.18.2/fs/nfs/super.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfs/super.c 2006-09-20 20:28:12 +0200
+--- linux-2.6.18.3/fs/nfs/super.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/nfs/super.c 2006-09-20 20:28:12 +0200
@@ -40,6 +40,7 @@
#include <linux/vfs.h>
#include <linux/inet.h>
@@ -6051,9 +5886,8 @@
return clnt;
-diff -NurpP --minimal linux-2.6.18.2/fs/nfsd/auth.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfsd/auth.c
---- linux-2.6.18.2/fs/nfsd/auth.c 2006-06-18 04:54:42 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfsd/auth.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/nfsd/auth.c 2006-06-18 04:54:42 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -6088,9 +5922,8 @@
cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
} else {
cap_t(current->cap_effective) |= (CAP_NFSD_MASK &
-diff -NurpP --minimal linux-2.6.18.2/fs/nfsd/nfs3xdr.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfsd/nfs3xdr.c
---- linux-2.6.18.2/fs/nfsd/nfs3xdr.c 2006-04-09 13:49:54 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfsd/nfs3xdr.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/nfsd/nfs3xdr.c 2006-04-09 13:49:54 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -6139,9 +5972,8 @@
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.2/fs/nfsd/nfs4recover.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfsd/nfs4recover.c
---- linux-2.6.18.2/fs/nfsd/nfs4recover.c 2006-02-18 14:40:23 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfsd/nfs4recover.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/nfsd/nfs4recover.c 2006-02-18 14:40:23 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -6169,9 +6001,8 @@
mutex_unlock(&dir->d_inode->i_mutex);
return status;
}
-diff -NurpP --minimal linux-2.6.18.2/fs/nfsd/nfs4xdr.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfsd/nfs4xdr.c
---- linux-2.6.18.2/fs/nfsd/nfs4xdr.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfsd/nfs4xdr.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/nfsd/nfs4xdr.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/nfsd/nfs4xdr.c 2006-09-20 17:01:44 +0200
@@ -57,6 +57,7 @@
#include <linux/nfsd_idmap.h>
#include <linux/nfs4.h>
@@ -6201,9 +6032,8 @@
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-2.6.18.2/fs/nfsd/nfsxdr.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfsd/nfsxdr.c
---- linux-2.6.18.2/fs/nfsd/nfsxdr.c 2006-04-09 13:49:54 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfsd/nfsxdr.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/nfsd/nfsxdr.c 2006-04-09 13:49:54 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -6252,9 +6082,8 @@
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-2.6.18.2/fs/nfsd/vfs.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfsd/vfs.c
---- linux-2.6.18.2/fs/nfsd/vfs.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/nfsd/vfs.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/nfsd/vfs.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -6318,9 +6147,8 @@
return nfserr_rofs;
if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode))
return nfserr_perm;
-diff -NurpP --minimal linux-2.6.18.2/fs/open.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/open.c
---- linux-2.6.18.2/fs/open.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/open.c 2006-09-20 21:05:31 +0200
+--- linux-2.6.18.3/fs/open.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/open.c 2006-09-20 21:05:31 +0200
@@ -28,6 +28,9 @@
#include <linux/syscalls.h>
#include <linux/rcupdate.h>
@@ -6494,9 +6322,8 @@
}
void fastcall put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-2.6.18.2/fs/proc/array.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/proc/array.c
---- linux-2.6.18.2/fs/proc/array.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/proc/array.c 2006-10-25 03:43:38 +0200
+--- linux-2.6.18.3/fs/proc/array.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/proc/array.c 2006-10-25 03:43:38 +0200
@@ -75,6 +75,8 @@
#include <linux/cpuset.h>
#include <linux/rcupdate.h>
@@ -6658,9 +6485,8 @@
tcomm,
state,
ppid,
-diff -NurpP --minimal linux-2.6.18.2/fs/proc/base.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/proc/base.c
---- linux-2.6.18.2/fs/proc/base.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/proc/base.c 2006-11-06 05:36:38 +0100
+--- linux-2.6.18.3/fs/proc/base.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/proc/base.c 2006-11-06 05:36:38 +0100
@@ -71,6 +71,9 @@
#include <linux/cpuset.h>
#include <linux/audit.h>
@@ -6914,9 +6740,8 @@
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.2/fs/proc/generic.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/proc/generic.c
---- linux-2.6.18.2/fs/proc/generic.c 2006-06-18 04:54:45 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/proc/generic.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/proc/generic.c 2006-06-18 04:54:45 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/proc/generic.c 2006-09-20 17:01:44 +0200
@@ -20,6 +20,7 @@
#include <linux/namei.h>
#include <linux/bitops.h>
@@ -6976,9 +6801,8 @@
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-2.6.18.2/fs/proc/inode.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/proc/inode.c
---- linux-2.6.18.2/fs/proc/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/proc/inode.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/proc/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -6988,9 +6812,8 @@
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-2.6.18.2/fs/proc/internal.h linux-2.6.18.2-vs2.0.2.2-rc6/fs/proc/internal.h
---- linux-2.6.18.2/fs/proc/internal.h 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/proc/internal.h 2006-11-06 05:08:58 +0100
+--- linux-2.6.18.3/fs/proc/internal.h 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/proc/internal.h 2006-11-06 05:08:58 +0100
@@ -10,6 +10,7 @@
*/
@@ -7008,9 +6831,8 @@
}
static inline int proc_fd(struct inode *inode)
-diff -NurpP --minimal linux-2.6.18.2/fs/proc/proc_misc.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/proc/proc_misc.c
---- linux-2.6.18.2/fs/proc/proc_misc.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/proc/proc_misc.c 2006-10-25 03:50:01 +0200
+--- linux-2.6.18.3/fs/proc/proc_misc.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -7080,9 +6902,8 @@
return proc_calc_metrics(page, start, off, count, eof, len);
}
-diff -NurpP --minimal linux-2.6.18.2/fs/proc/root.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/proc/root.c
---- linux-2.6.18.2/fs/proc/root.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/proc/root.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/proc/root.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -7101,9 +6922,8 @@
}
static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
-diff -NurpP --minimal linux-2.6.18.2/fs/quota.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/quota.c
---- linux-2.6.18.2/fs/quota.c 2006-06-18 04:54:47 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/quota.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/quota.c 2006-06-18 04:54:47 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/quota.c 2006-09-20 17:01:44 +0200
@@ -17,6 +17,9 @@
#include <linux/buffer_head.h>
#include <linux/capability.h>
@@ -7209,9 +7029,8 @@
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-2.6.18.2/fs/reiserfs/bitmap.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/bitmap.c
---- linux-2.6.18.2/fs/reiserfs/bitmap.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/bitmap.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/reiserfs/bitmap.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -7304,18 +7123,16 @@
}
return CARRY_ON;
-diff -NurpP --minimal linux-2.6.18.2/fs/reiserfs/file.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/file.c
---- linux-2.6.18.2/fs/reiserfs/file.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/file.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/reiserfs/file.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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.2/fs/reiserfs/inode.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/inode.c
---- linux-2.6.18.2/fs/reiserfs/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/inode.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/reiserfs/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/reiserfs/inode.c 2006-09-20 17:01:44 +0200
@@ -16,6 +16,8 @@
#include <linux/mpage.h>
#include <linux/writeback.h>
@@ -7499,9 +7316,8 @@
mark_inode_dirty(inode);
error =
journal_end(&th, inode->i_sb, jbegin_count);
-diff -NurpP --minimal linux-2.6.18.2/fs/reiserfs/ioctl.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/ioctl.c
---- linux-2.6.18.2/fs/reiserfs/ioctl.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/ioctl.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/reiserfs/ioctl.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/reiserfs/ioctl.c 2006-09-20 17:01:44 +0200
@@ -4,6 +4,7 @@
#include <linux/capability.h>
@@ -7572,9 +7388,8 @@
return -EROFS;
if (get_user(inode->i_generation, (int __user *)arg))
return -EFAULT;
-diff -NurpP --minimal linux-2.6.18.2/fs/reiserfs/namei.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/namei.c
---- linux-2.6.18.2/fs/reiserfs/namei.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/namei.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/reiserfs/namei.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -7622,9 +7437,8 @@
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.2/fs/reiserfs/stree.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/stree.c
---- linux-2.6.18.2/fs/reiserfs/stree.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/stree.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/reiserfs/stree.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -7700,9 +7514,8 @@
+ }
return retval;
}
-diff -NurpP --minimal linux-2.6.18.2/fs/reiserfs/super.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/super.c
---- linux-2.6.18.2/fs/reiserfs/super.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/super.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/reiserfs/super.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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},
@@ -7737,9 +7550,8 @@
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.2/fs/reiserfs/xattr.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/xattr.c
---- linux-2.6.18.2/fs/reiserfs/xattr.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/reiserfs/xattr.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/reiserfs/xattr.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/reiserfs/xattr.c 2006-09-20 17:01:44 +0200
@@ -35,6 +35,7 @@
#include <linux/namei.h>
#include <linux/errno.h>
@@ -7757,9 +7569,8 @@
reiserfs_write_unlock_xattrs(inode->i_sb);
dput(root);
} else {
-diff -NurpP --minimal linux-2.6.18.2/fs/stat.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/stat.c
---- linux-2.6.18.2/fs/stat.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/stat.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/stat.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -7768,9 +7579,8 @@
stat->rdev = inode->i_rdev;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-2.6.18.2/fs/super.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/super.c
---- linux-2.6.18.2/fs/super.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/super.c 2006-09-20 17:59:47 +0200
+--- linux-2.6.18.3/fs/super.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/super.c 2006-09-20 17:59:47 +0200
@@ -37,6 +37,8 @@
#include <linux/idr.h>
#include <linux/kobject.h>
@@ -7822,9 +7632,8 @@
put_filesystem(type);
return mnt;
}
-diff -NurpP --minimal linux-2.6.18.2/fs/sysfs/mount.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/sysfs/mount.c
---- linux-2.6.18.2/fs/sysfs/mount.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/sysfs/mount.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/sysfs/mount.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/sysfs/mount.c 2006-09-20 17:01:44 +0200
@@ -11,8 +11,6 @@
#include "sysfs.h"
@@ -7843,9 +7652,8 @@
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
sysfs_sb = sb;
-diff -NurpP --minimal linux-2.6.18.2/fs/xattr.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/xattr.c
---- linux-2.6.18.2/fs/xattr.c 2006-09-20 16:58:37 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xattr.c 2006-09-20 21:08:52 +0200
+--- linux-2.6.18.3/fs/xattr.c 2006-09-20 16:58:37 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/xattr.c 2006-09-20 21:08:52 +0200
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
@@ -7946,9 +7754,8 @@
fput(f);
return error;
}
-diff -NurpP --minimal linux-2.6.18.2/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.18.2/fs/xfs/linux-2.6/xfs_ioctl.c 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/linux-2.6/xfs_ioctl.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/xfs/linux-2.6/xfs_ioctl.c 2006-09-20 16:58:39 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 */
@@ -7969,9 +7776,8 @@
if (di_flags & XFS_DIFLAG_APPEND)
flags |= LINUX_XFLAG_APPEND;
if (di_flags & XFS_DIFLAG_SYNC)
-diff -NurpP --minimal linux-2.6.18.2/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.18.2/fs/xfs/linux-2.6/xfs_iops.c 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/linux-2.6/xfs_iops.c 2006-09-21 16:42:52 +0200
+--- linux-2.6.18.3/fs/xfs/linux-2.6/xfs_iops.c 2006-09-20 16:58:39 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -8075,9 +7881,8 @@
.removexattr = xfs_vn_removexattr,
+ .sync_flags = xfs_vn_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.2/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/linux-2.6/xfs_linux.h
---- linux-2.6.18.2/fs/xfs/linux-2.6/xfs_linux.h 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/linux-2.6/xfs_linux.h 2006-09-20 18:35:45 +0200
+--- linux-2.6.18.3/fs/xfs/linux-2.6/xfs_linux.h 2006-09-20 16:58:39 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -8086,9 +7891,8 @@
#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.2/fs/xfs/linux-2.6/xfs_super.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/linux-2.6/xfs_super.c
---- linux-2.6.18.2/fs/xfs/linux-2.6/xfs_super.c 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/linux-2.6/xfs_super.c 2006-09-20 18:34:48 +0200
+--- linux-2.6.18.3/fs/xfs/linux-2.6/xfs_super.c 2006-09-20 16:58:39 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -8125,9 +7929,8 @@
if (!error)
error = bhv_vfs_mntupdate(vfsp, flags, args);
kmem_free(args, sizeof(*args));
-diff -NurpP --minimal linux-2.6.18.2/fs/xfs/linux-2.6/xfs_sysctl.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/linux-2.6/xfs_sysctl.c
---- linux-2.6.18.2/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 18:32:51 +0200
+--- linux-2.6.18.3/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 16:58:39 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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,
@@ -8223,9 +8026,8 @@
&xfs_params.stats_clear.min, &xfs_params.stats_clear.max},
#endif /* CONFIG_PROC_FS */
-diff -NurpP --minimal linux-2.6.18.2/fs/xfs/linux-2.6/xfs_vnode.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/linux-2.6/xfs_vnode.c
---- linux-2.6.18.2/fs/xfs/linux-2.6/xfs_vnode.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/linux-2.6/xfs_vnode.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/xfs/linux-2.6/xfs_vnode.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -8249,9 +8051,8 @@
if (vap->va_xflags & XFS_XFLAG_APPEND)
inode->i_flags |= S_APPEND;
else
-diff -NurpP --minimal linux-2.6.18.2/fs/xfs/linux-2.6/xfs_vnode.h linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/linux-2.6/xfs_vnode.h
---- linux-2.6.18.2/fs/xfs/linux-2.6/xfs_vnode.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/linux-2.6/xfs_vnode.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/xfs/linux-2.6/xfs_vnode.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 */
@@ -8277,9 +8078,8 @@
#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.2/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/quota/xfs_qm_syscalls.c
---- linux-2.6.18.2/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -8316,9 +8116,8 @@
return XFS_ERROR(EPERM);
if ((newlim->d_fieldmask &
-diff -NurpP --minimal linux-2.6.18.2/fs/xfs/xfs_clnt.h linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_clnt.h
---- linux-2.6.18.2/fs/xfs/xfs_clnt.h 2006-06-18 04:54:50 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_clnt.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/xfs/xfs_clnt.h 2006-06-18 04:54:50 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -8327,9 +8126,8 @@
+
#endif /* __XFS_CLNT_H__ */
-diff -NurpP --minimal linux-2.6.18.2/fs/xfs/xfs_dinode.h linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_dinode.h
---- linux-2.6.18.2/fs/xfs/xfs_dinode.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_dinode.h 2006-09-20 18:30:41 +0200
+--- linux-2.6.18.3/fs/xfs/xfs_dinode.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 */
@@ -8367,9 +8165,8 @@
+ XFS_DIFLAG_IUNLINK)
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-2.6.18.2/fs/xfs/xfs_fs.h linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_fs.h
---- linux-2.6.18.2/fs/xfs/xfs_fs.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_fs.h 2006-09-20 18:29:07 +0200
+--- linux-2.6.18.3/fs/xfs/xfs_fs.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 */
@@ -8389,9 +8186,8 @@
__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.2/fs/xfs/xfs_inode.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_inode.c
---- linux-2.6.18.2/fs/xfs/xfs_inode.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_inode.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/xfs/xfs_inode.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/fs/xfs/xfs_inode.c 2006-09-20 17:01:44 +0200
@@ -50,6 +50,7 @@
#include "xfs_mac.h"
#include "xfs_acl.h"
@@ -8457,9 +8253,8 @@
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.2/fs/xfs/xfs_itable.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_itable.c
---- linux-2.6.18.2/fs/xfs/xfs_itable.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_itable.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/xfs/xfs_itable.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -8476,9 +8271,8 @@
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.2/fs/xfs/xfs_mount.h linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_mount.h
---- linux-2.6.18.2/fs/xfs/xfs_mount.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_mount.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/xfs/xfs_mount.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 */
@@ -8487,9 +8281,8 @@
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-2.6.18.2/fs/xfs/xfs_vfsops.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_vfsops.c
---- linux-2.6.18.2/fs/xfs/xfs_vfsops.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_vfsops.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/xfs/xfs_vfsops.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -8527,9 +8320,8 @@
} else if (!strcmp(this_char, "osyncisdsync")) {
/* no-op, this is now the default */
cmn_err(CE_WARN,
-diff -NurpP --minimal linux-2.6.18.2/fs/xfs/xfs_vnodeops.c linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_vnodeops.c
---- linux-2.6.18.2/fs/xfs/xfs_vnodeops.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/fs/xfs/xfs_vnodeops.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/fs/xfs/xfs_vnodeops.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -8628,9 +8420,8 @@
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.2/include/asm-arm/tlb.h linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-arm/tlb.h
---- linux-2.6.18.2/include/asm-arm/tlb.h 2006-06-18 04:54:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-arm/tlb.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/include/asm-arm/tlb.h 2006-06-18 04:54:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/asm-arm/tlb.h 2006-09-20 17:01:44 +0200
@@ -28,6 +28,7 @@
#else /* !CONFIG_MMU */
@@ -8639,9 +8430,8 @@
/*
* TLB handling. This allows us to remove pages from the page
-diff -NurpP --minimal linux-2.6.18.2/include/asm-arm26/tlb.h linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-arm26/tlb.h
---- linux-2.6.18.2/include/asm-arm26/tlb.h 2006-01-03 17:30:02 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-arm26/tlb.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/include/asm-arm26/tlb.h 2006-01-03 17:30:02 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/asm-arm26/tlb.h 2006-09-20 17:01:44 +0200
@@ -3,6 +3,7 @@
#include <asm/pgalloc.h>
@@ -8650,9 +8440,8 @@
/*
* TLB handling. This allows us to remove pages from the page
-diff -NurpP --minimal linux-2.6.18.2/include/asm-arm26/unistd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-arm26/unistd.h
---- linux-2.6.18.2/include/asm-arm26/unistd.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-arm26/unistd.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/include/asm-arm26/unistd.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -8662,9 +8451,8 @@
/*
* The following SWIs are ARM private. FIXME - make appropriate for arm26
*/
-diff -NurpP --minimal linux-2.6.18.2/include/asm-generic/tlb.h linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-generic/tlb.h
---- linux-2.6.18.2/include/asm-generic/tlb.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-generic/tlb.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/include/asm-generic/tlb.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/asm-generic/tlb.h 2006-09-20 17:01:44 +0200
@@ -14,6 +14,7 @@
#define _ASM_GENERIC__TLB_H
@@ -8673,9 +8461,8 @@
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.18.2/include/asm-i386/elf.h linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-i386/elf.h
---- linux-2.6.18.2/include/asm-i386/elf.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-i386/elf.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/include/asm-i386/elf.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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... */
@@ -8685,9 +8472,8 @@
#define SET_PERSONALITY(ex, ibcs2) do { } while (0)
-diff -NurpP --minimal linux-2.6.18.2/include/asm-ia64/tlb.h linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-ia64/tlb.h
---- linux-2.6.18.2/include/asm-ia64/tlb.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-ia64/tlb.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/include/asm-ia64/tlb.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/asm-ia64/tlb.h 2006-09-20 17:01:44 +0200
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -8696,9 +8482,18 @@
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.18.2/include/asm-powerpc/systbl.h linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-powerpc/systbl.h
---- linux-2.6.18.2/include/asm-powerpc/systbl.h 2006-09-20 16:58:41 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-powerpc/systbl.h 2006-09-20 20:01:36 +0200
+--- linux-2.6.18.3/include/asm-mips/irq.h 2006-09-20 16:58:41 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/asm-mips/irq.h 2006-11-21 02:45:10 +0100
+@@ -10,6 +10,7 @@
+ #define _ASM_IRQ_H
+
+ #include <linux/linkage.h>
++#include <linux/vs_context.h>
+
+ #include <asm/mipsmtregs.h>
+
+--- linux-2.6.18.3/include/asm-powerpc/systbl.h 2006-09-20 16:58:41 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -8708,9 +8503,8 @@
SYSCALL(ni_syscall)
COMPAT_SYS(mbind)
COMPAT_SYS(get_mempolicy)
-diff -NurpP --minimal linux-2.6.18.2/include/asm-powerpc/unistd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-powerpc/unistd.h
---- linux-2.6.18.2/include/asm-powerpc/unistd.h 2006-09-20 16:58:41 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-powerpc/unistd.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/include/asm-powerpc/unistd.h 2006-09-20 16:58:41 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/asm-powerpc/unistd.h 2006-09-20 17:01:44 +0200
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -8720,9 +8514,8 @@
/* 258 currently unused */
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-2.6.18.2/include/asm-s390/unistd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-s390/unistd.h
---- linux-2.6.18.2/include/asm-s390/unistd.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-s390/unistd.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/include/asm-s390/unistd.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -8732,9 +8525,8 @@
#define __NR_fadvise64_64 264
#define __NR_statfs64 265
#define __NR_fstatfs64 266
-diff -NurpP --minimal linux-2.6.18.2/include/asm-sparc/unistd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-sparc/unistd.h
---- linux-2.6.18.2/include/asm-sparc/unistd.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-sparc/unistd.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/include/asm-sparc/unistd.h 2006-11-19 16:50:12 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/asm-sparc/unistd.h 2006-11-19 17:04:56 +0100
@@ -283,7 +283,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -8744,9 +8536,8 @@
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.18.2/include/asm-sparc64/tlb.h linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-sparc64/tlb.h
---- linux-2.6.18.2/include/asm-sparc64/tlb.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-sparc64/tlb.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/include/asm-sparc64/tlb.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/asm-sparc64/tlb.h 2006-09-20 17:01:44 +0200
@@ -2,6 +2,7 @@
#define _SPARC64_TLB_H
@@ -8755,9 +8546,8 @@
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
-diff -NurpP --minimal linux-2.6.18.2/include/asm-sparc64/unistd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-sparc64/unistd.h
---- linux-2.6.18.2/include/asm-sparc64/unistd.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-sparc64/unistd.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/include/asm-sparc64/unistd.h 2006-11-19 16:50:12 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/asm-sparc64/unistd.h 2006-11-19 17:04:56 +0100
@@ -285,7 +285,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -8767,9 +8557,8 @@
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.18.2/include/asm-x86_64/unistd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-x86_64/unistd.h
---- linux-2.6.18.2/include/asm-x86_64/unistd.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/asm-x86_64/unistd.h 2006-09-20 17:01:44 +0200
+--- linux-2.6.18.3/include/asm-x86_64/unistd.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -8779,9 +8568,8 @@
#define __NR_mbind 237
__SYSCALL(__NR_mbind, sys_mbind)
#define __NR_set_mempolicy 238
-diff -NurpP --minimal linux-2.6.18.2/include/linux/capability.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/capability.h
---- linux-2.6.18.2/include/linux/capability.h 2006-06-18 04:55:15 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/capability.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/capability.h 2006-06-18 04:55:15 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 */
@@ -8802,9 +8590,8 @@
#ifdef __KERNEL__
/*
* Bounding set
-diff -NurpP --minimal linux-2.6.18.2/include/linux/devpts_fs.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/devpts_fs.h
---- linux-2.6.18.2/include/linux/devpts_fs.h 2004-08-14 12:55:59 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/devpts_fs.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/devpts_fs.h 2004-08-14 12:55:59 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -8813,9 +8600,8 @@
+
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/ext2_fs.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/ext2_fs.h
---- linux-2.6.18.2/include/linux/ext2_fs.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/ext2_fs.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/ext2_fs.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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) */
@@ -8863,9 +8649,8 @@
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-2.6.18.2/include/linux/ext3_fs.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/ext3_fs.h
---- linux-2.6.18.2/include/linux/ext3_fs.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/ext3_fs.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/ext3_fs.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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) */
@@ -8920,9 +8705,8 @@
extern void ext3_read_inode (struct inode *);
extern int ext3_write_inode (struct inode *, int);
-diff -NurpP --minimal linux-2.6.18.2/include/linux/fs.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/fs.h
---- linux-2.6.18.2/include/linux/fs.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/fs.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/fs.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 */
@@ -9050,9 +8834,8 @@
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.2/include/linux/init_task.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/init_task.h
---- linux-2.6.18.2/include/linux/init_task.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/init_task.h 2006-09-20 17:51:11 +0200
+--- linux-2.6.18.3/include/linux/init_task.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 \
@@ -9064,9 +8847,8 @@
}
-diff -NurpP --minimal linux-2.6.18.2/include/linux/ipc.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/ipc.h
---- linux-2.6.18.2/include/linux/ipc.h 2004-08-14 12:54:46 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/ipc.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/ipc.h 2004-08-14 12:54:46 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -9075,9 +8857,8 @@
};
#endif /* __KERNEL__ */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/kernel.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/kernel.h
---- linux-2.6.18.2/include/linux/kernel.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/kernel.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/kernel.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/kernel.h 2006-09-20 17:01:45 +0200
@@ -17,6 +17,7 @@
#include <asm/bug.h>
@@ -9086,9 +8867,8 @@
#define INT_MAX ((int)(~0U>>1))
#define INT_MIN (-INT_MAX - 1)
-diff -NurpP --minimal linux-2.6.18.2/include/linux/major.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/major.h
---- linux-2.6.18.2/include/linux/major.h 2006-06-18 04:55:19 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/major.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/major.h 2006-06-18 04:55:19 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -9097,9 +8877,8 @@
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-2.6.18.2/include/linux/mount.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/mount.h
---- linux-2.6.18.2/include/linux/mount.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/mount.h 2006-09-20 17:50:23 +0200
+--- linux-2.6.18.3/include/linux/mount.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -9125,9 +8904,8 @@
};
static inline struct vfsmount *mntget(struct vfsmount *mnt)
-diff -NurpP --minimal linux-2.6.18.2/include/linux/net.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/net.h
---- linux-2.6.18.2/include/linux/net.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/net.h 2006-09-20 17:47:13 +0200
+--- linux-2.6.18.3/include/linux/net.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -9136,9 +8914,8 @@
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-2.6.18.2/include/linux/nfs_mount.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/nfs_mount.h
---- linux-2.6.18.2/include/linux/nfs_mount.h 2005-08-29 22:25:42 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/nfs_mount.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/nfs_mount.h 2005-08-29 22:25:42 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 */
@@ -9147,9 +8924,8 @@
#define NFS_MOUNT_FLAGMASK 0xFFFF
#endif
-diff -NurpP --minimal linux-2.6.18.2/include/linux/percpu.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/percpu.h
---- linux-2.6.18.2/include/linux/percpu.h 2006-04-09 13:49:57 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/percpu.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/percpu.h 2006-04-09 13:49:57 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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. */
@@ -9159,9 +8935,8 @@
#endif
/* Must be an lvalue. */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/pid.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/pid.h
---- linux-2.6.18.2/include/linux/pid.h 2006-06-18 04:55:21 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/pid.h 2006-10-17 01:48:03 +0200
+--- linux-2.6.18.3/include/linux/pid.h 2006-06-18 04:55:21 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/pid.h 2006-10-17 01:48:03 +0200
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
@@ -9172,9 +8947,8 @@
};
/*
-diff -NurpP --minimal linux-2.6.18.2/include/linux/proc_fs.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/proc_fs.h
---- linux-2.6.18.2/include/linux/proc_fs.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/proc_fs.h 2006-09-20 17:46:14 +0200
+--- linux-2.6.18.3/include/linux/proc_fs.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -9196,9 +8970,8 @@
} op;
struct proc_dir_entry *pde;
struct inode vfs_inode;
-diff -NurpP --minimal linux-2.6.18.2/include/linux/reiserfs_fs.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/reiserfs_fs.h
---- linux-2.6.18.2/include/linux/reiserfs_fs.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/reiserfs_fs.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/reiserfs_fs.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -9226,9 +8999,8 @@
/* namei.c */
void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
-diff -NurpP --minimal linux-2.6.18.2/include/linux/reiserfs_fs_sb.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/reiserfs_fs_sb.h
---- linux-2.6.18.2/include/linux/reiserfs_fs_sb.h 2006-02-18 14:40:35 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/reiserfs_fs_sb.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/reiserfs_fs_sb.h 2006-02-18 14:40:35 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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,
@@ -9237,9 +9009,8 @@
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-2.6.18.2/include/linux/sched.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/sched.h
---- linux-2.6.18.2/include/linux/sched.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/sched.h 2006-10-17 01:48:03 +0200
+--- linux-2.6.18.3/include/linux/sched.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -9353,9 +9124,8 @@
static inline struct user_struct *get_uid(struct user_struct *u)
{
atomic_inc(&u->__count);
-diff -NurpP --minimal linux-2.6.18.2/include/linux/shmem_fs.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/shmem_fs.h
---- linux-2.6.18.2/include/linux/shmem_fs.h 2006-04-09 13:49:57 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/shmem_fs.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/shmem_fs.h 2006-04-09 13:49:57 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/shmem_fs.h 2006-09-20 17:01:45 +0200
@@ -8,6 +8,9 @@
#define SHMEM_NR_DIRECT 16
@@ -9366,9 +9136,8 @@
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-2.6.18.2/include/linux/stat.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/stat.h
---- linux-2.6.18.2/include/linux/stat.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/stat.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/stat.h 2006-06-18 04:55:25 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/stat.h 2006-09-20 17:01:45 +0200
@@ -63,6 +63,7 @@ struct kstat {
unsigned int nlink;
uid_t uid;
@@ -9377,9 +9146,8 @@
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-2.6.18.2/include/linux/sunrpc/auth.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/sunrpc/auth.h
---- linux-2.6.18.2/include/linux/sunrpc/auth.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/sunrpc/auth.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/sunrpc/auth.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/sunrpc/auth.h 2006-09-20 17:01:45 +0200
@@ -27,6 +27,7 @@
struct auth_cred {
uid_t uid;
@@ -9388,9 +9156,8 @@
struct group_info *group_info;
};
-diff -NurpP --minimal linux-2.6.18.2/include/linux/sunrpc/clnt.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/sunrpc/clnt.h
---- linux-2.6.18.2/include/linux/sunrpc/clnt.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/sunrpc/clnt.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/sunrpc/clnt.h 2006-06-18 04:55:25 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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() */
@@ -9401,9 +9168,8 @@
struct rpc_rtt * cl_rtt; /* RTO estimator data */
struct rpc_portmap * cl_pmap; /* port mapping */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/sysctl.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/sysctl.h
---- linux-2.6.18.2/include/linux/sysctl.h 2006-11-04 19:43:24 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/sysctl.h 2006-10-16 18:56:11 +0200
+--- linux-2.6.18.3/include/linux/sysctl.h 2006-11-04 19:43:24 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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 */
@@ -9430,9 +9196,8 @@
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.2/include/linux/sysfs.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/sysfs.h
---- linux-2.6.18.2/include/linux/sysfs.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/sysfs.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/sysfs.h 2006-06-18 04:55:25 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/sysfs.h 2006-09-20 17:01:45 +0200
@@ -12,6 +12,8 @@
#include <asm/atomic.h>
@@ -9442,9 +9207,8 @@
struct kobject;
struct module;
-diff -NurpP --minimal linux-2.6.18.2/include/linux/types.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/types.h
---- linux-2.6.18.2/include/linux/types.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/types.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/types.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -9454,9 +9218,8 @@
#ifdef CONFIG_UID16
/* This is defined by include/asm-{arch}/posix_types.h */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vroot.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vroot.h
---- linux-2.6.18.2/include/linux/vroot.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vroot.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vroot.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vroot.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,51 @@
+
+/*
@@ -9509,10 +9272,9 @@
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_base.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_base.h
---- linux-2.6.18.2/include/linux/vs_base.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_base.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,106 @@
+--- linux-2.6.18.3/include/linux/vs_base.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vs_base.h 2006-11-21 02:45:10 +0100
+@@ -0,0 +1,109 @@
+#ifndef _VX_VS_BASE_H
+#define _VX_VS_BASE_H
+
@@ -9523,6 +9285,9 @@
+
+#define vx_current_xid() vx_task_xid(current)
+
++#define current_vx_info() (current->vx_info)
++
++
+#define vx_check(c,m) __vx_check(vx_current_xid(),c,m)
+
+#define vx_weak_check(c,m) ((m) ? vx_check(c,m) : 1)
@@ -9619,9 +9384,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_context.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_context.h
---- linux-2.6.18.2/include/linux/vs_context.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_context.h 2006-11-06 05:08:58 +0100
+--- linux-2.6.18.3/include/linux/vs_context.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vs_context.h 2006-11-21 02:45:10 +0100
@@ -0,0 +1,242 @@
+#ifndef _VX_VS_CONTEXT_H
+#define _VX_VS_CONTEXT_H
@@ -9865,9 +9629,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_cvirt.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_cvirt.h
---- linux-2.6.18.2/include/linux/vs_cvirt.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_cvirt.h 2006-11-07 19:01:49 +0100
+--- linux-2.6.18.3/include/linux/vs_cvirt.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vs_cvirt.h 2006-11-07 19:01:49 +0100
@@ -0,0 +1,157 @@
+#ifndef _VX_VS_CVIRT_H
+#define _VX_VS_CVIRT_H
@@ -10026,9 +9789,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_dlimit.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_dlimit.h
---- linux-2.6.18.2/include/linux/vs_dlimit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_dlimit.h 2006-10-16 19:04:59 +0200
+--- linux-2.6.18.3/include/linux/vs_dlimit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -10243,9 +10005,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_limit.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_limit.h
---- linux-2.6.18.2/include/linux/vs_limit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_limit.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vs_limit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -10354,9 +10115,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_memory.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_memory.h
---- linux-2.6.18.2/include/linux/vs_memory.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_memory.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vs_memory.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -10465,10 +10225,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_network.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_network.h
---- linux-2.6.18.2/include/linux/vs_network.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_network.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,215 @@
+--- linux-2.6.18.3/include/linux/vs_network.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vs_network.h 2006-11-21 02:45:10 +0100
+@@ -0,0 +1,220 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
+
@@ -10625,6 +10384,9 @@
+
+#define nx_current_nid() nx_task_nid(current)
+
++#define current_nx_info() (current->nx_info)
++
++
+#define nx_check(c,m) __nx_check(nx_current_nid(),c,m)
+
+#define nx_weak_check(c,m) ((m) ? nx_check(c,m) : 1)
@@ -10667,6 +10429,8 @@
+ return 1;
+
+ n = nxi->nbipv4;
++ if (n && (nxi->ipv4[0] == 0))
++ return 1;
+ for (i=0; i<n; i++) {
+ if (nxi->ipv4[i] == addr)
+ return 1;
@@ -10684,9 +10448,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_sched.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_sched.h
---- linux-2.6.18.2/include/linux/vs_sched.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_sched.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vs_sched.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -10780,10 +10543,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_socket.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_socket.h
---- linux-2.6.18.2/include/linux/vs_socket.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vs_socket.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,57 @@
+--- linux-2.6.18.3/include/linux/vs_socket.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vs_socket.h 2006-11-21 04:54:54 +0100
+@@ -0,0 +1,65 @@
+#ifndef _VX_VS_SOCKET_H
+#define _VX_VS_SOCKET_H
+
@@ -10793,16 +10555,24 @@
+/* socket accounting */
+
+#include <linux/socket.h>
++#include <linux/vserver/cacct.h>
+
+static inline int vx_sock_type(int family)
+{
-+ int type = 4;
-+
-+ if (family > 0 && family < 3)
-+ type = family;
-+ else if (family == PF_INET6)
-+ type = 3;
-+ return type;
++ switch (family) {
++ case PF_UNSPEC:
++ return VXA_SOCK_UNSPEC;
++ case PF_UNIX:
++ return VXA_SOCK_UNIX;
++ case PF_INET:
++ return VXA_SOCK_INET;
++ case PF_INET6:
++ return VXA_SOCK_INET6;
++ case PF_PACKET:
++ return VXA_SOCK_PACKET;
++ default:
++ return VXA_SOCK_OTHER;
++ }
+}
+
+#define vx_acc_sock(v,f,p,s) \
@@ -10841,10 +10611,27 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/context.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/context.h
---- linux-2.6.18.2/include/linux/vserver/context.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/context.h 2006-10-17 02:05:58 +0200
-@@ -0,0 +1,178 @@
+--- linux-2.6.18.3/include/linux/vserver/cacct.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/cacct.h 2006-11-21 02:45:10 +0100
+@@ -0,0 +1,15 @@
++#ifndef _VX_CACCT_H
++#define _VX_CACCT_H
++
++
++enum sock_acc_field {
++ VXA_SOCK_UNSPEC = 0,
++ VXA_SOCK_UNIX,
++ VXA_SOCK_INET,
++ VXA_SOCK_INET6,
++ VXA_SOCK_PACKET,
++ VXA_SOCK_OTHER,
++ VXA_SOCK_SIZE /* array size */
++};
++
++#endif /* _VX_CACCT_H */
+--- linux-2.6.18.3/include/linux/vserver/context.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/context.h 2006-11-23 16:37:07 +0100
+@@ -0,0 +1,177 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
+
@@ -10858,7 +10645,6 @@
+
+/* context flags */
+
-+#define VXF_INFO_LOCK 0x00000001
+#define VXF_INFO_SCHED 0x00000002
+#define VXF_INFO_NPROC 0x00000004
+#define VXF_INFO_PRIVATE 0x00000008
@@ -11023,9 +10809,8 @@
+#else /* _VX_CONTEXT_H */
+#warning duplicate inclusion
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/context_cmd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/context_cmd.h
---- linux-2.6.18.2/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/context_cmd.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -11111,9 +10896,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/cvirt.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/cvirt.h
---- linux-2.6.18.2/include/linux/vserver/cvirt.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/cvirt.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/cvirt.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/cvirt.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,26 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
@@ -11141,9 +10925,8 @@
+#else /* _VX_CVIRT_H */
+#warning duplicate inclusion
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/cvirt_cmd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/cvirt_cmd.h
---- linux-2.6.18.2/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/cvirt_cmd.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -11180,9 +10963,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/cvirt_def.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/cvirt_def.h
---- linux-2.6.18.2/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/cvirt_def.h 2006-10-20 03:12:44 +0200
+--- linux-2.6.18.3/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -11259,9 +11041,8 @@
+};
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/debug.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/debug.h
---- linux-2.6.18.2/include/linux/vserver/debug.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/debug.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/debug.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/debug.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,298 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
@@ -11561,9 +11342,8 @@
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/debug_cmd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/debug_cmd.h
---- linux-2.6.18.2/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/debug_cmd.h 2006-11-06 05:08:58 +0100
+--- linux-2.6.18.3/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/debug_cmd.h 2006-11-06 05:08:58 +0100
@@ -0,0 +1,14 @@
+#ifndef _VX_DEBUG_CMD_H
+#define _VX_DEBUG_CMD_H
@@ -11579,9 +11359,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/dlimit.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/dlimit.h
---- linux-2.6.18.2/include/linux/vserver/dlimit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/dlimit.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/dlimit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/dlimit.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_DLIMIT_H
+#define _VX_DLIMIT_H
@@ -11636,9 +11415,8 @@
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/dlimit_cmd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/dlimit_cmd.h
---- linux-2.6.18.2/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/dlimit_cmd.h 2006-11-06 05:31:43 +0100
+--- linux-2.6.18.3/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/dlimit_cmd.h 2006-11-06 05:31:43 +0100
@@ -0,0 +1,71 @@
+#ifndef _VX_DLIMIT_CMD_H
+#define _VX_DLIMIT_CMD_H
@@ -11711,9 +11489,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/inode.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/inode.h
---- linux-2.6.18.2/include/linux/vserver/inode.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/inode.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/inode.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/inode.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,38 @@
+#ifndef _VX_INODE_H
+#define _VX_INODE_H
@@ -11753,9 +11530,8 @@
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/inode_cmd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/inode_cmd.h
---- linux-2.6.18.2/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/inode_cmd.h 2006-11-06 05:31:43 +0100
+--- linux-2.6.18.3/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/inode_cmd.h 2006-11-06 05:31:43 +0100
@@ -0,0 +1,61 @@
+#ifndef _VX_INODE_CMD_H
+#define _VX_INODE_CMD_H
@@ -11818,9 +11594,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/legacy.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/legacy.h
---- linux-2.6.18.2/include/linux/vserver/legacy.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/legacy.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/legacy.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/legacy.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,49 @@
+#ifndef _VX_LEGACY_H
+#define _VX_LEGACY_H
@@ -11871,9 +11646,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LEGACY_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/limit.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/limit.h
---- linux-2.6.18.2/include/linux/vserver/limit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/limit.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/limit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/limit.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,20 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
@@ -11895,9 +11669,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/limit_cmd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/limit_cmd.h
---- linux-2.6.18.2/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/limit_cmd.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -11954,9 +11727,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/limit_def.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/limit_def.h
---- linux-2.6.18.2/include/linux/vserver/limit_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/limit_def.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/limit_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -11980,9 +11752,8 @@
+
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/limit_int.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/limit_int.h
---- linux-2.6.18.2/include/linux/vserver/limit_int.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/limit_int.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/limit_int.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -12060,9 +11831,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/namespace.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/namespace.h
---- linux-2.6.18.2/include/linux/vserver/namespace.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/namespace.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/namespace.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/namespace.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,15 @@
+#ifndef _VX_NAMESPACE_H
+#define _VX_NAMESPACE_H
@@ -12079,9 +11849,8 @@
+#else /* _VX_NAMESPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_NAMESPACE_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/namespace_cmd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/namespace_cmd.h
---- linux-2.6.18.2/include/linux/vserver/namespace_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/namespace_cmd.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/namespace_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -12100,10 +11869,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NAMESPACE_CMD_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/network.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/network.h
---- linux-2.6.18.2/include/linux/vserver/network.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/network.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,119 @@
+--- linux-2.6.18.3/include/linux/vserver/network.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/network.h 2006-11-23 16:37:07 +0100
+@@ -0,0 +1,121 @@
+#ifndef _VX_NETWORK_H
+#define _VX_NETWORK_H
+
@@ -12119,6 +11887,8 @@
+
+/* network flags */
+
++#define NXF_INFO_PRIVATE 0x00000008
++
+#define NXF_STATE_SETUP (1ULL<<32)
+
+#define NXF_SC_HELPER (1ULL<<36)
@@ -12223,9 +11993,8 @@
+#else /* _VX_NETWORK_H */
+#warning duplicate inclusion
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/network_cmd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/network_cmd.h
---- linux-2.6.18.2/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/network_cmd.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -12316,9 +12085,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/sched.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/sched.h
---- linux-2.6.18.2/include/linux/vserver/sched.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/sched.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/sched.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/sched.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,26 @@
+#ifndef _VX_SCHED_H
+#define _VX_SCHED_H
@@ -12346,9 +12114,8 @@
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/sched_cmd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/sched_cmd.h
---- linux-2.6.18.2/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/sched_cmd.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -12398,9 +12165,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/sched_def.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/sched_def.h
---- linux-2.6.18.2/include/linux/vserver/sched_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/sched_def.h 2006-10-20 00:46:11 +0200
+--- linux-2.6.18.3/include/linux/vserver/sched_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -12440,9 +12206,8 @@
+};
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/signal.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/signal.h
---- linux-2.6.18.2/include/linux/vserver/signal.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/signal.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/signal.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/signal.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,14 @@
+#ifndef _VX_SIGNAL_H
+#define _VX_SIGNAL_H
@@ -12458,9 +12223,8 @@
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/signal_cmd.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/signal_cmd.h
---- linux-2.6.18.2/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/signal_cmd.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -12488,9 +12252,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/switch.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/switch.h
---- linux-2.6.18.2/include/linux/vserver/switch.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/switch.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/linux/vserver/switch.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/switch.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,98 @@
+#ifndef _VX_SWITCH_H
+#define _VX_SWITCH_H
@@ -12590,9 +12353,8 @@
+#endif /* __KERNEL__ */
+
+#endif /* _VX_SWITCH_H */
-diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/xid.h linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/xid.h
---- linux-2.6.18.2/include/linux/vserver/xid.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/linux/vserver/xid.h 2006-10-29 05:06:18 +0100
+--- linux-2.6.18.3/include/linux/vserver/xid.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/linux/vserver/xid.h 2006-10-29 05:06:18 +0100
@@ -0,0 +1,144 @@
+#ifndef _VX_XID_H
+#define _VX_XID_H
@@ -12738,9 +12500,8 @@
+void vx_propagate_xid(struct nameidata *nd, struct inode *inode);
+
+#endif /* _VX_XID_H */
-diff -NurpP --minimal linux-2.6.18.2/include/net/af_unix.h linux-2.6.18.2-vs2.0.2.2-rc6/include/net/af_unix.h
---- linux-2.6.18.2/include/net/af_unix.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/net/af_unix.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/net/af_unix.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -12783,9 +12544,8 @@
}
#define forall_unix_sockets(i, s) \
-diff -NurpP --minimal linux-2.6.18.2/include/net/inet_hashtables.h linux-2.6.18.2-vs2.0.2.2-rc6/include/net/inet_hashtables.h
---- linux-2.6.18.2/include/net/inet_hashtables.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/net/inet_hashtables.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/net/inet_hashtables.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
}
@@ -12821,9 +12581,8 @@
(sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&
!sk->sk_bound_dev_if)
goto sherry_cache;
-diff -NurpP --minimal linux-2.6.18.2/include/net/inet_sock.h linux-2.6.18.2-vs2.0.2.2-rc6/include/net/inet_sock.h
---- linux-2.6.18.2/include/net/inet_sock.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/net/inet_sock.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/net/inet_sock.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -12832,9 +12591,8 @@
__u16 dport;
__u16 num;
__u32 saddr;
-diff -NurpP --minimal linux-2.6.18.2/include/net/inet_timewait_sock.h linux-2.6.18.2-vs2.0.2.2-rc6/include/net/inet_timewait_sock.h
---- linux-2.6.18.2/include/net/inet_timewait_sock.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/net/inet_timewait_sock.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/net/inet_timewait_sock.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -12846,9 +12604,8 @@
volatile unsigned char tw_substate;
/* 3 bits hole, try to pack */
unsigned char tw_rcv_wscale;
-diff -NurpP --minimal linux-2.6.18.2/include/net/route.h linux-2.6.18.2-vs2.0.2.2-rc6/include/net/route.h
---- linux-2.6.18.2/include/net/route.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/net/route.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/net/route.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/include/net/route.h 2006-09-20 17:01:45 +0200
@@ -27,11 +27,14 @@
#include <net/dst.h>
#include <net/inetpeer.h>
@@ -12953,9 +12710,8 @@
err = __ip_route_output_key(rp, &fl);
if (err)
return err;
-diff -NurpP --minimal linux-2.6.18.2/include/net/sock.h linux-2.6.18.2-vs2.0.2.2-rc6/include/net/sock.h
---- linux-2.6.18.2/include/net/sock.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/include/net/sock.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/include/net/sock.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -12978,9 +12734,8 @@
unsigned char sk_shutdown : 2,
sk_no_check : 2,
sk_userlocks : 4;
-diff -NurpP --minimal linux-2.6.18.2/ipc/mqueue.c linux-2.6.18.2-vs2.0.2.2-rc6/ipc/mqueue.c
---- linux-2.6.18.2/ipc/mqueue.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/ipc/mqueue.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/ipc/mqueue.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/ipc/mqueue.c 2006-09-20 17:01:45 +0200
@@ -29,6 +29,8 @@
#include <linux/audit.h>
#include <linux/signal.h>
@@ -13036,9 +12791,8 @@
out_err:
dput(dentry);
-diff -NurpP --minimal linux-2.6.18.2/ipc/msg.c linux-2.6.18.2-vs2.0.2.2-rc6/ipc/msg.c
---- linux-2.6.18.2/ipc/msg.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/ipc/msg.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/ipc/msg.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -13057,9 +12811,8 @@
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.2/ipc/sem.c linux-2.6.18.2-vs2.0.2.2-rc6/ipc/sem.c
---- linux-2.6.18.2/ipc/sem.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/ipc/sem.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/ipc/sem.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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);
@@ -13078,9 +12831,8 @@
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.2/ipc/shm.c linux-2.6.18.2-vs2.0.2.2-rc6/ipc/shm.c
---- linux-2.6.18.2/ipc/shm.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/ipc/shm.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/ipc/shm.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/ipc/shm.c 2006-09-20 17:01:45 +0200
@@ -32,6 +32,8 @@
#include <linux/ptrace.h>
#include <linux/seq_file.h>
@@ -13146,9 +12898,8 @@
if (sizeof(size_t) <= sizeof(int))
format = SMALL_STRING;
else
-diff -NurpP --minimal linux-2.6.18.2/ipc/util.c linux-2.6.18.2-vs2.0.2.2-rc6/ipc/util.c
---- linux-2.6.18.2/ipc/util.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/ipc/util.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/ipc/util.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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++) {
@@ -13170,9 +12921,8 @@
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.2/kernel/Makefile linux-2.6.18.2-vs2.0.2.2-rc6/kernel/Makefile
---- linux-2.6.18.2/kernel/Makefile 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/Makefile 2006-09-20 17:38:59 +0200
+--- linux-2.6.18.3/kernel/Makefile 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -13182,9 +12932,8 @@
obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-y += time/
obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
-diff -NurpP --minimal linux-2.6.18.2/kernel/capability.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/capability.c
---- linux-2.6.18.2/kernel/capability.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/capability.c 2006-10-18 01:19:40 +0200
+--- linux-2.6.18.3/kernel/capability.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/capability.c 2006-10-18 01:19:40 +0200
@@ -246,6 +246,9 @@ EXPORT_SYMBOL(__capable);
int capable(int cap)
@@ -13195,9 +12944,8 @@
return __capable(current, cap);
}
EXPORT_SYMBOL(capable);
-diff -NurpP --minimal linux-2.6.18.2/kernel/exit.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/exit.c
---- linux-2.6.18.2/kernel/exit.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/exit.c 2006-11-06 05:08:58 +0100
+--- linux-2.6.18.3/kernel/exit.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/exit.c 2006-11-06 05:08:58 +0100
@@ -38,6 +38,9 @@
#include <linux/pipe_fs_i.h>
#include <linux/audit.h> /* for audit_free() */
@@ -13270,9 +13018,8 @@
/* 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.2/kernel/fork.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/fork.c
---- linux-2.6.18.2/kernel/fork.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/fork.c 2006-09-20 17:35:08 +0200
+--- linux-2.6.18.3/kernel/fork.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/fork.c 2006-09-20 17:35:08 +0200
@@ -45,6 +45,10 @@
#include <linux/cn_proc.h>
#include <linux/delayacct.h>
@@ -13431,9 +13178,8 @@
bad_fork_free:
free_task(p);
fork_out:
-diff -NurpP --minimal linux-2.6.18.2/kernel/irq/handle.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/irq/handle.c
---- linux-2.6.18.2/kernel/irq/handle.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/irq/handle.c 2006-11-06 05:08:58 +0100
+--- linux-2.6.18.3/kernel/irq/handle.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/irq/handle.c 2006-11-06 05:08:58 +0100
@@ -15,6 +15,7 @@
#include <linux/random.h>
#include <linux/interrupt.h>
@@ -13476,9 +13222,8 @@
spin_unlock(&desc->lock);
return 1;
-diff -NurpP --minimal linux-2.6.18.2/kernel/kthread.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/kthread.c
---- linux-2.6.18.2/kernel/kthread.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/kthread.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/kthread.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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);
@@ -13488,9 +13233,8 @@
read_unlock(&tasklist_lock);
}
complete(&create->done);
-diff -NurpP --minimal linux-2.6.18.2/kernel/pid.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/pid.c
---- linux-2.6.18.2/kernel/pid.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/pid.c 2006-11-06 05:17:10 +0100
+--- linux-2.6.18.3/kernel/pid.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/pid.c 2006-11-06 05:17:10 +0100
@@ -26,6 +26,7 @@
#include <linux/init.h>
#include <linux/bootmem.h>
@@ -13525,9 +13269,8 @@
return pid_task(find_pid(nr), type);
}
-diff -NurpP --minimal linux-2.6.18.2/kernel/posix-timers.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/posix-timers.c
---- linux-2.6.18.2/kernel/posix-timers.c 2006-06-18 04:55:31 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/posix-timers.c 2006-10-17 02:39:53 +0200
+--- linux-2.6.18.3/kernel/posix-timers.c 2006-06-18 04:55:31 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/posix-timers.c 2006-10-17 02:39:53 +0200
@@ -48,6 +48,7 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
@@ -13586,9 +13329,8 @@
rtn->tgid != current->tgid ||
(event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_SIGNAL))
return NULL;
-diff -NurpP --minimal linux-2.6.18.2/kernel/printk.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/printk.c
---- linux-2.6.18.2/kernel/printk.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/printk.c 2006-10-17 02:37:14 +0200
+--- linux-2.6.18.3/kernel/printk.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/printk.c 2006-10-17 02:37:14 +0200
@@ -31,6 +31,8 @@
#include <linux/security.h>
#include <linux/bootmem.h>
@@ -13672,9 +13414,8 @@
preempt_enable();
return printed_len;
}
-diff -NurpP --minimal linux-2.6.18.2/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/ptrace.c
---- linux-2.6.18.2/kernel/ptrace.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/ptrace.c 2006-10-18 01:19:40 +0200
+--- linux-2.6.18.3/kernel/ptrace.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/ptrace.c 2006-10-18 01:19:40 +0200
@@ -521,6 +521,10 @@ asmlinkage long sys_ptrace(long request,
goto out;
}
@@ -13686,9 +13427,8 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out_put_task_struct;
-diff -NurpP --minimal linux-2.6.18.2/kernel/sched.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/sched.c
---- linux-2.6.18.2/kernel/sched.c 2006-11-04 19:43:24 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/sched.c 2006-11-06 05:08:58 +0100
+--- linux-2.6.18.3/kernel/sched.c 2006-11-04 19:43:24 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/sched.c 2006-11-06 05:08:58 +0100
@@ -55,6 +55,9 @@
#include <asm/tlb.h>
@@ -14045,9 +13785,8 @@
__activate_task(p, task_rq(p));
resched_task(rq->curr);
}
-diff -NurpP --minimal linux-2.6.18.2/kernel/signal.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/signal.c
---- linux-2.6.18.2/kernel/signal.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/signal.c 2006-11-06 05:08:58 +0100
+--- linux-2.6.18.3/kernel/signal.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/signal.c 2006-11-06 05:08:58 +0100
@@ -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)
@@ -14109,9 +13848,8 @@
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-2.6.18.2/kernel/softirq.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/softirq.c
---- linux-2.6.18.2/kernel/softirq.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/softirq.c 2006-10-17 02:35:27 +0200
+--- linux-2.6.18.3/kernel/softirq.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/softirq.c 2006-10-17 02:35:27 +0200
@@ -17,6 +17,7 @@
#include <linux/kthread.h>
#include <linux/rcupdate.h>
@@ -14144,9 +13882,8 @@
account_system_vtime(current);
_local_bh_enable();
}
-diff -NurpP --minimal linux-2.6.18.2/kernel/sys.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/sys.c
---- linux-2.6.18.2/kernel/sys.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/sys.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/sys.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/sys.c 2006-09-20 17:01:45 +0200
@@ -10,6 +10,7 @@
#include <linux/mman.h>
#include <linux/smp_lock.h>
@@ -14372,9 +14109,8 @@
return -EPERM;
if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > NR_OPEN)
return -EPERM;
-diff -NurpP --minimal linux-2.6.18.2/kernel/sysctl.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/sysctl.c
---- linux-2.6.18.2/kernel/sysctl.c 2006-11-04 19:43:24 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/sysctl.c 2006-10-16 18:56:11 +0200
+--- linux-2.6.18.3/kernel/sysctl.c 2006-11-04 19:43:24 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/sysctl.c 2006-10-16 18:56:11 +0200
@@ -45,6 +45,7 @@
#include <linux/syscalls.h>
#include <linux/nfs_fs.h>
@@ -14504,9 +14240,8 @@
return -EFAULT;
if (len < *lenp) {
if(put_user('\n', ((char __user *) buffer) + len))
-diff -NurpP --minimal linux-2.6.18.2/kernel/timer.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/timer.c
---- linux-2.6.18.2/kernel/timer.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/timer.c 2006-11-06 05:08:58 +0100
+--- linux-2.6.18.3/kernel/timer.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/timer.c 2006-11-06 05:08:58 +0100
@@ -34,6 +34,8 @@
#include <linux/cpu.h>
#include <linux/syscalls.h>
@@ -14572,9 +14307,8 @@
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.2/kernel/user.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/user.c
---- linux-2.6.18.2/kernel/user.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/user.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/user.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -14663,9 +14397,8 @@
spin_unlock_irq(&uidhash_lock);
return 0;
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/Kconfig linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/Kconfig
---- linux-2.6.18.2/kernel/vserver/Kconfig 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/Kconfig 2006-10-29 03:18:56 +0100
+--- linux-2.6.18.3/kernel/vserver/Kconfig 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/Kconfig 2006-10-29 03:18:56 +0100
@@ -0,0 +1,189 @@
+#
+# Linux VServer configuration
@@ -14856,9 +14589,8 @@
+ depends on EXPERIMENTAL && !VSERVER_LEGACYNET
+ default y
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/Makefile linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/Makefile
---- linux-2.6.18.2/kernel/vserver/Makefile 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/Makefile 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/vserver/Makefile 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/Makefile 2006-09-20 17:01:45 +0200
@@ -0,0 +1,16 @@
+#
+# Makefile for the Linux vserver routines.
@@ -14876,10 +14608,9 @@
+vserver-$(CONFIG_VSERVER_LEGACYNET) += legacynet.o
+vserver-$(CONFIG_VSERVER_HISTORY) += history.o
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/context.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/context.c
---- linux-2.6.18.2/kernel/vserver/context.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/context.c 2006-11-06 05:31:43 +0100
-@@ -0,0 +1,926 @@
+--- linux-2.6.18.3/kernel/vserver/context.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/context.c 2006-11-23 16:37:49 +0100
+@@ -0,0 +1,923 @@
+/*
+ * linux/kernel/vserver/context.c
+ *
@@ -14898,6 +14629,7 @@
+ * V0.09 revert to non RCU for now
+ * V0.10 and back to working RCU hash
+ * V0.11 and back to locking again
++ * V0.12 have __create claim() the vxi
+ *
+ */
+
@@ -15077,9 +14809,9 @@
+
+static inline void __unhash_vx_info(struct vx_info *vxi)
+{
-+ vxd_assert_lock(&vx_info_hash_lock);
+ vxdprintk(VXD_CBIT(xid, 4),
+ "__unhash_vx_info: %p[#%d]", vxi, vxi->vx_id);
++ spin_lock(&vx_info_hash_lock);
+ vxh_unhash_vx_info(vxi);
+
+ /* context must be hashed */
@@ -15087,6 +14819,7 @@
+
+ vxi->vx_state &= ~VXS_HASHED;
+ hlist_del(&vxi->vx_hlist);
++ spin_unlock(&vx_info_hash_lock);
+}
+
+
@@ -15208,7 +14941,7 @@
+/* __create_vx_info()
+
+ * create the requested context
-+ * get() and hash it */
++ * get(), claim() and hash it */
+
+static struct vx_info * __create_vx_info(int id)
+{
@@ -15253,6 +14986,7 @@
+ /* new context */
+ vxdprintk(VXD_CBIT(xid, 0),
+ "create_vx_info(%d) = %p (new)", id, new);
++ claim_vx_info(new, NULL);
+ __hash_vx_info(get_vx_info(new));
+ vxi = new, new = NULL;
+
@@ -15271,9 +15005,7 @@
+void unhash_vx_info(struct vx_info *vxi)
+{
+ __shutdown_vx_info(vxi);
-+ spin_lock(&vx_info_hash_lock);
+ __unhash_vx_info(vxi);
-+ spin_unlock(&vx_info_hash_lock);
+ __wakeup_vx_info(vxi);
+}
+
@@ -15518,7 +15250,7 @@
+ "vx_set_persistent(%p[#%d])", vxi, vxi->vx_id);
+
+ get_vx_info(vxi);
-+ claim_vx_info(vxi, current);
++ claim_vx_info(vxi, NULL);
+}
+
+void vx_clear_persistent(struct vx_info *vxi)
@@ -15526,7 +15258,7 @@
+ vxdprintk(VXD_CBIT(xid, 6),
+ "vx_clear_persistent(%p[#%d])", vxi, vxi->vx_id);
+
-+ release_vx_info(vxi, current);
++ release_vx_info(vxi, NULL);
+ put_vx_info(vxi);
+}
+
@@ -15644,26 +15376,22 @@
+ /* initial flags */
+ new_vxi->vx_flags = vc_data.flagword;
+
-+ /* get a reference for persistent contexts */
-+ if ((vc_data.flagword & VXF_PERSISTENT))
-+ vx_set_persistent(new_vxi);
-+
+ ret = -ENOEXEC;
+ if (vs_state_change(new_vxi, VSC_STARTUP))
-+ goto out_unhash;
++ goto out;
++
+ ret = vx_migrate_task(current, new_vxi);
-+ if (!ret) {
-+ /* return context id on success */
-+ ret = new_vxi->vx_id;
++ if (ret)
+ goto out;
-+ }
-+out_unhash:
-+ /* prepare for context disposal */
-+ new_vxi->vx_state |= VXS_SHUTDOWN;
++
++ /* return context id on success */
++ ret = new_vxi->vx_id;
++
++ /* get a reference for persistent contexts */
+ if ((vc_data.flagword & VXF_PERSISTENT))
-+ vx_clear_persistent(new_vxi);
-+ __unhash_vx_info(new_vxi);
++ vx_set_persistent(new_vxi);
+out:
++ release_vx_info(new_vxi, NULL);
+ put_vx_info(new_vxi);
+ return ret;
+}
@@ -15806,9 +15534,8 @@
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/cvirt.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/cvirt.c
---- linux-2.6.18.2/kernel/vserver/cvirt.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/cvirt.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/vserver/cvirt.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/cvirt.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,260 @@
+/*
+ * linux/kernel/vserver/cvirt.c
@@ -16070,9 +15797,8 @@
+ put_vx_info(vxi);
+ return (name ? 0 : -EFAULT);
+}
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/cvirt_init.h linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/cvirt_init.h
---- linux-2.6.18.2/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/cvirt_init.h 2006-10-29 05:06:18 +0100
+--- linux-2.6.18.3/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/cvirt_init.h 2006-10-29 05:06:18 +0100
@@ -0,0 +1,78 @@
+
+
@@ -16152,9 +15878,8 @@
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/cvirt_proc.h linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/cvirt_proc.h
---- linux-2.6.18.2/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/cvirt_proc.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -16248,9 +15973,8 @@
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/dlimit.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/dlimit.c
---- linux-2.6.18.2/kernel/vserver/dlimit.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/dlimit.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/vserver/dlimit.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/dlimit.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,548 @@
+/*
+ * linux/kernel/vserver/dlimit.c
@@ -16800,9 +16524,8 @@
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/helper.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/helper.c
---- linux-2.6.18.2/kernel/vserver/helper.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/helper.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/vserver/helper.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/helper.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,210 @@
+/*
+ * linux/kernel/vserver/helper.c
@@ -17014,9 +16737,8 @@
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/history.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/history.c
---- linux-2.6.18.2/kernel/vserver/history.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/history.c 2006-11-06 05:08:58 +0100
+--- linux-2.6.18.3/kernel/vserver/history.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/history.c 2006-11-06 05:08:58 +0100
@@ -0,0 +1,183 @@
+/*
+ * kernel/vserver/history.c
@@ -17201,9 +16923,8 @@
+
+EXPORT_SYMBOL_GPL(vxh_advance);
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/init.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/init.c
---- linux-2.6.18.2/kernel/vserver/init.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/init.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/vserver/init.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/init.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,43 @@
+/*
+ * linux/kernel/init.c
@@ -17248,9 +16969,8 @@
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/inode.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/inode.c
---- linux-2.6.18.2/kernel/vserver/inode.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/inode.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/vserver/inode.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/inode.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,368 @@
+/*
+ * linux/kernel/vserver/inode.c
@@ -17620,10 +17340,9 @@
+
+EXPORT_SYMBOL_GPL(vx_propagate_xid);
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/legacy.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/legacy.c
---- linux-2.6.18.2/kernel/vserver/legacy.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/legacy.c 2006-11-06 05:08:58 +0100
-@@ -0,0 +1,113 @@
+--- linux-2.6.18.3/kernel/vserver/legacy.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/legacy.c 2006-11-23 17:15:51 +0100
+@@ -0,0 +1,111 @@
+/*
+ * linux/kernel/vserver/legacy.c
+ *
@@ -17685,9 +17404,7 @@
+ return ret;
+ }
+
-+ if (!vx_check(0, VX_ADMIN) || !capable(CAP_SYS_ADMIN)
-+ /* might make sense in the future, or not ... */
-+ || vx_flags(VX_INFO_LOCK, 0))
++ if (!vx_check(0, VX_ADMIN) || !capable(CAP_SYS_ADMIN))
+ return -EPERM;
+
+ /* ugly hack for Spectator */
@@ -17737,10 +17454,9 @@
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/legacynet.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/legacynet.c
---- linux-2.6.18.2/kernel/vserver/legacynet.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/legacynet.c 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,84 @@
+--- linux-2.6.18.3/kernel/vserver/legacynet.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/legacynet.c 2006-11-23 16:37:07 +0100
+@@ -0,0 +1,85 @@
+
+/*
+ * linux/kernel/vserver/legacynet.c
@@ -17820,23 +17536,24 @@
+ printk("!!! switching nx_info %p->%p\n", nxi, new_nxi);
+
+ nx_migrate_task(current, new_nxi);
++ release_nx_info(new_nxi, NULL);
+ put_nx_info(new_nxi);
+ return 0;
+}
+
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/limit.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/limit.c
---- linux-2.6.18.2/kernel/vserver/limit.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/limit.c 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,238 @@
+--- linux-2.6.18.3/kernel/vserver/limit.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/limit.c 2006-11-21 02:50:26 +0100
+@@ -0,0 +1,233 @@
+/*
+ * linux/kernel/vserver/limit.c
+ *
+ * Virtual Server: Context Limits
+ *
-+ * Copyright (C) 2004-2005 Herbert Pötzl
++ * Copyright (C) 2004-2006 Herbert Pötzl
+ *
+ * V0.01 broken out from vcontext V0.05
++ * V0.02 sync to valid limit check from 2.1.1
+ *
+ */
+
@@ -17871,25 +17588,37 @@
+EXPORT_SYMBOL_GPL(vlimit_name);
+
+
-+static int is_valid_rlimit(int id)
-+{
-+ int valid = 0;
++#define MASK_ENTRY(x) (1 << (x))
+
-+ switch (id) {
-+ case RLIMIT_RSS:
-+ case RLIMIT_NPROC:
-+ case RLIMIT_NOFILE:
-+ case RLIMIT_MEMLOCK:
-+ case RLIMIT_AS:
-+
-+ case VLIMIT_NSOCK:
-+ case VLIMIT_OPENFD:
-+ case VLIMIT_ANON:
-+ case VLIMIT_SHMEM:
-+ valid = 1;
-+ break;
-+ }
-+ return valid;
++const struct vcmd_ctx_rlimit_mask_v0 vlimit_mask = {
++ /* minimum */
++ 0
++ , /* softlimit */
++ MASK_ENTRY( RLIMIT_RSS ) |
++ MASK_ENTRY( VLIMIT_ANON ) |
++ 0
++ , /* maximum */
++ MASK_ENTRY( RLIMIT_RSS ) |
++ MASK_ENTRY( RLIMIT_NPROC ) |
++ MASK_ENTRY( RLIMIT_NOFILE ) |
++ MASK_ENTRY( RLIMIT_MEMLOCK ) |
++ MASK_ENTRY( RLIMIT_AS ) |
++ MASK_ENTRY( RLIMIT_LOCKS ) |
++ MASK_ENTRY( RLIMIT_MSGQUEUE ) |
++
++ MASK_ENTRY( VLIMIT_NSOCK ) |
++ MASK_ENTRY( VLIMIT_OPENFD ) |
++ MASK_ENTRY( VLIMIT_ANON ) |
++ MASK_ENTRY( VLIMIT_SHMEM ) |
++ 0
++};
++
++
++static int is_valid_vlimit(int id)
++{
++ uint32_t mask = vlimit_mask.minimum |
++ vlimit_mask.softlimit | vlimit_mask.maximum;
++ return mask & (1 << id);
+}
+
+static inline uint64_t vc_get_rlim(struct vx_info *vxi, int id)
@@ -17907,7 +17636,7 @@
+{
+ struct vx_info *vxi;
+
-+ if (!is_valid_rlimit(id))
++ if (!is_valid_vlimit(id))
+ return -EINVAL;
+
+ vxi = lookup_vx_info(xid);
@@ -17947,7 +17676,7 @@
+{
+ struct vx_info *vxi;
+
-+ if (!is_valid_rlimit(id))
++ if (!is_valid_vlimit(id))
+ return -EINVAL;
+
+ vxi = lookup_vx_info(xid);
@@ -18012,25 +17741,7 @@
+
+int vc_get_rlimit_mask(uint32_t id, void __user *data)
+{
-+ static struct vcmd_ctx_rlimit_mask_v0 mask = {
-+ /* minimum */
-+ 0
-+ , /* softlimit */
-+ 0
-+ , /* maximum */
-+ (1 << RLIMIT_RSS) |
-+ (1 << RLIMIT_NPROC) |
-+ (1 << RLIMIT_NOFILE) |
-+ (1 << RLIMIT_MEMLOCK) |
-+ (1 << RLIMIT_LOCKS) |
-+ (1 << RLIMIT_AS) |
-+ (1 << VLIMIT_ANON) |
-+ 0
-+ };
-+
-+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RESOURCE))
-+ return -EPERM;
-+ if (copy_to_user(data, &mask, sizeof(mask)))
++ if (copy_to_user(data, &vlimit_mask, sizeof(vlimit_mask)))
+ return -EFAULT;
+ return 0;
+}
@@ -18067,9 +17778,8 @@
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/limit_init.h linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/limit_init.h
---- linux-2.6.18.2/kernel/vserver/limit_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/limit_init.h 2006-10-29 05:06:18 +0100
+--- linux-2.6.18.3/kernel/vserver/limit_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/limit_init.h 2006-10-29 05:06:18 +0100
@@ -0,0 +1,29 @@
+
+
@@ -18100,9 +17810,8 @@
+#endif
+}
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/limit_proc.h linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/limit_proc.h
---- linux-2.6.18.2/kernel/vserver/limit_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/limit_proc.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/vserver/limit_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -18162,9 +17871,8 @@
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/namespace.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/namespace.c
---- linux-2.6.18.2/kernel/vserver/namespace.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/namespace.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/vserver/namespace.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/namespace.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,113 @@
+/*
+ * linux/kernel/vserver/namespace.c
@@ -18279,22 +17987,22 @@
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/network.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/network.c
---- linux-2.6.18.2/kernel/vserver/network.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/network.c 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,807 @@
+--- linux-2.6.18.3/kernel/vserver/network.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/network.c 2006-11-23 16:38:19 +0100
+@@ -0,0 +1,812 @@
+/*
+ * linux/kernel/vserver/network.c
+ *
+ * Virtual Server: Network Support
+ *
-+ * Copyright (C) 2003-2005 Herbert Pötzl
++ * Copyright (C) 2003-2006 Herbert Pötzl
+ *
+ * V0.01 broken out from vcontext V0.05
+ * V0.02 cleaned up implementation
+ * V0.03 added equiv nx commands
+ * V0.04 switch to RCU based hash
+ * V0.05 and back to locking again
++ * V0.06 have __create claim() the nxi
+ *
+ */
+
@@ -18424,15 +18132,16 @@
+
+static inline void __unhash_nx_info(struct nx_info *nxi)
+{
-+ vxd_assert_lock(&nx_info_hash_lock);
+ vxdprintk(VXD_CBIT(nid, 4),
+ "__unhash_nx_info: %p[#%d]", nxi, nxi->nx_id);
+
++ spin_lock(&nx_info_hash_lock);
+ /* context must be hashed */
+ BUG_ON(!nx_info_state(nxi, NXS_HASHED));
+
+ nxi->nx_state &= ~NXS_HASHED;
+ hlist_del(&nxi->nx_hlist);
++ spin_unlock(&nx_info_hash_lock);
+}
+
+
@@ -18489,7 +18198,7 @@
+/* __create_nx_info()
+
+ * create the requested context
-+ * get() and hash it */
++ * get(), claim() and hash it */
+
+static struct nx_info * __create_nx_info(int id)
+{
@@ -18534,6 +18243,7 @@
+ /* new context */
+ vxdprintk(VXD_CBIT(nid, 0),
+ "create_nx_info(%d) = %p (new)", id, new);
++ claim_nx_info(new, NULL);
+ __hash_nx_info(get_nx_info(new));
+ nxi = new, new = NULL;
+
@@ -18552,9 +18262,7 @@
+void unhash_nx_info(struct nx_info *nxi)
+{
+ __shutdown_nx_info(nxi);
-+ spin_lock(&nx_info_hash_lock);
+ __unhash_nx_info(nxi);
-+ spin_unlock(&nx_info_hash_lock);
+}
+
+#ifdef CONFIG_VSERVER_LEGACYNET
@@ -18657,6 +18365,10 @@
+ if (old_nxi == nxi)
+ goto out;
+
++ ret =-EACCES;
++ if (nx_info_flags(nxi, NXF_INFO_PRIVATE, 0))
++ goto out;
++
+ task_lock(p);
+ if (old_nxi)
+ clr_nx_info(&p->nx_info);
@@ -18671,6 +18383,7 @@
+
+ if (old_nxi)
+ release_nx_info(old_nxi, p);
++ ret = 0;
+out:
+ put_nx_info(old_nxi);
+ return ret;
@@ -18773,8 +18486,11 @@
+
+void nx_set_persistent(struct nx_info *nxi)
+{
++ vxdprintk(VXD_CBIT(nid, 6),
++ "nx_set_persistent(%p[#%d])", nxi, nxi->nx_id);
++
+ get_nx_info(nxi);
-+ claim_nx_info(nxi, current);
++ claim_nx_info(nxi, NULL);
+}
+
+void nx_clear_persistent(struct nx_info *nxi)
@@ -18782,7 +18498,7 @@
+ vxdprintk(VXD_CBIT(nid, 6),
+ "nx_clear_persistent(%p[#%d])", nxi, nxi->nx_id);
+
-+ release_nx_info(nxi, current);
++ release_nx_info(nxi, NULL);
+ put_nx_info(nxi);
+}
+
@@ -18870,26 +18586,22 @@
+ /* initial flags */
+ new_nxi->nx_flags = vc_data.flagword;
+
-+ /* get a reference for persistent contexts */
-+ if ((vc_data.flagword & NXF_PERSISTENT))
-+ nx_set_persistent(new_nxi);
-+
+ ret = -ENOEXEC;
+ if (vs_net_change(new_nxi, VSC_NETUP))
-+ goto out_unhash;
++ goto out;
++
+ ret = nx_migrate_task(current, new_nxi);
-+ if (!ret) {
-+ /* return context id on success */
-+ ret = new_nxi->nx_id;
++ if (ret)
+ goto out;
-+ }
-+out_unhash:
-+ /* prepare for context disposal */
-+ new_nxi->nx_state |= NXS_SHUTDOWN;
++
++ /* return context id on success */
++ ret = new_nxi->nx_id;
++
++ /* get a reference for persistent contexts */
+ if ((vc_data.flagword & NXF_PERSISTENT))
-+ nx_clear_persistent(new_nxi);
-+ __unhash_nx_info(new_nxi);
++ nx_set_persistent(new_nxi);
+out:
++ release_nx_info(new_nxi, NULL);
+ put_nx_info(new_nxi);
+ return ret;
+}
@@ -19090,10 +18802,9 @@
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/proc.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/proc.c
---- linux-2.6.18.2/kernel/vserver/proc.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/proc.c 2006-11-06 05:08:58 +0100
-@@ -0,0 +1,860 @@
+--- linux-2.6.18.3/kernel/vserver/proc.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/proc.c 2006-11-21 00:13:49 +0100
+@@ -0,0 +1,862 @@
+/*
+ * linux/kernel/vserver/proc.c
+ *
@@ -19313,8 +19024,10 @@
+ length = sprintf(buffer,
+ "UseCnt:\t%d\n"
+ "Tasks:\t%d\n"
++ "Flags:\t%016llx\n"
+ ,atomic_read(&nxi->nx_usecnt)
+ ,atomic_read(&nxi->nx_tasks)
++ ,(unsigned long long)nxi->nx_flags
+ );
+ put_nx_info(nxi);
+ return length;
@@ -19954,9 +19667,8 @@
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/sched.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/sched.c
---- linux-2.6.18.2/kernel/vserver/sched.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/sched.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/vserver/sched.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/sched.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,217 @@
+/*
+ * linux/kernel/vserver/sched.c
@@ -20175,9 +19887,8 @@
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/sched_init.h linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/sched_init.h
---- linux-2.6.18.2/kernel/vserver/sched_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/sched_init.h 2006-11-06 05:08:58 +0100
+--- linux-2.6.18.3/kernel/vserver/sched_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/sched_init.h 2006-11-06 05:08:58 +0100
@@ -0,0 +1,33 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
@@ -20212,9 +19923,8 @@
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/sched_proc.h linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/sched_proc.h
---- linux-2.6.18.2/kernel/vserver/sched_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/sched_proc.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/vserver/sched_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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
@@ -20256,9 +19966,8 @@
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/signal.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/signal.c
---- linux-2.6.18.2/kernel/vserver/signal.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/signal.c 2006-11-06 05:08:58 +0100
+--- linux-2.6.18.3/kernel/vserver/signal.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/signal.c 2006-11-06 05:08:58 +0100
@@ -0,0 +1,139 @@
+/*
+ * linux/kernel/vserver/signal.c
@@ -20399,9 +20108,8 @@
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/switch.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/switch.c
---- linux-2.6.18.2/kernel/vserver/switch.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/switch.c 2006-11-06 05:08:58 +0100
+--- linux-2.6.18.3/kernel/vserver/switch.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/switch.c 2006-11-06 05:08:58 +0100
@@ -0,0 +1,268 @@
+/*
+ * linux/kernel/vserver/switch.c
@@ -20671,9 +20379,8 @@
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/sysctl.c linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/sysctl.c
---- linux-2.6.18.2/kernel/vserver/sysctl.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/sysctl.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/vserver/sysctl.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/sysctl.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,227 @@
+/*
+ * kernel/vserver/sysctl.c
@@ -20902,9 +20609,8 @@
+EXPORT_SYMBOL_GPL(vx_debug_cvirt);
+EXPORT_SYMBOL_GPL(vx_debug_misc);
+
-diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/vci_config.h linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/vci_config.h
---- linux-2.6.18.2/kernel/vserver/vci_config.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/kernel/vserver/vci_config.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/kernel/vserver/vci_config.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/kernel/vserver/vci_config.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,70 @@
+
+enum {
@@ -20976,9 +20682,8 @@
+ 0;
+}
+
-diff -NurpP --minimal linux-2.6.18.2/mm/filemap_xip.c linux-2.6.18.2-vs2.0.2.2-rc6/mm/filemap_xip.c
---- linux-2.6.18.2/mm/filemap_xip.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/mm/filemap_xip.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/mm/filemap_xip.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/mm/filemap_xip.c 2006-09-20 17:01:45 +0200
@@ -13,6 +13,7 @@
#include <linux/module.h>
#include <linux/uio.h>
@@ -20987,9 +20692,8 @@
#include <asm/tlbflush.h>
#include "filemap.h"
-diff -NurpP --minimal linux-2.6.18.2/mm/fremap.c linux-2.6.18.2-vs2.0.2.2-rc6/mm/fremap.c
---- linux-2.6.18.2/mm/fremap.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/mm/fremap.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/mm/fremap.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/mm/fremap.c 2006-09-20 17:01:45 +0200
@@ -15,6 +15,7 @@
#include <linux/rmap.h>
#include <linux/module.h>
@@ -21007,9 +20711,8 @@
if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte))
inc_mm_counter(mm, file_rss);
-diff -NurpP --minimal linux-2.6.18.2/mm/hugetlb.c linux-2.6.18.2-vs2.0.2.2-rc6/mm/hugetlb.c
---- linux-2.6.18.2/mm/hugetlb.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/mm/hugetlb.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/mm/hugetlb.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/mm/hugetlb.c 2006-09-20 17:01:45 +0200
@@ -19,6 +19,7 @@
#include <asm/pgtable.h>
@@ -21018,9 +20721,8 @@
#include "internal.h"
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-2.6.18.2/mm/memory.c linux-2.6.18.2-vs2.0.2.2-rc6/mm/memory.c
---- linux-2.6.18.2/mm/memory.c 2006-11-04 19:43:24 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/mm/memory.c 2006-11-06 04:47:17 +0100
+--- linux-2.6.18.3/mm/memory.c 2006-11-04 19:43:24 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/mm/memory.c 2006-11-06 04:47:17 +0100
@@ -1965,6 +1965,11 @@ static int do_swap_page(struct mm_struct
grab_swap_token();
}
@@ -21052,9 +20754,8 @@
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.2/mm/mlock.c linux-2.6.18.2-vs2.0.2.2-rc6/mm/mlock.c
---- linux-2.6.18.2/mm/mlock.c 2006-04-09 13:49:58 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/mm/mlock.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/mm/mlock.c 2006-04-09 13:49:58 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/mm/mlock.c 2006-09-20 17:01:45 +0200
@@ -10,6 +10,7 @@
#include <linux/mm.h>
#include <linux/mempolicy.h>
@@ -21111,9 +20812,8 @@
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.2/mm/mmap.c linux-2.6.18.2-vs2.0.2.2-rc6/mm/mmap.c
---- linux-2.6.18.2/mm/mmap.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/mm/mmap.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/mm/mmap.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/mm/mmap.c 2006-09-20 17:01:45 +0200
@@ -1137,10 +1137,10 @@ munmap_back:
kmem_cache_free(vm_area_cachep, vma);
}
@@ -21212,9 +20912,8 @@
+ return 0;
return 1;
}
-diff -NurpP --minimal linux-2.6.18.2/mm/mremap.c linux-2.6.18.2-vs2.0.2.2-rc6/mm/mremap.c
---- linux-2.6.18.2/mm/mremap.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/mm/mremap.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/mm/mremap.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/mm/mremap.c 2006-09-20 17:01:45 +0200
@@ -18,6 +18,7 @@
#include <linux/highmem.h>
#include <linux/security.h>
@@ -21264,9 +20963,8 @@
make_pages_present(addr + old_len,
addr + new_len);
}
-diff -NurpP --minimal linux-2.6.18.2/mm/nommu.c linux-2.6.18.2-vs2.0.2.2-rc6/mm/nommu.c
---- linux-2.6.18.2/mm/nommu.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/mm/nommu.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/mm/nommu.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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);
@@ -21294,9 +20992,8 @@
while ((tmp = mm->context.vmlist)) {
mm->context.vmlist = tmp->next;
-diff -NurpP --minimal linux-2.6.18.2/mm/oom_kill.c linux-2.6.18.2-vs2.0.2.2-rc6/mm/oom_kill.c
---- linux-2.6.18.2/mm/oom_kill.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/mm/oom_kill.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/mm/oom_kill.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/mm/oom_kill.c 2006-09-20 17:01:45 +0200
@@ -67,6 +67,8 @@ unsigned long badness(struct task_struct
*/
task_unlock(p);
@@ -21306,9 +21003,8 @@
/*
* 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.2/mm/page_alloc.c linux-2.6.18.2-vs2.0.2.2-rc6/mm/page_alloc.c
---- linux-2.6.18.2/mm/page_alloc.c 2006-11-04 19:43:24 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/mm/page_alloc.c 2006-11-06 04:47:17 +0100
+--- linux-2.6.18.3/mm/page_alloc.c 2006-11-04 19:43:24 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/mm/page_alloc.c 2006-11-06 04:47:17 +0100
@@ -37,6 +37,7 @@
#include <linux/vmalloc.h>
#include <linux/mempolicy.h>
@@ -21335,9 +21031,8 @@
}
#endif
-diff -NurpP --minimal linux-2.6.18.2/mm/rmap.c linux-2.6.18.2-vs2.0.2.2-rc6/mm/rmap.c
---- linux-2.6.18.2/mm/rmap.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/mm/rmap.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/mm/rmap.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/mm/rmap.c 2006-09-20 17:01:45 +0200
@@ -53,6 +53,7 @@
#include <linux/rmap.h>
#include <linux/rcupdate.h>
@@ -21346,9 +21041,8 @@
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.18.2/mm/shmem.c linux-2.6.18.2-vs2.0.2.2-rc6/mm/shmem.c
---- linux-2.6.18.2/mm/shmem.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/mm/shmem.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/mm/shmem.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/mm/shmem.c 2006-09-20 17:01:45 +0200
@@ -51,7 +51,6 @@
#include <asm/pgtable.h>
@@ -21375,9 +21069,8 @@
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-2.6.18.2/mm/swapfile.c linux-2.6.18.2-vs2.0.2.2-rc6/mm/swapfile.c
---- linux-2.6.18.2/mm/swapfile.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/mm/swapfile.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/mm/swapfile.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/mm/swapfile.c 2006-09-20 17:01:45 +0200
@@ -31,6 +31,7 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
@@ -21395,9 +21088,8 @@
}
/*
-diff -NurpP --minimal linux-2.6.18.2/net/core/dev.c linux-2.6.18.2-vs2.0.2.2-rc6/net/core/dev.c
---- linux-2.6.18.2/net/core/dev.c 2006-11-04 19:43:24 +0100
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/core/dev.c 2006-10-16 18:56:11 +0200
+--- linux-2.6.18.3/net/core/dev.c 2006-11-04 19:43:24 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/net/core/dev.c 2006-10-16 18:56:11 +0200
@@ -117,6 +117,7 @@
#include <linux/dmaengine.h>
#include <linux/err.h>
@@ -21427,9 +21119,8 @@
if (dev->get_stats) {
struct net_device_stats *stats = dev->get_stats(dev);
-diff -NurpP --minimal linux-2.6.18.2/net/core/rtnetlink.c linux-2.6.18.2-vs2.0.2.2-rc6/net/core/rtnetlink.c
---- linux-2.6.18.2/net/core/rtnetlink.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/core/rtnetlink.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/core/rtnetlink.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -21450,9 +21141,8 @@
skb = alloc_skb(size, GFP_KERNEL);
if (!skb)
return;
-diff -NurpP --minimal linux-2.6.18.2/net/core/sock.c linux-2.6.18.2-vs2.0.2.2-rc6/net/core/sock.c
---- linux-2.6.18.2/net/core/sock.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/core/sock.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/core/sock.c 2006-11-19 16:50:12 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/net/core/sock.c 2006-11-19 17:04:57 +0100
@@ -124,6 +124,9 @@
#include <linux/ipsec.h>
@@ -21518,9 +21208,8 @@
atomic_set(&sk->sk_refcnt, 1);
}
-diff -NurpP --minimal linux-2.6.18.2/net/ipv4/af_inet.c linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/af_inet.c
---- linux-2.6.18.2/net/ipv4/af_inet.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/af_inet.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/ipv4/af_inet.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/net/ipv4/af_inet.c 2006-09-20 17:01:45 +0200
@@ -115,6 +115,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
@@ -21614,9 +21303,8 @@
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->saddr = 0; /* Use device */
-diff -NurpP --minimal linux-2.6.18.2/net/ipv4/devinet.c linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/devinet.c
---- linux-2.6.18.2/net/ipv4/devinet.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/devinet.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/ipv4/devinet.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/net/ipv4/devinet.c 2006-09-20 17:01:45 +0200
@@ -606,6 +606,9 @@ int devinet_ioctl(unsigned int cmd, void
*colon = ':';
@@ -21678,9 +21366,8 @@
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.2/net/ipv4/fib_hash.c linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/fib_hash.c
---- linux-2.6.18.2/net/ipv4/fib_hash.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/fib_hash.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/ipv4/fib_hash.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
}
@@ -21700,9 +21387,8 @@
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.2/net/ipv4/inet_connection_sock.c linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/inet_connection_sock.c
---- linux-2.6.18.2/net/ipv4/inet_connection_sock.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/inet_connection_sock.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/ipv4/inet_connection_sock.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
@@ -21723,9 +21409,8 @@
break;
}
}
-diff -NurpP --minimal linux-2.6.18.2/net/ipv4/inet_diag.c linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/inet_diag.c
---- linux-2.6.18.2/net/ipv4/inet_diag.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/inet_diag.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/ipv4/inet_diag.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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);
@@ -21753,9 +21438,8 @@
if (num < s_num)
goto next_dying;
if (r->id.idiag_sport != tw->tw_sport &&
-diff -NurpP --minimal linux-2.6.18.2/net/ipv4/inet_hashtables.c linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/inet_hashtables.c
---- linux-2.6.18.2/net/ipv4/inet_hashtables.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/inet_hashtables.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/ipv4/inet_hashtables.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
@@ -21771,9 +21455,8 @@
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
continue;
-diff -NurpP --minimal linux-2.6.18.2/net/ipv4/raw.c linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/raw.c
---- linux-2.6.18.2/net/ipv4/raw.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/raw.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/ipv4/raw.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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);
}
@@ -21865,9 +21548,8 @@
if (!sk && ++state->bucket < RAWV4_HTABLE_SIZE) {
sk = sk_head(&raw_v4_htable[state->bucket]);
-diff -NurpP --minimal linux-2.6.18.2/net/ipv4/tcp.c linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/tcp.c
---- linux-2.6.18.2/net/ipv4/tcp.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/tcp.c 2006-09-20 17:02:28 +0200
+--- linux-2.6.18.3/net/ipv4/tcp.c 2006-11-19 16:50:13 +0100
++++ linux-2.6.18.3-vs2.0.2.2-rc8/net/ipv4/tcp.c 2006-11-19 17:04:57 +0100
@@ -258,6 +258,7 @@
#include <linux/bootmem.h>
#include <linux/cache.h>
@@ -21876,9 +21558,8 @@
#include <net/icmp.h>
#include <net/tcp.h>
-diff -NurpP --minimal linux-2.6.18.2/net/ipv4/tcp_ipv4.c linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/tcp_ipv4.c
---- linux-2.6.18.2/net/ipv4/tcp_ipv4.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/tcp_ipv4.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/ipv4/tcp_ipv4.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -21964,9 +21645,8 @@
if (sk->sk_family == st->family)
goto found;
}
-diff -NurpP --minimal linux-2.6.18.2/net/ipv4/tcp_minisocks.c linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/tcp_minisocks.c
---- linux-2.6.18.2/net/ipv4/tcp_minisocks.c 2006-09-20 16:58:51 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/tcp_minisocks.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/ipv4/tcp_minisocks.c 2006-09-20 16:58:51 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -21990,9 +21670,8 @@
#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.2/net/ipv4/udp.c linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/udp.c
---- linux-2.6.18.2/net/ipv4/udp.c 2006-09-20 16:58:51 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv4/udp.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/ipv4/udp.c 2006-09-20 16:58:51 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/net/ipv4/udp.c 2006-09-20 17:01:45 +0200
@@ -175,14 +175,12 @@ gotit:
struct inet_sock *inet2 = inet_sk(sk2);
@@ -22075,9 +21754,8 @@
if (!sk && ++state->bucket < UDP_HTABLE_SIZE) {
sk = sk_head(&udp_hash[state->bucket]);
-diff -NurpP --minimal linux-2.6.18.2/net/ipv6/addrconf.c linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv6/addrconf.c
---- linux-2.6.18.2/net/ipv6/addrconf.c 2006-09-20 16:58:51 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/ipv6/addrconf.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/ipv6/addrconf.c 2006-09-20 16:58:51 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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)
{
@@ -22112,9 +21790,8 @@
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.2/net/netlink/af_netlink.c linux-2.6.18.2-vs2.0.2.2-rc6/net/netlink/af_netlink.c
---- linux-2.6.18.2/net/netlink/af_netlink.c 2006-09-20 16:58:51 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/netlink/af_netlink.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/netlink/af_netlink.c 2006-09-20 16:58:51 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/net/netlink/af_netlink.c 2006-09-20 17:01:45 +0200
@@ -56,6 +56,9 @@
#include <linux/types.h>
#include <linux/audit.h>
@@ -22125,9 +21802,8 @@
#include <net/sock.h>
#include <net/scm.h>
-diff -NurpP --minimal linux-2.6.18.2/net/socket.c linux-2.6.18.2-vs2.0.2.2-rc6/net/socket.c
---- linux-2.6.18.2/net/socket.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/socket.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/socket.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/net/socket.c 2006-11-21 04:55:15 +0100
@@ -93,6 +93,7 @@
#include <net/sock.h>
@@ -22228,9 +21904,8 @@
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-2.6.18.2/net/sunrpc/auth.c linux-2.6.18.2-vs2.0.2.2-rc6/net/sunrpc/auth.c
---- linux-2.6.18.2/net/sunrpc/auth.c 2006-06-18 04:55:52 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/sunrpc/auth.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/sunrpc/auth.c 2006-06-18 04:55:52 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/net/sunrpc/auth.c 2006-09-20 17:01:45 +0200
@@ -13,6 +13,7 @@
#include <linux/errno.h>
#include <linux/sunrpc/clnt.h>
@@ -22255,9 +21930,8 @@
.group_info = current->group_info,
};
struct rpc_cred *ret;
-diff -NurpP --minimal linux-2.6.18.2/net/sunrpc/auth_unix.c linux-2.6.18.2-vs2.0.2.2-rc6/net/sunrpc/auth_unix.c
---- linux-2.6.18.2/net/sunrpc/auth_unix.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/sunrpc/auth_unix.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/sunrpc/auth_unix.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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>
@@ -22323,9 +21997,8 @@
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
*p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-2.6.18.2/net/unix/af_unix.c linux-2.6.18.2-vs2.0.2.2-rc6/net/unix/af_unix.c
---- linux-2.6.18.2/net/unix/af_unix.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/unix/af_unix.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/unix/af_unix.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/net/unix/af_unix.c 2006-09-20 17:01:45 +0200
@@ -116,6 +116,9 @@
#include <linux/mount.h>
#include <net/checksum.h>
@@ -22354,9 +22027,8 @@
if (err)
goto out_mknod_dput;
mutex_unlock(&nd.dentry->d_inode->i_mutex);
-diff -NurpP --minimal linux-2.6.18.2/net/x25/af_x25.c linux-2.6.18.2-vs2.0.2.2-rc6/net/x25/af_x25.c
---- linux-2.6.18.2/net/x25/af_x25.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/net/x25/af_x25.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/net/x25/af_x25.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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);
@@ -22369,9 +22041,8 @@
x25_init_timers(sk);
-diff -NurpP --minimal linux-2.6.18.2/security/commoncap.c linux-2.6.18.2-vs2.0.2.2-rc6/security/commoncap.c
---- linux-2.6.18.2/security/commoncap.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.2-vs2.0.2.2-rc6/security/commoncap.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.18.3/security/commoncap.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18.3-vs2.0.2.2-rc8/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;
Copied: dists/sid/linux-2.6/debian/patches/series/7-extra (from r7815, dists/sid/linux-2.6/debian/patches/series/5-extra)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/5-extra (original)
+++ dists/sid/linux-2.6/debian/patches/series/7-extra Sun Nov 26 10:44:45 2006
@@ -1,4 +1,4 @@
-+ features/all/vserver/vs2.0.2.2-rc6.patch *_vserver *_xen-vserver
++ features/all/vserver/vs2.0.2.2-rc8.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
More information about the Kernel-svn-changes
mailing list