-diff -NurpP --minimal linux-2.6.17.7/Documentation/vserver/debug.txt linux-2.6.17.7-vs2.1.1-rc27/Documentation/vserver/debug.txt
+diff -NurpP --minimal linux-2.6.17.7/Documentation/vserver/debug.txt linux-2.6.17.7-vs2.1.1-rc28/Documentation/vserver/debug.txt
--- linux-2.6.17.7/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/Documentation/vserver/debug.txt 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/Documentation/vserver/debug.txt 2006-07-09 17:06:47 +0200
@@ -0,0 +1,108 @@
+
+debug_cvirt:
+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-2.6.17.7/Makefile linux-2.6.17.7-vs2.1.1-rc27/Makefile
---- linux-2.6.17.7/Makefile 2006-07-27 19:19:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/Makefile 2006-07-27 19:46:43 +0200
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 17
--EXTRAVERSION = .7
-+EXTRAVERSION = .7-vs2.1.1-rc27
- NAME=Crazed Snow-Weasel
-
- # *DOCUMENTATION*
-diff -NurpP --minimal linux-2.6.17.7/arch/alpha/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/alpha/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/Kconfig
--- linux-2.6.17.7/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/Kconfig 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/Kconfig 2006-07-09 17:06:47 +0200
@@ -632,6 +632,8 @@ source "arch/alpha/oprofile/Kconfig"
source "arch/alpha/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/alpha/kernel/asm-offsets.c linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/kernel/asm-offsets.c
+diff -NurpP --minimal linux-2.6.17.7/arch/alpha/kernel/asm-offsets.c linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/kernel/asm-offsets.c
--- linux-2.6.17.7/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/kernel/asm-offsets.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/kernel/asm-offsets.c 2006-07-09 17:06:47 +0200
@@ -36,6 +36,7 @@ void foo(void)
DEFINE(PT_PTRACED, PT_PTRACED);
DEFINE(CLONE_VM, CLONE_VM);
DEFINE(SIGCHLD, SIGCHLD);
BLANK();
-diff -NurpP --minimal linux-2.6.17.7/arch/alpha/kernel/entry.S linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/kernel/entry.S
+diff -NurpP --minimal linux-2.6.17.7/arch/alpha/kernel/entry.S linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/kernel/entry.S
--- linux-2.6.17.7/arch/alpha/kernel/entry.S 2006-04-09 13:49:39 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/kernel/entry.S 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/kernel/entry.S 2006-07-09 17:06:47 +0200
@@ -645,7 +645,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.17.7/arch/alpha/kernel/osf_sys.c linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/kernel/osf_sys.c
+diff -NurpP --minimal linux-2.6.17.7/arch/alpha/kernel/osf_sys.c linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/kernel/osf_sys.c
--- linux-2.6.17.7/arch/alpha/kernel/osf_sys.c 2006-06-18 04:51:38 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/kernel/osf_sys.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/kernel/osf_sys.c 2006-07-09 17:06:47 +0200
@@ -38,6 +38,7 @@
#include <linux/uio.h>
#include <linux/vfs.h>
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.17.7/arch/alpha/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.17.7/arch/alpha/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/kernel/ptrace.c
--- linux-2.6.17.7/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/kernel/ptrace.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/kernel/ptrace.c 2006-07-09 17:06:47 +0200
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -NurpP --minimal linux-2.6.17.7/arch/alpha/kernel/systbls.S linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/kernel/systbls.S
+diff -NurpP --minimal linux-2.6.17.7/arch/alpha/kernel/systbls.S linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/kernel/systbls.S
--- linux-2.6.17.7/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/kernel/systbls.S 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/kernel/systbls.S 2006-07-09 17:06:47 +0200
@@ -447,7 +447,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.17.7/arch/alpha/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/kernel/traps.c
+diff -NurpP --minimal linux-2.6.17.7/arch/alpha/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/kernel/traps.c
--- linux-2.6.17.7/arch/alpha/kernel/traps.c 2005-10-28 20:49:08 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/kernel/traps.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/kernel/traps.c 2006-07-09 17:06:47 +0200
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
dik_show_regs(regs, r9_15);
dik_show_trace((unsigned long *)(regs+1));
dik_show_code((unsigned int *)regs->pc);
-diff -NurpP --minimal linux-2.6.17.7/arch/alpha/mm/init.c linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/mm/init.c
+diff -NurpP --minimal linux-2.6.17.7/arch/alpha/mm/init.c linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/mm/init.c
--- linux-2.6.17.7/arch/alpha/mm/init.c 2006-06-18 04:51:38 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/alpha/mm/init.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/alpha/mm/init.c 2006-07-09 17:06:47 +0200
@@ -21,6 +21,7 @@
#include <linux/init.h>
#include <linux/bootmem.h> /* max_low_pfn */
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.17.7/arch/arm/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/arm/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/arm/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/arm/Kconfig
--- linux-2.6.17.7/arch/arm/Kconfig 2006-06-18 04:51:38 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/arm/Kconfig 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/arm/Kconfig 2006-07-09 17:06:47 +0200
@@ -873,6 +873,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/arm/kernel/calls.S linux-2.6.17.7-vs2.1.1-rc27/arch/arm/kernel/calls.S
+diff -NurpP --minimal linux-2.6.17.7/arch/arm/kernel/calls.S linux-2.6.17.7-vs2.1.1-rc28/arch/arm/kernel/calls.S
--- linux-2.6.17.7/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/arm/kernel/calls.S 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/arm/kernel/calls.S 2006-07-09 17:06:47 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.17.7/arch/arm/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/arm/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/arm/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/arm/kernel/process.c
--- linux-2.6.17.7/arch/arm/kernel/process.c 2006-06-18 04:51:42 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/arm/kernel/process.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/arm/kernel/process.c 2006-07-09 17:06:47 +0200
@@ -227,7 +227,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.17.7/arch/arm26/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/arm26/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/arm26/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/arm26/Kconfig
--- linux-2.6.17.7/arch/arm26/Kconfig 2006-06-18 04:51:48 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/arm26/Kconfig 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/arm26/Kconfig 2006-07-09 17:06:47 +0200
@@ -234,6 +234,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/arm26/kernel/calls.S linux-2.6.17.7-vs2.1.1-rc27/arch/arm26/kernel/calls.S
+diff -NurpP --minimal linux-2.6.17.7/arch/arm26/kernel/calls.S linux-2.6.17.7-vs2.1.1-rc28/arch/arm26/kernel/calls.S
--- linux-2.6.17.7/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/arm26/kernel/calls.S 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/arm26/kernel/calls.S 2006-07-09 17:06:47 +0200
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.17.7/arch/arm26/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/arm26/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/arm26/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/arm26/kernel/process.c
--- linux-2.6.17.7/arch/arm26/kernel/process.c 2006-01-18 06:07:51 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/arm26/kernel/process.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/arm26/kernel/process.c 2006-07-09 17:06:47 +0200
@@ -366,7 +366,8 @@ pid_t kernel_thread(int (*fn)(void *), v
regs.ARM_r3 = (unsigned long)do_exit;
regs.ARM_pc = (unsigned long)kernel_thread_helper | MODE_SVC26;
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.17.7/arch/arm26/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc27/arch/arm26/kernel/traps.c
+diff -NurpP --minimal linux-2.6.17.7/arch/arm26/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc28/arch/arm26/kernel/traps.c
--- linux-2.6.17.7/arch/arm26/kernel/traps.c 2006-06-18 04:51:48 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/arm26/kernel/traps.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/arm26/kernel/traps.c 2006-07-09 17:06:47 +0200
@@ -186,8 +186,9 @@ NORET_TYPE void die(const char *str, str
printk("Internal error: %s: %x\n", str, err);
printk("CPU: %d\n", smp_processor_id());
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.17.7/arch/cris/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/cris/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/cris/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/cris/Kconfig
--- linux-2.6.17.7/arch/cris/Kconfig 2006-06-18 04:51:48 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/cris/Kconfig 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/cris/Kconfig 2006-07-09 17:06:47 +0200
@@ -181,6 +181,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/cris/arch-v10/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/cris/arch-v10/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/cris/arch-v10/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/cris/arch-v10/kernel/process.c
--- linux-2.6.17.7/arch/cris/arch-v10/kernel/process.c 2006-01-18 06:07:51 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/cris/arch-v10/kernel/process.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/cris/arch-v10/kernel/process.c 2006-07-09 17:06:47 +0200
@@ -104,7 +104,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.dccr = 1 << I_DCCR_BITNR;
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.17.7/arch/cris/arch-v32/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/cris/arch-v32/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/cris/arch-v32/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/cris/arch-v32/kernel/process.c
--- linux-2.6.17.7/arch/cris/arch-v32/kernel/process.c 2006-01-18 06:07:51 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/cris/arch-v32/kernel/process.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/cris/arch-v32/kernel/process.c 2006-07-09 17:06:47 +0200
@@ -121,7 +121,8 @@ kernel_thread(int (*fn)(void *), void *
regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
}
/*
-diff -NurpP --minimal linux-2.6.17.7/arch/frv/kernel/kernel_thread.S linux-2.6.17.7-vs2.1.1-rc27/arch/frv/kernel/kernel_thread.S
+diff -NurpP --minimal linux-2.6.17.7/arch/frv/kernel/kernel_thread.S linux-2.6.17.7-vs2.1.1-rc28/arch/frv/kernel/kernel_thread.S
--- linux-2.6.17.7/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/frv/kernel/kernel_thread.S 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/frv/kernel/kernel_thread.S 2006-07-09 17:06:47 +0200
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-2.6.17.7/arch/frv/mm/mmu-context.c linux-2.6.17.7-vs2.1.1-rc27/arch/frv/mm/mmu-context.c
+diff -NurpP --minimal linux-2.6.17.7/arch/frv/mm/mmu-context.c linux-2.6.17.7-vs2.1.1-rc28/arch/frv/mm/mmu-context.c
--- linux-2.6.17.7/arch/frv/mm/mmu-context.c 2006-06-18 04:51:49 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/frv/mm/mmu-context.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/frv/mm/mmu-context.c 2006-07-09 17:06:47 +0200
@@ -11,6 +11,7 @@
#include <linux/sched.h>
#include <asm/tlbflush.h>
#define NR_CXN 4096
-diff -NurpP --minimal linux-2.6.17.7/arch/h8300/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/h8300/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/h8300/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/h8300/Kconfig
--- linux-2.6.17.7/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/h8300/Kconfig 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/h8300/Kconfig 2006-07-09 17:06:47 +0200
@@ -199,6 +199,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/h8300/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/h8300/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/h8300/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/h8300/kernel/process.c
--- linux-2.6.17.7/arch/h8300/kernel/process.c 2006-06-18 04:51:49 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/h8300/kernel/process.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/h8300/kernel/process.c 2006-07-09 17:06:47 +0200
@@ -135,7 +135,7 @@ int kernel_thread(int (*fn)(void *), voi
fs = get_fs();
__asm__("mov.l sp,er3\n\t"
"sub.l er2,er2\n\t"
"mov.l %2,er1\n\t"
-diff -NurpP --minimal linux-2.6.17.7/arch/i386/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/i386/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/i386/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/i386/Kconfig
--- linux-2.6.17.7/arch/i386/Kconfig 2006-07-27 19:19:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/i386/Kconfig 2006-07-26 21:36:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/i386/Kconfig 2006-07-26 21:36:47 +0200
@@ -1088,6 +1088,8 @@ endmenu
source "arch/i386/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/i386/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/i386/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/i386/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/i386/kernel/process.c
--- linux-2.6.17.7/arch/i386/kernel/process.c 2006-06-18 04:51:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/i386/kernel/process.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/i386/kernel/process.c 2006-07-09 17:06:47 +0200
@@ -290,8 +290,10 @@ void show_regs(struct pt_regs * regs)
unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.17.7/arch/i386/kernel/sys_i386.c linux-2.6.17.7-vs2.1.1-rc27/arch/i386/kernel/sys_i386.c
+diff -NurpP --minimal linux-2.6.17.7/arch/i386/kernel/sys_i386.c linux-2.6.17.7-vs2.1.1-rc28/arch/i386/kernel/sys_i386.c
--- linux-2.6.17.7/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/i386/kernel/sys_i386.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/i386/kernel/sys_i386.c 2006-07-09 17:06:47 +0200
@@ -19,6 +19,7 @@
#include <linux/mman.h>
#include <linux/file.h>
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.17.7/arch/i386/kernel/syscall_table.S linux-2.6.17.7-vs2.1.1-rc27/arch/i386/kernel/syscall_table.S
+diff -NurpP --minimal linux-2.6.17.7/arch/i386/kernel/syscall_table.S linux-2.6.17.7-vs2.1.1-rc28/arch/i386/kernel/syscall_table.S
--- linux-2.6.17.7/arch/i386/kernel/syscall_table.S 2006-06-18 04:51:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/i386/kernel/syscall_table.S 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/i386/kernel/syscall_table.S 2006-07-09 17:06:47 +0200
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.17.7/arch/i386/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc27/arch/i386/kernel/traps.c
+diff -NurpP --minimal linux-2.6.17.7/arch/i386/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc28/arch/i386/kernel/traps.c
--- linux-2.6.17.7/arch/i386/kernel/traps.c 2006-06-18 04:51:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/i386/kernel/traps.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/i386/kernel/traps.c 2006-07-09 17:06:47 +0200
@@ -53,6 +53,8 @@
#include <asm/kdebug.h>
regs = NULL;
} else
printk(KERN_EMERG "Recursive die() failure, output suppressed\n");
-diff -NurpP --minimal linux-2.6.17.7/arch/ia64/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/ia64/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/Kconfig
--- linux-2.6.17.7/arch/ia64/Kconfig 2006-07-27 19:19:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/Kconfig 2006-07-26 21:36:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/Kconfig 2006-07-26 21:36:47 +0200
@@ -506,6 +506,8 @@ endmenu
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/ia64/ia32/binfmt_elf32.c linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/ia32/binfmt_elf32.c
+diff -NurpP --minimal linux-2.6.17.7/arch/ia64/ia32/binfmt_elf32.c linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/ia32/binfmt_elf32.c
--- linux-2.6.17.7/arch/ia64/ia32/binfmt_elf32.c 2006-06-18 04:51:55 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/ia32/binfmt_elf32.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/ia32/binfmt_elf32.c 2006-07-09 17:06:47 +0200
@@ -239,7 +239,8 @@ ia32_setup_arg_pages (struct linux_binpr
kmem_cache_free(vm_area_cachep, mpnt);
return ret;
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.17.7/arch/ia64/ia32/ia32_entry.S linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/ia32/ia32_entry.S
+diff -NurpP --minimal linux-2.6.17.7/arch/ia64/ia32/ia32_entry.S linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/ia32/ia32_entry.S
--- linux-2.6.17.7/arch/ia64/ia32/ia32_entry.S 2006-06-18 04:51:55 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/ia32/ia32_entry.S 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/ia32/ia32_entry.S 2006-07-09 17:06:47 +0200
@@ -483,7 +483,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.17.7/arch/ia64/ia32/sys_ia32.c linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/ia32/sys_ia32.c
+diff -NurpP --minimal linux-2.6.17.7/arch/ia64/ia32/sys_ia32.c linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/ia32/sys_ia32.c
--- linux-2.6.17.7/arch/ia64/ia32/sys_ia32.c 2006-06-18 04:51:55 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/ia32/sys_ia32.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/ia32/sys_ia32.c 2006-07-09 17:06:47 +0200
@@ -51,6 +51,7 @@
#include <linux/compat.h>
#include <linux/vfs.h>
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.17.7/arch/ia64/kernel/asm-offsets.c linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/kernel/asm-offsets.c
+diff -NurpP --minimal linux-2.6.17.7/arch/ia64/kernel/asm-offsets.c linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/kernel/asm-offsets.c
--- linux-2.6.17.7/arch/ia64/kernel/asm-offsets.c 2005-10-28 20:49:10 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/kernel/asm-offsets.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/kernel/asm-offsets.c 2006-07-09 17:06:47 +0200
@@ -192,6 +192,7 @@ void foo(void)
/* for assembly files which can't include sched.h: */
DEFINE(IA64_CLONE_VFORK, CLONE_VFORK);
BLANK();
DEFINE(IA64_CPUINFO_NSEC_PER_CYC_OFFSET,
-diff -NurpP --minimal linux-2.6.17.7/arch/ia64/kernel/entry.S linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/kernel/entry.S
+diff -NurpP --minimal linux-2.6.17.7/arch/ia64/kernel/entry.S linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/kernel/entry.S
--- linux-2.6.17.7/arch/ia64/kernel/entry.S 2006-06-18 04:51:55 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/kernel/entry.S 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/kernel/entry.S 2006-07-09 17:06:47 +0200
@@ -1577,7 +1577,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.17.7/arch/ia64/kernel/perfmon.c linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/kernel/perfmon.c
+diff -NurpP --minimal linux-2.6.17.7/arch/ia64/kernel/perfmon.c linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/kernel/perfmon.c
--- linux-2.6.17.7/arch/ia64/kernel/perfmon.c 2006-06-18 04:51:56 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/kernel/perfmon.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/kernel/perfmon.c 2006-07-09 17:06:47 +0200
@@ -41,6 +41,8 @@
#include <linux/capability.h>
#include <linux/rcupdate.h>
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.17.7/arch/ia64/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/ia64/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/kernel/process.c
--- linux-2.6.17.7/arch/ia64/kernel/process.c 2006-06-18 04:51:56 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/kernel/process.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/kernel/process.c 2006-07-09 17:06:47 +0200
@@ -108,7 +108,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.17.7/arch/ia64/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.17.7/arch/ia64/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/kernel/ptrace.c
--- linux-2.6.17.7/arch/ia64/kernel/ptrace.c 2006-06-18 04:51:56 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/kernel/ptrace.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/kernel/ptrace.c 2006-07-09 17:06:47 +0200
@@ -18,6 +18,7 @@
#include <linux/security.h>
#include <linux/audit.h>
ret = -EPERM;
if (pid == 1) /* no messing around with init! */
goto out_tsk;
-diff -NurpP --minimal linux-2.6.17.7/arch/ia64/kernel/signal.c linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/kernel/signal.c
+diff -NurpP --minimal linux-2.6.17.7/arch/ia64/kernel/signal.c linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/kernel/signal.c
--- linux-2.6.17.7/arch/ia64/kernel/signal.c 2006-06-18 04:51:56 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/kernel/signal.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/kernel/signal.c 2006-07-09 17:06:47 +0200
@@ -21,6 +21,7 @@
#include <linux/binfmts.h>
#include <linux/unistd.h>
#include <asm/ia32.h>
#include <asm/intrinsics.h>
-diff -NurpP --minimal linux-2.6.17.7/arch/ia64/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/kernel/traps.c
+diff -NurpP --minimal linux-2.6.17.7/arch/ia64/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/kernel/traps.c
--- linux-2.6.17.7/arch/ia64/kernel/traps.c 2006-06-18 04:51:56 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/kernel/traps.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/kernel/traps.c 2006-07-09 17:06:47 +0200
@@ -107,8 +107,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
}
exception = fp_emulate(fp_fault, bundle, ®s->cr_ipsr, ®s->ar_fpsr, &isr, ®s->pr,
-diff -NurpP --minimal linux-2.6.17.7/arch/ia64/mm/fault.c linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/mm/fault.c
+diff -NurpP --minimal linux-2.6.17.7/arch/ia64/mm/fault.c linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/mm/fault.c
--- linux-2.6.17.7/arch/ia64/mm/fault.c 2006-06-18 04:51:56 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/mm/fault.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/mm/fault.c 2006-07-09 17:06:47 +0200
@@ -10,6 +10,7 @@
#include <linux/smp_lock.h>
#include <linux/interrupt.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.17.7/arch/ia64/sn/kernel/xpc_main.c linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/sn/kernel/xpc_main.c
+diff -NurpP --minimal linux-2.6.17.7/arch/ia64/sn/kernel/xpc_main.c linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/sn/kernel/xpc_main.c
--- linux-2.6.17.7/arch/ia64/sn/kernel/xpc_main.c 2006-06-18 04:51:57 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ia64/sn/kernel/xpc_main.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ia64/sn/kernel/xpc_main.c 2006-07-09 17:06:47 +0200
@@ -108,6 +108,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] =
0644,
NULL,
&sysctl_intvec,
NULL,
&xpc_disengage_request_min_timelimit,
-diff -NurpP --minimal linux-2.6.17.7/arch/m32r/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/m32r/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/m32r/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/m32r/kernel/process.c
--- linux-2.6.17.7/arch/m32r/kernel/process.c 2006-06-18 04:51:57 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/m32r/kernel/process.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/m32r/kernel/process.c 2006-07-09 17:06:47 +0200
@@ -212,8 +212,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.psw = M32R_PSW_BIE;
}
/*
-diff -NurpP --minimal linux-2.6.17.7/arch/m32r/kernel/sys_m32r.c linux-2.6.17.7-vs2.1.1-rc27/arch/m32r/kernel/sys_m32r.c
+diff -NurpP --minimal linux-2.6.17.7/arch/m32r/kernel/sys_m32r.c linux-2.6.17.7-vs2.1.1-rc28/arch/m32r/kernel/sys_m32r.c
--- linux-2.6.17.7/arch/m32r/kernel/sys_m32r.c 2006-04-09 13:49:43 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/m32r/kernel/sys_m32r.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/m32r/kernel/sys_m32r.c 2006-07-09 17:06:47 +0200
@@ -21,6 +21,7 @@
#include <linux/mman.h>
#include <linux/file.h>
up_read(&uts_sem);
return err?-EFAULT:0;
}
-diff -NurpP --minimal linux-2.6.17.7/arch/m32r/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc27/arch/m32r/kernel/traps.c
+diff -NurpP --minimal linux-2.6.17.7/arch/m32r/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc28/arch/m32r/kernel/traps.c
--- linux-2.6.17.7/arch/m32r/kernel/traps.c 2005-10-28 20:49:11 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/m32r/kernel/traps.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/m32r/kernel/traps.c 2006-07-09 17:06:47 +0200
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.17.7/arch/m68k/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/m68k/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/m68k/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/m68k/Kconfig
--- linux-2.6.17.7/arch/m68k/Kconfig 2006-06-18 04:51:57 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/m68k/Kconfig 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/m68k/Kconfig 2006-07-09 17:06:47 +0200
@@ -654,6 +654,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/m68k/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/m68k/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/m68k/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/m68k/kernel/process.c
--- linux-2.6.17.7/arch/m68k/kernel/process.c 2006-06-18 04:51:57 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/m68k/kernel/process.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/m68k/kernel/process.c 2006-07-09 17:06:47 +0200
@@ -160,7 +160,8 @@ int kernel_thread(int (*fn)(void *), voi
{
retval = __NR_clone;
__asm__ __volatile__
-diff -NurpP --minimal linux-2.6.17.7/arch/m68k/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc27/arch/m68k/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.17.7/arch/m68k/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc28/arch/m68k/kernel/ptrace.c
--- linux-2.6.17.7/arch/m68k/kernel/ptrace.c 2006-01-03 17:29:10 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/m68k/kernel/ptrace.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/m68k/kernel/ptrace.c 2006-07-09 17:06:47 +0200
@@ -280,6 +280,8 @@ long arch_ptrace(struct task_struct *chi
ret = ptrace_request(child, request, addr, data);
break;
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.17.7/arch/m68k/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc27/arch/m68k/kernel/traps.c
+diff -NurpP --minimal linux-2.6.17.7/arch/m68k/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc28/arch/m68k/kernel/traps.c
--- linux-2.6.17.7/arch/m68k/kernel/traps.c 2006-01-18 06:07:53 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/m68k/kernel/traps.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/m68k/kernel/traps.c 2006-07-09 17:06:47 +0200
@@ -1198,8 +1198,9 @@ void die_if_kernel (char *str, struct pt
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
fp->d4, fp->d5, fp->a0, fp->a1);
show_stack(NULL, (unsigned long *)fp);
do_exit(SIGSEGV);
}
-diff -NurpP --minimal linux-2.6.17.7/arch/m68knommu/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/m68knommu/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/m68knommu/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/m68knommu/Kconfig
--- linux-2.6.17.7/arch/m68knommu/Kconfig 2006-06-18 04:51:58 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/m68knommu/Kconfig 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/m68knommu/Kconfig 2006-07-09 17:06:47 +0200
@@ -654,6 +654,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/m68knommu/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/m68knommu/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/m68knommu/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/m68knommu/kernel/process.c
--- linux-2.6.17.7/arch/m68knommu/kernel/process.c 2006-06-18 04:51:58 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/m68knommu/kernel/process.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/m68knommu/kernel/process.c 2006-07-09 17:06:47 +0200
@@ -123,7 +123,7 @@ void show_regs(struct pt_regs * regs)
int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
{
mm_segment_t fs;
fs = get_fs();
-diff -NurpP --minimal linux-2.6.17.7/arch/m68knommu/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc27/arch/m68knommu/kernel/traps.c
+diff -NurpP --minimal linux-2.6.17.7/arch/m68knommu/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc28/arch/m68knommu/kernel/traps.c
--- linux-2.6.17.7/arch/m68knommu/kernel/traps.c 2005-10-28 20:49:11 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/m68knommu/kernel/traps.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/m68knommu/kernel/traps.c 2006-07-09 17:06:47 +0200
@@ -81,8 +81,9 @@ void die_if_kernel(char *str, struct pt_
printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
fp->d4, fp->d5, fp->a0, fp->a1);
show_stack(NULL, (unsigned long *)fp);
do_exit(SIGSEGV);
}
-diff -NurpP --minimal linux-2.6.17.7/arch/mips/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/mips/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/mips/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/mips/Kconfig
--- linux-2.6.17.7/arch/mips/Kconfig 2006-06-18 04:51:58 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/mips/Kconfig 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/mips/Kconfig 2006-07-09 17:06:47 +0200
@@ -1852,6 +1852,8 @@ source "arch/mips/oprofile/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/linux32.c linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/linux32.c
+diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/linux32.c linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/linux32.c
--- linux-2.6.17.7/arch/mips/kernel/linux32.c 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/linux32.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/linux32.c 2006-07-09 17:06:47 +0200
@@ -36,6 +36,7 @@
#include <linux/security.h>
#include <linux/compat.h>
ret = -EFAULT;
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/process.c
--- linux-2.6.17.7/arch/mips/kernel/process.c 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/process.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/process.c 2006-07-09 17:06:47 +0200
@@ -271,7 +271,8 @@ long kernel_thread(int (*fn)(void *), vo
#endif
}
static struct mips_frame_info {
-diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/ptrace.c
--- linux-2.6.17.7/arch/mips/kernel/ptrace.c 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/ptrace.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/ptrace.c 2006-07-09 17:06:47 +0200
@@ -490,6 +490,8 @@ asmlinkage void do_syscall_trace(struct
goto out;
if (!test_thread_flag(TIF_SYSCALL_TRACE))
/* The 0x80 provides a way for the tracing parent to distinguish
between a syscall stop and SIGTRAP delivery */
-diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/scall32-o32.S linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/scall32-o32.S
+diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/scall32-o32.S linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/scall32-o32.S
--- linux-2.6.17.7/arch/mips/kernel/scall32-o32.S 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/scall32-o32.S 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/scall32-o32.S 2006-07-09 17:06:47 +0200
@@ -618,7 +618,7 @@ einval: li v0, -EINVAL
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/scall64-64.S linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/scall64-64.S
+diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/scall64-64.S linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/scall64-64.S
--- linux-2.6.17.7/arch/mips/kernel/scall64-64.S 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/scall64-64.S 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/scall64-64.S 2006-07-09 17:06:47 +0200
@@ -433,7 +433,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/scall64-n32.S linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/scall64-n32.S
+diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/scall64-n32.S linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/scall64-n32.S
--- linux-2.6.17.7/arch/mips/kernel/scall64-n32.S 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/scall64-n32.S 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/scall64-n32.S 2006-07-09 17:06:47 +0200
@@ -359,7 +359,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
PTR sysn32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/scall64-o32.S linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/scall64-o32.S
+diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/scall64-o32.S linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/scall64-o32.S
--- linux-2.6.17.7/arch/mips/kernel/scall64-o32.S 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/scall64-o32.S 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/scall64-o32.S 2006-07-09 17:06:47 +0200
@@ -481,7 +481,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
PTR sys32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/syscall.c linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/syscall.c
+diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/syscall.c linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/syscall.c
--- linux-2.6.17.7/arch/mips/kernel/syscall.c 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/syscall.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/syscall.c 2006-07-09 17:06:47 +0200
@@ -29,6 +29,7 @@
#include <linux/shm.h>
#include <linux/compiler.h>
error = __put_user(0,name->machine+__OLD_UTS_LEN);
error = error ? -EFAULT : 0;
-diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/sysirix.c linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/sysirix.c
+diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/sysirix.c linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/sysirix.c
--- linux-2.6.17.7/arch/mips/kernel/sysirix.c 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/sysirix.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/sysirix.c 2006-07-09 17:06:47 +0200
@@ -31,6 +31,8 @@
#include <linux/socket.h>
#include <linux/security.h>
return -EFAULT;
}
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/traps.c
+diff -NurpP --minimal linux-2.6.17.7/arch/mips/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/traps.c
--- linux-2.6.17.7/arch/mips/kernel/traps.c 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/mips/kernel/traps.c 2006-07-09 17:06:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/mips/kernel/traps.c 2006-07-09 17:06:47 +0200
@@ -267,8 +267,9 @@ void show_registers(struct pt_regs *regs
{
show_regs(regs);
show_stack(current, (long *) regs->regs[29]);
show_trace(current, (long *) regs->regs[29]);
show_code((unsigned int *) regs->cp0_epc);
-diff -NurpP --minimal linux-2.6.17.7/arch/parisc/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/parisc/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/parisc/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/parisc/Kconfig
--- linux-2.6.17.7/arch/parisc/Kconfig 2006-06-18 04:52:14 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/parisc/Kconfig 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/parisc/Kconfig 2006-07-09 17:06:48 +0200
@@ -253,6 +253,8 @@ source "arch/parisc/oprofile/Kconfig"
source "arch/parisc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/parisc/hpux/sys_hpux.c linux-2.6.17.7-vs2.1.1-rc27/arch/parisc/hpux/sys_hpux.c
+diff -NurpP --minimal linux-2.6.17.7/arch/parisc/hpux/sys_hpux.c linux-2.6.17.7-vs2.1.1-rc28/arch/parisc/hpux/sys_hpux.c
--- linux-2.6.17.7/arch/parisc/hpux/sys_hpux.c 2006-02-15 13:54:11 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/parisc/hpux/sys_hpux.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/parisc/hpux/sys_hpux.c 2006-07-09 17:06:48 +0200
@@ -33,6 +33,7 @@
#include <linux/utsname.h>
#include <linux/vfs.h>
goto done;
err = 0;
done:
-diff -NurpP --minimal linux-2.6.17.7/arch/parisc/kernel/entry.S linux-2.6.17.7-vs2.1.1-rc27/arch/parisc/kernel/entry.S
+diff -NurpP --minimal linux-2.6.17.7/arch/parisc/kernel/entry.S linux-2.6.17.7-vs2.1.1-rc28/arch/parisc/kernel/entry.S
--- linux-2.6.17.7/arch/parisc/kernel/entry.S 2006-06-18 04:52:14 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/parisc/kernel/entry.S 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/parisc/kernel/entry.S 2006-07-09 17:06:48 +0200
@@ -765,6 +765,7 @@ fault_vector_11:
#define CLONE_VM 0x100 /* Must agree with <linux/sched.h> */
.export __kernel_thread, code
.import do_fork
-diff -NurpP --minimal linux-2.6.17.7/arch/parisc/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/parisc/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/parisc/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/parisc/kernel/process.c
--- linux-2.6.17.7/arch/parisc/kernel/process.c 2006-06-18 04:52:15 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/parisc/kernel/process.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/parisc/kernel/process.c 2006-07-09 17:06:48 +0200
@@ -173,7 +173,7 @@ pid_t kernel_thread(int (*fn)(void *), v
* kernel_thread can become a #define.
*/
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.17.7/arch/parisc/kernel/sys_parisc32.c linux-2.6.17.7-vs2.1.1-rc27/arch/parisc/kernel/sys_parisc32.c
+diff -NurpP --minimal linux-2.6.17.7/arch/parisc/kernel/sys_parisc32.c linux-2.6.17.7-vs2.1.1-rc28/arch/parisc/kernel/sys_parisc32.c
--- linux-2.6.17.7/arch/parisc/kernel/sys_parisc32.c 2006-06-18 04:52:15 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/parisc/kernel/sys_parisc32.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/parisc/kernel/sys_parisc32.c 2006-07-09 17:06:48 +0200
@@ -202,11 +202,11 @@ static inline long get_ts32(struct times
asmlinkage int
sys32_gettimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)
val.uptime = jiffies / HZ;
val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
-diff -NurpP --minimal linux-2.6.17.7/arch/parisc/kernel/syscall_table.S linux-2.6.17.7-vs2.1.1-rc27/arch/parisc/kernel/syscall_table.S
+diff -NurpP --minimal linux-2.6.17.7/arch/parisc/kernel/syscall_table.S linux-2.6.17.7-vs2.1.1-rc28/arch/parisc/kernel/syscall_table.S
--- linux-2.6.17.7/arch/parisc/kernel/syscall_table.S 2006-06-18 04:52:15 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/parisc/kernel/syscall_table.S 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/parisc/kernel/syscall_table.S 2006-07-09 17:06:48 +0200
@@ -368,7 +368,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.17.7/arch/parisc/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc27/arch/parisc/kernel/traps.c
+diff -NurpP --minimal linux-2.6.17.7/arch/parisc/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc28/arch/parisc/kernel/traps.c
--- linux-2.6.17.7/arch/parisc/kernel/traps.c 2006-02-15 13:54:11 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/parisc/kernel/traps.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/parisc/kernel/traps.c 2006-07-09 17:06:48 +0200
@@ -214,8 +214,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
show_regs(regs);
/* Wot's wrong wif bein' racy? */
-diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/Kconfig
--- linux-2.6.17.7/arch/powerpc/Kconfig 2006-07-27 19:19:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/Kconfig 2006-07-26 21:36:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/Kconfig 2006-07-26 21:36:47 +0200
@@ -1018,6 +1018,8 @@ endmenu
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/asm-offsets.c linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/asm-offsets.c
+diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/asm-offsets.c linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/asm-offsets.c
--- linux-2.6.17.7/arch/powerpc/kernel/asm-offsets.c 2006-06-18 04:52:16 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/asm-offsets.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/asm-offsets.c 2006-07-09 17:06:48 +0200
@@ -231,6 +231,7 @@ int main(void)
DEFINE(CLONE_VM, CLONE_VM);
#ifndef CONFIG_PPC64
DEFINE(MM_PGD, offsetof(struct mm_struct, pgd));
-diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/misc_32.S linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/misc_32.S
+diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/misc_32.S linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/misc_32.S
--- linux-2.6.17.7/arch/powerpc/kernel/misc_32.S 2006-01-18 06:07:55 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/misc_32.S 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/misc_32.S 2006-07-09 17:06:48 +0200
@@ -980,7 +980,7 @@ _GLOBAL(kernel_thread)
mr r30,r3 /* function */
mr r31,r4 /* argument */
li r4,0 /* new sp (unused) */
li r0,__NR_clone
sc
-diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/misc_64.S linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/misc_64.S
+diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/misc_64.S linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/misc_64.S
--- linux-2.6.17.7/arch/powerpc/kernel/misc_64.S 2006-01-18 06:07:55 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/misc_64.S 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/misc_64.S 2006-07-09 17:06:48 +0200
@@ -684,7 +684,7 @@ _GLOBAL(kernel_thread)
mr r29,r3
mr r30,r4
li r4,0 /* new sp (unused) */
li r0,__NR_clone
sc
-diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/process.c
--- linux-2.6.17.7/arch/powerpc/kernel/process.c 2006-06-18 04:52:16 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/process.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/process.c 2006-07-09 17:06:48 +0200
@@ -432,8 +432,9 @@ void show_regs(struct pt_regs * regs)
trap = TRAP(regs);
if (trap == 0x300 || trap == 0x600)
#ifdef CONFIG_SMP
printk(" CPU: %d", smp_processor_id());
-diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/sys_ppc32.c linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/sys_ppc32.c
+diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/sys_ppc32.c linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/sys_ppc32.c
--- linux-2.6.17.7/arch/powerpc/kernel/sys_ppc32.c 2006-06-18 04:52:17 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/sys_ppc32.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/sys_ppc32.c 2006-07-09 17:06:48 +0200
@@ -267,7 +267,7 @@ asmlinkage long compat_sys_gettimeofday(
{
if (tv) {
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/syscalls.c linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/syscalls.c
+diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/syscalls.c linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/syscalls.c
--- linux-2.6.17.7/arch/powerpc/kernel/syscalls.c 2006-06-18 04:52:17 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/syscalls.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/syscalls.c 2006-07-09 17:06:48 +0200
@@ -36,6 +36,7 @@
#include <linux/file.h>
#include <linux/init.h>
error |= override_machine(name->machine);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/systbl.S linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/systbl.S
+diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/systbl.S linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/systbl.S
--- linux-2.6.17.7/arch/powerpc/kernel/systbl.S 2006-06-18 04:52:17 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/systbl.S 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/systbl.S 2006-07-09 17:06:48 +0200
@@ -296,7 +296,7 @@ COMPAT_SYS(fstatfs64)
SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64)
PPC_SYS(rtas)
SYSCALL(ni_syscall)
COMPAT_SYS(mbind)
COMPAT_SYS(get_mempolicy)
-diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/traps.c
+diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/traps.c
--- linux-2.6.17.7/arch/powerpc/kernel/traps.c 2006-06-18 04:52:17 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/traps.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/traps.c 2006-07-09 17:06:48 +0200
@@ -846,8 +846,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/vdso.c linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/vdso.c
+diff -NurpP --minimal linux-2.6.17.7/arch/powerpc/kernel/vdso.c linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/vdso.c
--- linux-2.6.17.7/arch/powerpc/kernel/vdso.c 2006-06-18 04:52:17 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/powerpc/kernel/vdso.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/powerpc/kernel/vdso.c 2006-07-09 17:06:48 +0200
@@ -23,6 +23,7 @@
#include <linux/elf.h>
#include <linux/security.h>
up_write(&mm->mmap_sem);
return 0;
-diff -NurpP --minimal linux-2.6.17.7/arch/ppc/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/ppc/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/ppc/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/ppc/Kconfig
--- linux-2.6.17.7/arch/ppc/Kconfig 2006-06-18 04:52:22 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ppc/Kconfig 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ppc/Kconfig 2006-07-09 17:06:48 +0200
@@ -1414,6 +1414,8 @@ source "arch/powerpc/oprofile/Kconfig"
source "arch/ppc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/ppc/kernel/asm-offsets.c linux-2.6.17.7-vs2.1.1-rc27/arch/ppc/kernel/asm-offsets.c
+diff -NurpP --minimal linux-2.6.17.7/arch/ppc/kernel/asm-offsets.c linux-2.6.17.7-vs2.1.1-rc28/arch/ppc/kernel/asm-offsets.c
--- linux-2.6.17.7/arch/ppc/kernel/asm-offsets.c 2006-06-18 04:52:24 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ppc/kernel/asm-offsets.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ppc/kernel/asm-offsets.c 2006-07-09 17:06:48 +0200
@@ -122,6 +122,7 @@ main(void)
DEFINE(TRAP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, trap));
DEFINE(CLONE_VM, CLONE_VM);
DEFINE(MM_PGD, offsetof(struct mm_struct, pgd));
/* About the CPU features table */
-diff -NurpP --minimal linux-2.6.17.7/arch/ppc/kernel/misc.S linux-2.6.17.7-vs2.1.1-rc27/arch/ppc/kernel/misc.S
+diff -NurpP --minimal linux-2.6.17.7/arch/ppc/kernel/misc.S linux-2.6.17.7-vs2.1.1-rc28/arch/ppc/kernel/misc.S
--- linux-2.6.17.7/arch/ppc/kernel/misc.S 2006-02-17 22:18:50 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ppc/kernel/misc.S 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ppc/kernel/misc.S 2006-07-09 17:06:48 +0200
@@ -1011,7 +1011,7 @@ _GLOBAL(kernel_thread)
mr r30,r3 /* function */
mr r31,r4 /* argument */
li r4,0 /* new sp (unused) */
li r0,__NR_clone
sc
-diff -NurpP --minimal linux-2.6.17.7/arch/ppc/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc27/arch/ppc/kernel/traps.c
+diff -NurpP --minimal linux-2.6.17.7/arch/ppc/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc28/arch/ppc/kernel/traps.c
--- linux-2.6.17.7/arch/ppc/kernel/traps.c 2006-06-18 04:52:25 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/ppc/kernel/traps.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/ppc/kernel/traps.c 2006-07-09 17:06:48 +0200
@@ -747,8 +747,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-2.6.17.7/arch/s390/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/s390/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/s390/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/s390/Kconfig
--- linux-2.6.17.7/arch/s390/Kconfig 2006-06-18 04:52:32 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/s390/Kconfig 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/s390/Kconfig 2006-07-09 17:06:48 +0200
@@ -478,6 +478,8 @@ source "arch/s390/oprofile/Kconfig"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/s390/kernel/compat_linux.c linux-2.6.17.7-vs2.1.1-rc27/arch/s390/kernel/compat_linux.c
+diff -NurpP --minimal linux-2.6.17.7/arch/s390/kernel/compat_linux.c linux-2.6.17.7-vs2.1.1-rc28/arch/s390/kernel/compat_linux.c
--- linux-2.6.17.7/arch/s390/kernel/compat_linux.c 2006-06-18 04:52:32 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/s390/kernel/compat_linux.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/s390/kernel/compat_linux.c 2006-07-09 17:06:48 +0200
@@ -594,7 +594,7 @@ asmlinkage long sys32_gettimeofday(struc
{
if (tv) {
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.17.7/arch/s390/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/s390/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/s390/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/s390/kernel/process.c
--- linux-2.6.17.7/arch/s390/kernel/process.c 2006-06-18 04:52:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/s390/kernel/process.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/s390/kernel/process.c 2006-07-09 17:06:48 +0200
@@ -165,9 +165,9 @@ void show_regs(struct pt_regs *regs)
struct task_struct *tsk = current;
0, ®s, 0, NULL, NULL);
}
-diff -NurpP --minimal linux-2.6.17.7/arch/s390/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc27/arch/s390/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.17.7/arch/s390/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc28/arch/s390/kernel/ptrace.c
--- linux-2.6.17.7/arch/s390/kernel/ptrace.c 2006-06-18 04:52:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/s390/kernel/ptrace.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/s390/kernel/ptrace.c 2006-07-09 17:06:48 +0200
@@ -723,7 +723,13 @@ sys_ptrace(long request, long pid, long
goto out;
}
put_task_struct(child);
out:
unlock_kernel();
-diff -NurpP --minimal linux-2.6.17.7/arch/s390/kernel/syscalls.S linux-2.6.17.7-vs2.1.1-rc27/arch/s390/kernel/syscalls.S
+diff -NurpP --minimal linux-2.6.17.7/arch/s390/kernel/syscalls.S linux-2.6.17.7-vs2.1.1-rc28/arch/s390/kernel/syscalls.S
--- linux-2.6.17.7/arch/s390/kernel/syscalls.S 2006-06-18 04:52:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/s390/kernel/syscalls.S 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/s390/kernel/syscalls.S 2006-07-09 17:06:48 +0200
@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
SYSCALL(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.17.7/arch/sh/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/sh/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/sh/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/sh/Kconfig
--- linux-2.6.17.7/arch/sh/Kconfig 2006-06-18 04:52:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sh/Kconfig 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sh/Kconfig 2006-07-09 17:06:48 +0200
@@ -646,6 +646,8 @@ source "arch/sh/oprofile/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/sh/kernel/kgdb_stub.c linux-2.6.17.7-vs2.1.1-rc27/arch/sh/kernel/kgdb_stub.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sh/kernel/kgdb_stub.c linux-2.6.17.7-vs2.1.1-rc28/arch/sh/kernel/kgdb_stub.c
--- linux-2.6.17.7/arch/sh/kernel/kgdb_stub.c 2004-08-14 12:54:51 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sh/kernel/kgdb_stub.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sh/kernel/kgdb_stub.c 2006-07-09 17:06:48 +0200
@@ -412,7 +412,7 @@ static struct task_struct *get_thread(in
if (pid == PID_MAX) pid = 0;
if (thread)
return thread;
-diff -NurpP --minimal linux-2.6.17.7/arch/sh/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/sh/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sh/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/sh/kernel/process.c
--- linux-2.6.17.7/arch/sh/kernel/process.c 2006-06-18 04:52:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sh/kernel/process.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sh/kernel/process.c 2006-07-09 17:06:48 +0200
@@ -112,7 +112,8 @@ void machine_power_off(void)
void show_regs(struct pt_regs * regs)
{
}
/*
-diff -NurpP --minimal linux-2.6.17.7/arch/sh/kernel/setup.c linux-2.6.17.7-vs2.1.1-rc27/arch/sh/kernel/setup.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sh/kernel/setup.c linux-2.6.17.7-vs2.1.1-rc28/arch/sh/kernel/setup.c
--- linux-2.6.17.7/arch/sh/kernel/setup.c 2006-06-18 04:52:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sh/kernel/setup.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sh/kernel/setup.c 2006-07-09 17:06:48 +0200
@@ -21,6 +21,7 @@
#include <linux/utsname.h>
#include <linux/cpu.h>
seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype());
show_cpuflags(m);
-diff -NurpP --minimal linux-2.6.17.7/arch/sh/kernel/sys_sh.c linux-2.6.17.7-vs2.1.1-rc27/arch/sh/kernel/sys_sh.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sh/kernel/sys_sh.c linux-2.6.17.7-vs2.1.1-rc28/arch/sh/kernel/sys_sh.c
--- linux-2.6.17.7/arch/sh/kernel/sys_sh.c 2005-08-29 22:24:55 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sh/kernel/sys_sh.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sh/kernel/sys_sh.c 2006-07-09 17:06:48 +0200
@@ -21,6 +21,7 @@
#include <linux/mman.h>
#include <linux/file.h>
up_read(&uts_sem);
return err?-EFAULT:0;
}
-diff -NurpP --minimal linux-2.6.17.7/arch/sh64/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/sh64/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sh64/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/sh64/kernel/process.c
--- linux-2.6.17.7/arch/sh64/kernel/process.c 2006-01-18 06:07:57 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sh64/kernel/process.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sh64/kernel/process.c 2006-07-09 17:06:48 +0200
@@ -637,7 +637,7 @@ int kernel_thread(int (*fn)(void *), voi
static __inline__ _syscall2(int,clone,unsigned long,flags,unsigned long,newsp)
static __inline__ _syscall1(int,exit,int,ret)
if (!reply) {
/* Child */
reply = exit(fn(arg));
-diff -NurpP --minimal linux-2.6.17.7/arch/sh64/kernel/sys_sh64.c linux-2.6.17.7-vs2.1.1-rc27/arch/sh64/kernel/sys_sh64.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sh64/kernel/sys_sh64.c linux-2.6.17.7-vs2.1.1-rc28/arch/sh64/kernel/sys_sh64.c
--- linux-2.6.17.7/arch/sh64/kernel/sys_sh64.c 2005-06-22 02:37:59 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sh64/kernel/sys_sh64.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sh64/kernel/sys_sh64.c 2006-07-09 17:06:48 +0200
@@ -29,6 +29,7 @@
#include <linux/file.h>
#include <linux/utsname.h>
up_read(&uts_sem);
return err?-EFAULT:0;
}
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/sparc/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/sparc/Kconfig
--- linux-2.6.17.7/arch/sparc/Kconfig 2006-06-18 04:52:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc/Kconfig 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc/Kconfig 2006-07-09 17:06:48 +0200
@@ -291,6 +291,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/sparc/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/sparc/kernel/process.c
--- linux-2.6.17.7/arch/sparc/kernel/process.c 2006-02-15 13:54:13 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc/kernel/process.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc/kernel/process.c 2006-07-09 17:06:48 +0200
@@ -706,7 +706,8 @@ pid_t kernel_thread(int (*fn)(void *), v
/* Notreached by child. */
"1: mov %%o0, %0\n\t" :
"i" (__NR_exit), "r" (fn), "r" (arg) :
"g1", "g2", "g3", "o0", "o1", "memory", "cc");
return retval;
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc27/arch/sparc/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc28/arch/sparc/kernel/ptrace.c
--- linux-2.6.17.7/arch/sparc/kernel/ptrace.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc/kernel/ptrace.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc/kernel/ptrace.c 2006-07-09 17:06:48 +0200
@@ -19,6 +19,7 @@
#include <linux/smp_lock.h>
#include <linux/security.h>
if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
|| (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc/kernel/sys_sparc.c linux-2.6.17.7-vs2.1.1-rc27/arch/sparc/kernel/sys_sparc.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc/kernel/sys_sparc.c linux-2.6.17.7-vs2.1.1-rc28/arch/sparc/kernel/sys_sparc.c
--- linux-2.6.17.7/arch/sparc/kernel/sys_sparc.c 2005-06-22 02:37:59 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc/kernel/sys_sparc.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc/kernel/sys_sparc.c 2006-07-09 17:06:48 +0200
@@ -21,6 +21,7 @@
#include <linux/utsname.h>
#include <linux/smp.h>
goto done;
err = 0;
done:
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc/kernel/sys_sunos.c linux-2.6.17.7-vs2.1.1-rc27/arch/sparc/kernel/sys_sunos.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc/kernel/sys_sunos.c linux-2.6.17.7-vs2.1.1-rc28/arch/sparc/kernel/sys_sunos.c
--- linux-2.6.17.7/arch/sparc/kernel/sys_sunos.c 2006-02-15 13:54:13 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc/kernel/sys_sunos.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc/kernel/sys_sunos.c 2006-07-09 17:06:48 +0200
@@ -35,6 +35,7 @@
#include <linux/smp.h>
#include <linux/smp_lock.h>
}
up_read(&uts_sem);
return ret ? -EFAULT : 0;
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc/kernel/systbls.S linux-2.6.17.7-vs2.1.1-rc27/arch/sparc/kernel/systbls.S
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc/kernel/systbls.S linux-2.6.17.7-vs2.1.1-rc28/arch/sparc/kernel/systbls.S
--- linux-2.6.17.7/arch/sparc/kernel/systbls.S 2006-06-18 04:52:34 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc/kernel/systbls.S 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc/kernel/systbls.S 2006-07-09 17:06:48 +0200
@@ -72,7 +72,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
/*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.17.7/arch/sparc/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc27/arch/sparc/kernel/traps.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc28/arch/sparc/kernel/traps.c
--- linux-2.6.17.7/arch/sparc/kernel/traps.c 2006-01-18 06:07:57 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc/kernel/traps.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc/kernel/traps.c 2006-07-09 17:06:48 +0200
@@ -100,7 +100,8 @@ void die_if_kernel(char *str, struct pt_
" /_| \\__/ |_\\\n"
" \\__U_/\n");
show_regs(regs);
__SAVE; __SAVE; __SAVE; __SAVE;
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/Kconfig
--- linux-2.6.17.7/arch/sparc64/Kconfig 2006-06-18 04:52:34 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/Kconfig 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/Kconfig 2006-07-09 17:06:48 +0200
@@ -423,6 +423,8 @@ endmenu
source "arch/sparc64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/binfmt_aout32.c linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/binfmt_aout32.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/binfmt_aout32.c linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/binfmt_aout32.c
--- linux-2.6.17.7/arch/sparc64/kernel/binfmt_aout32.c 2006-06-18 04:52:34 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/binfmt_aout32.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/binfmt_aout32.c 2006-07-09 17:06:48 +0200
@@ -27,6 +27,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/process.c
--- linux-2.6.17.7/arch/sparc64/kernel/process.c 2006-06-18 04:52:35 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/process.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/process.c 2006-07-09 17:06:48 +0200
@@ -698,7 +698,8 @@ pid_t kernel_thread(int (*fn)(void *), v
/* Notreached by child. */
"1:" :
"i" (__NR_exit), "r" (fn), "r" (arg) :
"g1", "g2", "g3", "o0", "o1", "memory", "cc");
return retval;
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/ptrace.c
--- linux-2.6.17.7/arch/sparc64/kernel/ptrace.c 2006-06-18 04:52:35 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/ptrace.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/ptrace.c 2006-07-09 17:06:48 +0200
@@ -22,6 +22,7 @@
#include <linux/seccomp.h>
#include <linux/audit.h>
if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
|| (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/sys_sparc.c linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/sys_sparc.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/sys_sparc.c linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/sys_sparc.c
--- linux-2.6.17.7/arch/sparc64/kernel/sys_sparc.c 2006-06-18 04:52:35 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/sys_sparc.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/sys_sparc.c 2006-07-09 17:06:48 +0200
@@ -26,6 +26,7 @@
#include <linux/ipc.h>
#include <linux/personality.h>
goto done;
err = 0;
done:
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/sys_sparc32.c linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/sys_sparc32.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/sys_sparc32.c linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/sys_sparc32.c
--- linux-2.6.17.7/arch/sparc64/kernel/sys_sparc32.c 2006-06-18 04:52:35 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/sys_sparc32.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/sys_sparc32.c 2006-07-09 17:06:48 +0200
@@ -788,7 +788,7 @@ asmlinkage long sys32_gettimeofday(struc
{
if (tv) {
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/sys_sunos32.c linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/sys_sunos32.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/sys_sunos32.c linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/sys_sunos32.c
--- linux-2.6.17.7/arch/sparc64/kernel/sys_sunos32.c 2006-02-15 13:54:13 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/sys_sunos32.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/sys_sunos32.c 2006-07-09 17:06:48 +0200
@@ -35,6 +35,7 @@
#include <linux/smp.h>
#include <linux/smp_lock.h>
sizeof(name->mach) - 1);
up_read(&uts_sem);
return (ret ? -EFAULT : 0);
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/systbls.S linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/systbls.S
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/systbls.S linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/systbls.S
--- linux-2.6.17.7/arch/sparc64/kernel/systbls.S 2006-06-18 04:52:35 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/systbls.S 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/systbls.S 2006-07-09 17:06:48 +0200
@@ -73,7 +73,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
/*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.17.7/arch/sparc64/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/traps.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/traps.c
--- linux-2.6.17.7/arch/sparc64/kernel/traps.c 2006-06-18 04:52:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/kernel/traps.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/kernel/traps.c 2006-07-09 17:06:48 +0200
@@ -2214,7 +2214,8 @@ void die_if_kernel(char *str, struct pt_
" /_| \\__/ |_\\\n"
" \\__U_/\n");
notify_die(DIE_OOPS, str, regs, 0, 255, SIGSEGV);
__asm__ __volatile__("flushw");
__show_regs(regs);
-diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/solaris/fs.c linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/solaris/fs.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/solaris/fs.c linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/solaris/fs.c
--- linux-2.6.17.7/arch/sparc64/solaris/fs.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/solaris/fs.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/solaris/fs.c 2006-07-09 17:06:48 +0200
@@ -363,7 +363,7 @@ static int report_statvfs(struct vfsmoun
int j = strlen (p);
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.17.7/arch/sparc64/solaris/misc.c linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/solaris/misc.c
+diff -NurpP --minimal linux-2.6.17.7/arch/sparc64/solaris/misc.c linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/solaris/misc.c
--- linux-2.6.17.7/arch/sparc64/solaris/misc.c 2006-06-18 04:52:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/sparc64/solaris/misc.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/sparc64/solaris/misc.c 2006-07-09 17:06:48 +0200
@@ -17,6 +17,7 @@
#include <linux/timex.h>
#include <linux/major.h>
q < r && *p && *p != '.'; *q++ = *p++);
up_read(&uts_sem);
*q = 0;
-diff -NurpP --minimal linux-2.6.17.7/arch/um/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/um/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/um/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/um/Kconfig
--- linux-2.6.17.7/arch/um/Kconfig 2006-06-18 04:52:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/um/Kconfig 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/um/Kconfig 2006-07-09 17:06:48 +0200
@@ -279,6 +279,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/um/drivers/mconsole_kern.c linux-2.6.17.7-vs2.1.1-rc27/arch/um/drivers/mconsole_kern.c
+diff -NurpP --minimal linux-2.6.17.7/arch/um/drivers/mconsole_kern.c linux-2.6.17.7-vs2.1.1-rc28/arch/um/drivers/mconsole_kern.c
--- linux-2.6.17.7/arch/um/drivers/mconsole_kern.c 2006-06-18 04:52:37 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/um/drivers/mconsole_kern.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/um/drivers/mconsole_kern.c 2006-07-09 17:06:48 +0200
@@ -23,6 +23,7 @@
#include "linux/list.h"
#include "linux/mm.h"
#include "asm/irq.h"
#include "asm/uaccess.h"
#include "user_util.h"
-diff -NurpP --minimal linux-2.6.17.7/arch/um/kernel/process_kern.c linux-2.6.17.7-vs2.1.1-rc27/arch/um/kernel/process_kern.c
+diff -NurpP --minimal linux-2.6.17.7/arch/um/kernel/process_kern.c linux-2.6.17.7-vs2.1.1-rc28/arch/um/kernel/process_kern.c
--- linux-2.6.17.7/arch/um/kernel/process_kern.c 2006-06-18 04:52:38 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/um/kernel/process_kern.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/um/kernel/process_kern.c 2006-07-09 17:06:48 +0200
@@ -23,6 +23,8 @@
#include "linux/proc_fs.h"
#include "linux/ptrace.h"
¤t->thread.regs, 0, NULL, NULL);
if(pid < 0)
panic("do_fork failed in kernel_thread, errno = %d", pid);
-diff -NurpP --minimal linux-2.6.17.7/arch/um/kernel/syscall_kern.c linux-2.6.17.7-vs2.1.1-rc27/arch/um/kernel/syscall_kern.c
+diff -NurpP --minimal linux-2.6.17.7/arch/um/kernel/syscall_kern.c linux-2.6.17.7-vs2.1.1-rc28/arch/um/kernel/syscall_kern.c
--- linux-2.6.17.7/arch/um/kernel/syscall_kern.c 2006-06-18 04:52:38 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/um/kernel/syscall_kern.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/um/kernel/syscall_kern.c 2006-07-09 17:06:48 +0200
@@ -15,6 +15,8 @@
#include "linux/unistd.h"
#include "linux/slab.h"
__OLD_UTS_LEN);
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
-diff -NurpP --minimal linux-2.6.17.7/arch/um/sys-x86_64/syscalls.c linux-2.6.17.7-vs2.1.1-rc27/arch/um/sys-x86_64/syscalls.c
+diff -NurpP --minimal linux-2.6.17.7/arch/um/sys-x86_64/syscalls.c linux-2.6.17.7-vs2.1.1-rc28/arch/um/sys-x86_64/syscalls.c
--- linux-2.6.17.7/arch/um/sys-x86_64/syscalls.c 2006-06-18 04:52:42 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/um/sys-x86_64/syscalls.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/um/sys-x86_64/syscalls.c 2006-07-09 17:06:48 +0200
@@ -9,6 +9,7 @@
#include "linux/shm.h"
#include "linux/utsname.h"
up_read(&uts_sem);
if (personality(current->personality) == PER_LINUX32)
err |= copy_to_user(&name->machine, "i686", 5);
-diff -NurpP --minimal linux-2.6.17.7/arch/v850/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/v850/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/v850/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/v850/Kconfig
--- linux-2.6.17.7/arch/v850/Kconfig 2006-06-18 04:52:42 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/v850/Kconfig 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/v850/Kconfig 2006-07-09 17:06:48 +0200
@@ -326,6 +326,8 @@ source "drivers/usb/Kconfig"
source "arch/v850/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/v850/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/v850/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/v850/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/v850/kernel/process.c
--- linux-2.6.17.7/arch/v850/kernel/process.c 2006-06-18 04:52:43 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/v850/kernel/process.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/v850/kernel/process.c 2006-07-09 17:06:48 +0200
@@ -84,7 +84,7 @@ int kernel_thread (int (*fn)(void *), vo
/* Clone this thread. Note that we don't pass the clone syscall's
second argument -- it's ignored for calls from kernel mode (the
syscall = __NR_clone;
asm volatile ("trap " SYSCALL_SHORT_TRAP
: "=r" (ret), "=r" (syscall)
-diff -NurpP --minimal linux-2.6.17.7/arch/v850/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc27/arch/v850/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.17.7/arch/v850/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc28/arch/v850/kernel/ptrace.c
--- linux-2.6.17.7/arch/v850/kernel/ptrace.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/v850/kernel/ptrace.c 2006-07-27 19:03:22 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/v850/kernel/ptrace.c 2006-07-27 19:03:22 +0200
@@ -117,6 +117,9 @@ long arch_ptrace(struct task_struct *chi
{
int rval;
switch (request) {
unsigned long val, copied;
-diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/Kconfig linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/Kconfig linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/Kconfig
--- linux-2.6.17.7/arch/x86_64/Kconfig 2006-07-27 19:19:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/Kconfig 2006-07-26 21:36:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/Kconfig 2006-07-26 21:36:47 +0200
@@ -617,6 +617,8 @@ endmenu
source "arch/x86_64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/ia32/ia32_aout.c linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/ia32/ia32_aout.c
+diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/ia32/ia32_aout.c linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/ia32/ia32_aout.c
--- linux-2.6.17.7/arch/x86_64/ia32/ia32_aout.c 2006-01-03 17:29:20 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/ia32/ia32_aout.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/ia32/ia32_aout.c 2006-07-09 17:06:48 +0200
@@ -25,6 +25,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/ia32/ia32_binfmt.c
+diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/ia32/ia32_binfmt.c
--- linux-2.6.17.7/arch/x86_64/ia32/ia32_binfmt.c 2006-06-18 04:52:43 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/ia32/ia32_binfmt.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/ia32/ia32_binfmt.c 2006-07-09 17:06:48 +0200
@@ -371,7 +371,8 @@ int ia32_setup_arg_pages(struct linux_bi
kmem_cache_free(vm_area_cachep, mpnt);
return ret;
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/ia32/ia32entry.S linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/ia32/ia32entry.S
+diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/ia32/ia32entry.S linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/ia32/ia32entry.S
--- linux-2.6.17.7/arch/x86_64/ia32/ia32entry.S 2006-06-18 04:52:43 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/ia32/ia32entry.S 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/ia32/ia32entry.S 2006-07-09 17:06:48 +0200
@@ -652,7 +652,7 @@ ia32_sys_call_table:
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/ia32/ptrace32.c linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/ia32/ptrace32.c
+diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/ia32/ptrace32.c linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/ia32/ptrace32.c
--- linux-2.6.17.7/arch/x86_64/ia32/ptrace32.c 2006-01-18 06:07:58 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/ia32/ptrace32.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/ia32/ptrace32.c 2006-07-09 17:06:48 +0200
@@ -18,6 +18,7 @@
#include <linux/unistd.h>
#include <linux/mm.h>
#include <asm/ptrace.h>
#include <asm/compat.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/ia32/sys_ia32.c linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/ia32/sys_ia32.c
+diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/ia32/sys_ia32.c linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/ia32/sys_ia32.c
--- linux-2.6.17.7/arch/x86_64/ia32/sys_ia32.c 2006-06-18 04:52:43 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/ia32/sys_ia32.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/ia32/sys_ia32.c 2006-07-09 17:06:48 +0200
@@ -61,6 +61,7 @@
#include <linux/highuid.h>
#include <linux/vmalloc.h>
up_read(&uts_sem);
if (personality(current->personality) == PER_LINUX32)
err |= copy_to_user(&name->machine, "i686", 5);
-diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/ia32/syscall32.c linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/ia32/syscall32.c
+diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/ia32/syscall32.c linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/ia32/syscall32.c
--- linux-2.6.17.7/arch/x86_64/ia32/syscall32.c 2005-10-28 20:49:18 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/ia32/syscall32.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/ia32/syscall32.c 2006-07-09 17:06:48 +0200
@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/stringify.h>
up_write(&mm->mmap_sem);
return 0;
}
-diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/kernel/process.c
--- linux-2.6.17.7/arch/x86_64/kernel/process.c 2006-06-18 04:52:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/kernel/process.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/kernel/process.c 2006-07-09 17:06:48 +0200
@@ -55,7 +55,8 @@
asmlinkage extern void ret_from_fork(void);
system_utsname.release,
(int)strcspn(system_utsname.version, " "),
system_utsname.version);
-diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/kernel/sys_x86_64.c linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/kernel/sys_x86_64.c
+diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/kernel/sys_x86_64.c linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/kernel/sys_x86_64.c
--- linux-2.6.17.7/arch/x86_64/kernel/sys_x86_64.c 2006-01-03 17:29:20 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/kernel/sys_x86_64.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/kernel/sys_x86_64.c 2006-07-09 17:06:48 +0200
@@ -16,6 +16,7 @@
#include <linux/file.h>
#include <linux/utsname.h>
up_read(&uts_sem);
if (personality(current->personality) == PER_LINUX32)
err |= copy_to_user(&name->machine, "i686", 5);
-diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/kernel/traps.c
+diff -NurpP --minimal linux-2.6.17.7/arch/x86_64/kernel/traps.c linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/kernel/traps.c
--- linux-2.6.17.7/arch/x86_64/kernel/traps.c 2006-06-18 04:52:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/x86_64/kernel/traps.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/x86_64/kernel/traps.c 2006-07-09 17:06:48 +0200
@@ -324,8 +324,9 @@ void show_registers(struct pt_regs *regs
printk("CPU %d ", cpu);
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.17.7/arch/xtensa/kernel/process.c linux-2.6.17.7-vs2.1.1-rc27/arch/xtensa/kernel/process.c
+diff -NurpP --minimal linux-2.6.17.7/arch/xtensa/kernel/process.c linux-2.6.17.7-vs2.1.1-rc28/arch/xtensa/kernel/process.c
--- linux-2.6.17.7/arch/xtensa/kernel/process.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/xtensa/kernel/process.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/xtensa/kernel/process.c 2006-07-09 17:06:48 +0200
@@ -207,7 +207,7 @@ int kernel_thread(int (*fn)(void *), voi
:"=r" (retval)
:"i" (__NR_clone), "i" (__NR_exit),
: "a2", "a3", "a4", "a5", "a6" );
return retval;
}
-diff -NurpP --minimal linux-2.6.17.7/arch/xtensa/kernel/syscalls.c linux-2.6.17.7-vs2.1.1-rc27/arch/xtensa/kernel/syscalls.c
+diff -NurpP --minimal linux-2.6.17.7/arch/xtensa/kernel/syscalls.c linux-2.6.17.7-vs2.1.1-rc28/arch/xtensa/kernel/syscalls.c
--- linux-2.6.17.7/arch/xtensa/kernel/syscalls.c 2005-08-29 22:24:57 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/arch/xtensa/kernel/syscalls.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/arch/xtensa/kernel/syscalls.c 2006-07-09 17:06:48 +0200
@@ -35,6 +35,7 @@
#include <linux/msg.h>
#include <linux/shm.h>
return 0;
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.17.7/block/cfq-iosched.c linux-2.6.17.7-vs2.1.1-rc27/block/cfq-iosched.c
+diff -NurpP --minimal linux-2.6.17.7/block/cfq-iosched.c linux-2.6.17.7-vs2.1.1-rc28/block/cfq-iosched.c
--- linux-2.6.17.7/block/cfq-iosched.c 2006-06-18 04:52:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/block/cfq-iosched.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/block/cfq-iosched.c 2006-07-09 17:06:48 +0200
@@ -341,6 +341,8 @@ static int cfq_queue_empty(request_queue
static inline pid_t cfq_queue_pid(struct task_struct *task, int rw)
if (rw == READ || process_sync(task))
return task->pid;
-diff -NurpP --minimal linux-2.6.17.7/drivers/block/Kconfig linux-2.6.17.7-vs2.1.1-rc27/drivers/block/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/drivers/block/Kconfig linux-2.6.17.7-vs2.1.1-rc28/drivers/block/Kconfig
--- linux-2.6.17.7/drivers/block/Kconfig 2006-06-18 04:52:46 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/drivers/block/Kconfig 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/drivers/block/Kconfig 2006-07-09 17:06:48 +0200
@@ -315,6 +315,13 @@ config BLK_DEV_CRYPTOLOOP
instead, which can be configured to be on-disk compatible with the
cryptoloop device.
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-2.6.17.7/drivers/block/Makefile linux-2.6.17.7-vs2.1.1-rc27/drivers/block/Makefile
+diff -NurpP --minimal linux-2.6.17.7/drivers/block/Makefile linux-2.6.17.7-vs2.1.1-rc28/drivers/block/Makefile
--- linux-2.6.17.7/drivers/block/Makefile 2006-06-18 04:52:46 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/drivers/block/Makefile 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/drivers/block/Makefile 2006-07-09 17:06:48 +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.17.7/drivers/block/loop.c linux-2.6.17.7-vs2.1.1-rc27/drivers/block/loop.c
+diff -NurpP --minimal linux-2.6.17.7/drivers/block/loop.c linux-2.6.17.7-vs2.1.1-rc28/drivers/block/loop.c
--- linux-2.6.17.7/drivers/block/loop.c 2006-06-18 04:52:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/drivers/block/loop.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/drivers/block/loop.c 2006-08-04 19:59:58 +0200
@@ -74,6 +74,7 @@
#include <linux/completion.h>
#include <linux/highmem.h>
#include <asm/uaccess.h>
-@@ -743,10 +744,12 @@ static int loop_set_fd(struct loop_devic
+@@ -743,6 +744,7 @@ static int loop_set_fd(struct loop_devic
struct file *file, *f;
struct inode *inode;
struct address_space *mapping;
unsigned lo_blocksize;
int lo_flags = 0;
int error;
- loff_t size;
-+ pid_t pid;
-
- /* This is safe, since we have a reference from open(). */
- __module_get(THIS_MODULE);
-@@ -839,12 +842,16 @@ static int loop_set_fd(struct loop_devic
+@@ -817,6 +819,7 @@ static int loop_set_fd(struct loop_devic
+ lo->lo_blocksize = lo_blocksize;
+ lo->lo_device = bdev;
+ lo->lo_flags = lo_flags;
++ lo->lo_xid = vx_current_xid();
+ lo->lo_backing_file = file;
+ lo->transfer = NULL;
+ lo->ioctl = NULL;
+@@ -839,7 +842,9 @@ static int loop_set_fd(struct loop_devic
set_blocksize(bdev, lo_blocksize);
if (error < 0)
goto out_putf;
wait_for_completion(&lo->lo_done);
- return 0;
+@@ -924,6 +929,7 @@ static int loop_clr_fd(struct loop_devic
+ lo->lo_sizelimit = 0;
+ lo->lo_encrypt_key_size = 0;
+ lo->lo_flags = 0;
++ lo->lo_xid = 0;
+ memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
+ memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
+ memset(lo->lo_file_name, 0, LO_NAME_SIZE);
+@@ -1180,6 +1186,9 @@ static int lo_open(struct inode *inode,
+ {
+ struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
-+ out_err:
-+ error = (int)pid;
- out_putf:
- fput(file);
- out:
-diff -NurpP --minimal linux-2.6.17.7/drivers/block/vroot.c linux-2.6.17.7-vs2.1.1-rc27/drivers/block/vroot.c
++ if (!vx_check(lo->lo_xid, VX_IDENT|VX_HOSTID))
++ return -EACCES;
++
+ mutex_lock(&lo->lo_ctl_mutex);
+ lo->lo_refcnt++;
+ mutex_unlock(&lo->lo_ctl_mutex);
+diff -NurpP --minimal linux-2.6.17.7/drivers/block/vroot.c linux-2.6.17.7-vs2.1.1-rc28/drivers/block/vroot.c
--- linux-2.6.17.7/drivers/block/vroot.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/drivers/block/vroot.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/drivers/block/vroot.c 2006-07-09 17:06:48 +0200
@@ -0,0 +1,288 @@
+/*
+ * linux/drivers/block/vroot.c
+
+#endif
+
-diff -NurpP --minimal linux-2.6.17.7/drivers/char/random.c linux-2.6.17.7-vs2.1.1-rc27/drivers/char/random.c
+diff -NurpP --minimal linux-2.6.17.7/drivers/char/random.c linux-2.6.17.7-vs2.1.1-rc28/drivers/char/random.c
--- linux-2.6.17.7/drivers/char/random.c 2006-06-18 04:52:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/drivers/char/random.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/drivers/char/random.c 2006-07-09 17:06:48 +0200
@@ -1174,7 +1174,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)
unsigned char buf[64], tmp_uuid[16], *uuid;
uuid = table->data;
-diff -NurpP --minimal linux-2.6.17.7/drivers/char/sysrq.c linux-2.6.17.7-vs2.1.1-rc27/drivers/char/sysrq.c
+diff -NurpP --minimal linux-2.6.17.7/drivers/char/sysrq.c linux-2.6.17.7-vs2.1.1-rc28/drivers/char/sysrq.c
--- linux-2.6.17.7/drivers/char/sysrq.c 2006-06-18 04:52:57 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/drivers/char/sysrq.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/drivers/char/sysrq.c 2006-07-09 17:06:48 +0200
@@ -36,6 +36,7 @@
#include <linux/vt_kern.h>
#include <linux/workqueue.h>
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-2.6.17.7/drivers/char/tty_io.c linux-2.6.17.7-vs2.1.1-rc27/drivers/char/tty_io.c
+diff -NurpP --minimal linux-2.6.17.7/drivers/char/tty_io.c linux-2.6.17.7-vs2.1.1-rc28/drivers/char/tty_io.c
--- linux-2.6.17.7/drivers/char/tty_io.c 2006-06-18 04:52:58 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/drivers/char/tty_io.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/drivers/char/tty_io.c 2006-07-09 17:06:48 +0200
@@ -103,6 +103,7 @@
#include <linux/vt_kern.h>
#include <linux/selection.h>
if (pgrp < 0)
return -EINVAL;
if (session_of_pgrp(pgrp) != current->signal->session)
-diff -NurpP --minimal linux-2.6.17.7/drivers/infiniband/core/uverbs_mem.c linux-2.6.17.7-vs2.1.1-rc27/drivers/infiniband/core/uverbs_mem.c
+diff -NurpP --minimal linux-2.6.17.7/drivers/infiniband/core/uverbs_mem.c linux-2.6.17.7-vs2.1.1-rc28/drivers/infiniband/core/uverbs_mem.c
--- linux-2.6.17.7/drivers/infiniband/core/uverbs_mem.c 2006-06-18 04:53:04 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/drivers/infiniband/core/uverbs_mem.c 2006-07-09 17:06:48 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/drivers/infiniband/core/uverbs_mem.c 2006-07-09 17:06:48 +0200
@@ -36,6 +36,7 @@
#include <linux/mm.h>
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
-diff -NurpP --minimal linux-2.6.17.7/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.17.7-vs2.1.1-rc27/drivers/infiniband/hw/ipath/ipath_user_pages.c
+diff -NurpP --minimal linux-2.6.17.7/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.17.7-vs2.1.1-rc28/drivers/infiniband/hw/ipath/ipath_user_pages.c
--- linux-2.6.17.7/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-06-18 04:53:04 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-07-09 17:06:49 +0200
@@ -32,6 +32,7 @@
#include <linux/mm.h>
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
-diff -NurpP --minimal linux-2.6.17.7/fs/attr.c linux-2.6.17.7-vs2.1.1-rc27/fs/attr.c
+diff -NurpP --minimal linux-2.6.17.7/drivers/md/dm.c linux-2.6.17.7-vs2.1.1-rc28/drivers/md/dm.c
+--- linux-2.6.17.7/drivers/md/dm.c 2006-06-18 04:53:11 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/drivers/md/dm.c 2006-08-04 20:44:02 +0200
+@@ -66,6 +66,7 @@ struct mapped_device {
+ struct semaphore suspend_lock;
+ rwlock_t map_lock;
+ atomic_t holders;
++ xid_t xid;
+
+ unsigned long flags;
+
+@@ -219,6 +220,8 @@ static int dm_blk_open(struct inode *ino
+ struct mapped_device *md;
+
+ md = inode->i_bdev->bd_disk->private_data;
++ if (!vx_check(md->xid, VX_IDENT|VX_HOSTID))
++ return -EACCES;
+ dm_get(md);
+ return 0;
+ }
+@@ -850,6 +853,7 @@ static struct mapped_device *alloc_dev(u
+ rwlock_init(&md->map_lock);
+ atomic_set(&md->holders, 1);
+ atomic_set(&md->event_nr, 0);
++ md->xid = vx_current_xid();
+
+ md->queue = blk_alloc_queue(GFP_KERNEL);
+ if (!md->queue)
+diff -NurpP --minimal linux-2.6.17.7/fs/attr.c linux-2.6.17.7-vs2.1.1-rc28/fs/attr.c
--- linux-2.6.17.7/fs/attr.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/attr.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/attr.c 2006-07-09 17:06:49 +0200
@@ -15,6 +15,9 @@
#include <linux/fcntl.h>
#include <linux/quotaops.h>
error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
if (!error)
error = inode_setattr(inode, attr);
-diff -NurpP --minimal linux-2.6.17.7/fs/binfmt_aout.c linux-2.6.17.7-vs2.1.1-rc27/fs/binfmt_aout.c
+diff -NurpP --minimal linux-2.6.17.7/fs/binfmt_aout.c linux-2.6.17.7-vs2.1.1-rc28/fs/binfmt_aout.c
--- linux-2.6.17.7/fs/binfmt_aout.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/binfmt_aout.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/binfmt_aout.c 2006-07-09 17:06:49 +0200
@@ -24,6 +24,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.17.7/fs/binfmt_elf.c linux-2.6.17.7-vs2.1.1-rc27/fs/binfmt_elf.c
+diff -NurpP --minimal linux-2.6.17.7/fs/binfmt_elf.c linux-2.6.17.7-vs2.1.1-rc28/fs/binfmt_elf.c
--- linux-2.6.17.7/fs/binfmt_elf.c 2006-06-18 04:54:29 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/binfmt_elf.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/binfmt_elf.c 2006-07-09 17:06:49 +0200
@@ -38,6 +38,8 @@
#include <linux/security.h>
#include <linux/syscalls.h>
#include <asm/uaccess.h>
#include <asm/param.h>
-diff -NurpP --minimal linux-2.6.17.7/fs/binfmt_elf_fdpic.c linux-2.6.17.7-vs2.1.1-rc27/fs/binfmt_elf_fdpic.c
+diff -NurpP --minimal linux-2.6.17.7/fs/binfmt_elf_fdpic.c linux-2.6.17.7-vs2.1.1-rc28/fs/binfmt_elf_fdpic.c
--- linux-2.6.17.7/fs/binfmt_elf_fdpic.c 2006-06-18 04:54:29 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/binfmt_elf_fdpic.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/binfmt_elf_fdpic.c 2006-07-09 17:06:49 +0200
@@ -32,6 +32,7 @@
#include <linux/elf.h>
#include <linux/elf-fdpic.h>
#include <asm/uaccess.h>
#include <asm/param.h>
-diff -NurpP --minimal linux-2.6.17.7/fs/binfmt_flat.c linux-2.6.17.7-vs2.1.1-rc27/fs/binfmt_flat.c
+diff -NurpP --minimal linux-2.6.17.7/fs/binfmt_flat.c linux-2.6.17.7-vs2.1.1-rc28/fs/binfmt_flat.c
--- linux-2.6.17.7/fs/binfmt_flat.c 2006-06-18 04:54:29 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/binfmt_flat.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/binfmt_flat.c 2006-07-09 17:06:49 +0200
@@ -37,6 +37,7 @@
#include <linux/init.h>
#include <linux/flat.h>
#include <asm/byteorder.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.17.7/fs/binfmt_som.c linux-2.6.17.7-vs2.1.1-rc27/fs/binfmt_som.c
+diff -NurpP --minimal linux-2.6.17.7/fs/binfmt_som.c linux-2.6.17.7-vs2.1.1-rc28/fs/binfmt_som.c
--- linux-2.6.17.7/fs/binfmt_som.c 2006-01-03 17:29:55 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/binfmt_som.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/binfmt_som.c 2006-07-09 17:06:49 +0200
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.17.7/fs/buffer.c linux-2.6.17.7-vs2.1.1-rc27/fs/buffer.c
+diff -NurpP --minimal linux-2.6.17.7/fs/buffer.c linux-2.6.17.7-vs2.1.1-rc28/fs/buffer.c
--- linux-2.6.17.7/fs/buffer.c 2006-06-18 04:54:29 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/buffer.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/buffer.c 2006-07-09 17:06:49 +0200
@@ -163,7 +163,7 @@ EXPORT_SYMBOL(sync_blockdev);
static void __fsync_super(struct super_block *sb)
{
lock_super(sb);
if (sb->s_dirt && sb->s_op->write_super)
sb->s_op->write_super(sb);
-diff -NurpP --minimal linux-2.6.17.7/fs/dcache.c linux-2.6.17.7-vs2.1.1-rc27/fs/dcache.c
+diff -NurpP --minimal linux-2.6.17.7/fs/dcache.c linux-2.6.17.7-vs2.1.1-rc28/fs/dcache.c
--- linux-2.6.17.7/fs/dcache.c 2006-06-18 04:54:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/dcache.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/dcache.c 2006-07-09 17:06:49 +0200
@@ -33,6 +33,7 @@
#include <linux/seqlock.h>
#include <linux/swap.h>
found = dentry;
}
spin_unlock(&dentry->d_lock);
-diff -NurpP --minimal linux-2.6.17.7/fs/devpts/inode.c linux-2.6.17.7-vs2.1.1-rc27/fs/devpts/inode.c
+diff -NurpP --minimal linux-2.6.17.7/fs/devpts/inode.c linux-2.6.17.7-vs2.1.1-rc28/fs/devpts/inode.c
--- linux-2.6.17.7/fs/devpts/inode.c 2006-06-18 04:54:31 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/devpts/inode.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/devpts/inode.c 2006-07-09 17:06:49 +0200
@@ -20,7 +20,20 @@
#include <linux/devpts_fs.h>
#include <linux/parser.h>
inode->u.generic_ip = tty;
dentry = get_node(number);
-diff -NurpP --minimal linux-2.6.17.7/fs/dquot.c linux-2.6.17.7-vs2.1.1-rc27/fs/dquot.c
+diff -NurpP --minimal linux-2.6.17.7/fs/dquot.c linux-2.6.17.7-vs2.1.1-rc28/fs/dquot.c
--- linux-2.6.17.7/fs/dquot.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/dquot.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/dquot.c 2006-07-09 17:06:49 +0200
@@ -79,6 +79,7 @@
#include <linux/buffer_head.h>
#include <linux/capability.h>
return 0;
}
-diff -NurpP --minimal linux-2.6.17.7/fs/exec.c linux-2.6.17.7-vs2.1.1-rc27/fs/exec.c
+diff -NurpP --minimal linux-2.6.17.7/fs/exec.c linux-2.6.17.7-vs2.1.1-rc28/fs/exec.c
--- linux-2.6.17.7/fs/exec.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/exec.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/exec.c 2006-07-09 17:06:49 +0200
@@ -49,6 +49,8 @@
#include <linux/rmap.h>
#include <linux/acct.h>
up_read(&uts_sem);
if (rc > out_end - out_ptr)
goto out;
-diff -NurpP --minimal linux-2.6.17.7/fs/ext2/balloc.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/balloc.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext2/balloc.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/balloc.c
--- linux-2.6.17.7/fs/ext2/balloc.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/balloc.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/balloc.c 2006-07-09 17:06:49 +0200
@@ -17,6 +17,8 @@
#include <linux/sched.h>
#include <linux/buffer_head.h>
release_blocks(sb, es_alloc);
out_dquot:
DQUOT_FREE_BLOCK(inode, dq_alloc);
-diff -NurpP --minimal linux-2.6.17.7/fs/ext2/ext2.h linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/ext2.h
+diff -NurpP --minimal linux-2.6.17.7/fs/ext2/ext2.h linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/ext2.h
--- linux-2.6.17.7/fs/ext2/ext2.h 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/ext2.h 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/ext2.h 2006-07-09 17:06:49 +0200
@@ -165,6 +165,7 @@ extern const struct file_operations ext2
extern struct address_space_operations ext2_aops;
extern struct address_space_operations ext2_aops_xip;
/* namei.c */
extern struct inode_operations ext2_dir_inode_operations;
-diff -NurpP --minimal linux-2.6.17.7/fs/ext2/file.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/file.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext2/file.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/file.c
--- linux-2.6.17.7/fs/ext2/file.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/file.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/file.c 2006-07-09 17:06:49 +0200
@@ -53,6 +53,7 @@ const struct file_operations ext2_file_o
.readv = generic_file_readv,
.writev = generic_file_writev,
.permission = ext2_permission,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.7/fs/ext2/ialloc.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/ialloc.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext2/ialloc.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/ialloc.c
--- linux-2.6.17.7/fs/ext2/ialloc.c 2006-02-18 14:40:21 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/ialloc.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/ialloc.c 2006-07-09 17:06:49 +0200
@@ -18,6 +18,8 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
make_bad_inode(inode);
iput(inode);
return ERR_PTR(err);
-diff -NurpP --minimal linux-2.6.17.7/fs/ext2/inode.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/inode.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext2/inode.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/inode.c
--- linux-2.6.17.7/fs/ext2/inode.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/inode.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/inode.c 2006-07-09 17:06:49 +0200
@@ -31,6 +31,7 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0;
if (error)
return error;
-diff -NurpP --minimal linux-2.6.17.7/fs/ext2/ioctl.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/ioctl.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext2/ioctl.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/ioctl.c
--- linux-2.6.17.7/fs/ext2/ioctl.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/ioctl.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/ioctl.c 2006-07-09 17:06:49 +0200
@@ -11,6 +11,7 @@
#include <linux/capability.h>
#include <linux/time.h>
return -EROFS;
if (get_user(inode->i_generation, (int __user *) arg))
return -EFAULT;
-diff -NurpP --minimal linux-2.6.17.7/fs/ext2/namei.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/namei.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext2/namei.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/namei.c
--- linux-2.6.17.7/fs/ext2/namei.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/namei.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/namei.c 2006-07-09 17:06:49 +0200
@@ -31,6 +31,7 @@
*/
.permission = ext2_permission,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.7/fs/ext2/super.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/super.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext2/super.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/super.c
--- linux-2.6.17.7/fs/ext2/super.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/super.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/super.c 2006-07-09 17:06:49 +0200
@@ -229,8 +229,8 @@ static int ext2_show_options(struct seq_
}
sector_t blk = off >> EXT2_BLOCK_SIZE_BITS(sb);
int err = 0;
int offset = off & (sb->s_blocksize - 1);
-diff -NurpP --minimal linux-2.6.17.7/fs/ext2/symlink.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/symlink.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext2/symlink.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/symlink.c
--- linux-2.6.17.7/fs/ext2/symlink.c 2005-08-29 22:25:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/symlink.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/symlink.c 2006-07-09 17:06:49 +0200
@@ -38,6 +38,7 @@ struct inode_operations ext2_symlink_ino
.listxattr = ext2_listxattr,
.removexattr = generic_removexattr,
#endif
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.7/fs/ext2/xattr.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/xattr.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext2/xattr.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/xattr.c
--- linux-2.6.17.7/fs/ext2/xattr.c 2006-02-18 14:40:21 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext2/xattr.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext2/xattr.c 2006-07-09 17:06:49 +0200
@@ -60,6 +60,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
DQUOT_FREE_BLOCK(inode, 1);
}
EXT2_I(inode)->i_file_acl = 0;
-diff -NurpP --minimal linux-2.6.17.7/fs/ext3/balloc.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/balloc.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext3/balloc.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/balloc.c
--- linux-2.6.17.7/fs/ext3/balloc.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/balloc.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/balloc.c 2006-07-09 17:06:49 +0200
@@ -20,6 +20,8 @@
#include <linux/ext3_jbd.h>
#include <linux/quotaops.h>
if (fatal) {
*errp = fatal;
ext3_std_error(sb, fatal);
-diff -NurpP --minimal linux-2.6.17.7/fs/ext3/file.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/file.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext3/file.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/file.c
--- linux-2.6.17.7/fs/ext3/file.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/file.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/file.c 2006-07-09 17:06:49 +0200
@@ -119,6 +119,7 @@ const struct file_operations ext3_file_o
.release = ext3_release_file,
.fsync = ext3_sync_file,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.7/fs/ext3/ialloc.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/ialloc.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext3/ialloc.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/ialloc.c
--- linux-2.6.17.7/fs/ext3/ialloc.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/ialloc.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/ialloc.c 2006-07-09 17:06:49 +0200
@@ -23,6 +23,8 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
-diff -NurpP --minimal linux-2.6.17.7/fs/ext3/inode.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/inode.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext3/inode.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/inode.c
--- linux-2.6.17.7/fs/ext3/inode.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/inode.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/inode.c 2006-07-09 17:06:49 +0200
@@ -36,6 +36,7 @@
#include <linux/writeback.h>
#include <linux/mpage.h>
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.17.7/fs/ext3/ioctl.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/ioctl.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext3/ioctl.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/ioctl.c
--- linux-2.6.17.7/fs/ext3/ioctl.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/ioctl.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/ioctl.c 2006-07-09 17:06:49 +0200
@@ -8,11 +8,13 @@
*/
default:
return -ENOTTY;
-diff -NurpP --minimal linux-2.6.17.7/fs/ext3/namei.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/namei.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext3/namei.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/namei.c
--- linux-2.6.17.7/fs/ext3/namei.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/namei.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/namei.c 2006-07-09 17:06:49 +0200
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
.permission = ext3_permission,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.7/fs/ext3/super.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/super.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext3/super.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/super.c
--- linux-2.6.17.7/fs/ext3/super.c 2006-06-18 04:54:34 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/super.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/super.c 2006-07-09 17:06:49 +0200
@@ -564,12 +564,12 @@ static int ext3_write_dquot(struct dquot
static int ext3_acquire_dquot(struct dquot *dquot);
static int ext3_release_dquot(struct dquot *dquot);
sector_t blk = off >> EXT3_BLOCK_SIZE_BITS(sb);
int err = 0;
int offset = off & (sb->s_blocksize - 1);
-diff -NurpP --minimal linux-2.6.17.7/fs/ext3/symlink.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/symlink.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext3/symlink.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/symlink.c
--- linux-2.6.17.7/fs/ext3/symlink.c 2005-08-29 22:25:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/symlink.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/symlink.c 2006-07-09 17:06:49 +0200
@@ -40,6 +40,7 @@ struct inode_operations ext3_symlink_ino
.listxattr = ext3_listxattr,
.removexattr = generic_removexattr,
#endif
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.7/fs/ext3/xattr.c linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/xattr.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ext3/xattr.c linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/xattr.c
--- linux-2.6.17.7/fs/ext3/xattr.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ext3/xattr.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ext3/xattr.c 2006-07-09 17:06:49 +0200
@@ -58,6 +58,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
goto cleanup;
bad_block:
-diff -NurpP --minimal linux-2.6.17.7/fs/fcntl.c linux-2.6.17.7-vs2.1.1-rc27/fs/fcntl.c
+diff -NurpP --minimal linux-2.6.17.7/fs/fcntl.c linux-2.6.17.7-vs2.1.1-rc28/fs/fcntl.c
--- linux-2.6.17.7/fs/fcntl.c 2006-06-18 04:54:34 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/fcntl.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/fcntl.c 2006-07-09 17:06:49 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/signal.h>
if (p) {
send_sigurg_to_task(p, fown);
}
-diff -NurpP --minimal linux-2.6.17.7/fs/file_table.c linux-2.6.17.7-vs2.1.1-rc27/fs/file_table.c
+diff -NurpP --minimal linux-2.6.17.7/fs/file_table.c linux-2.6.17.7-vs2.1.1-rc28/fs/file_table.c
--- linux-2.6.17.7/fs/file_table.c 2006-06-18 04:54:34 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/file_table.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/file_table.c 2006-07-09 17:06:49 +0200
@@ -22,6 +22,8 @@
#include <linux/fsnotify.h>
#include <linux/sysctl.h>
file_kill(file);
file_free(file);
}
-diff -NurpP --minimal linux-2.6.17.7/fs/hfsplus/ioctl.c linux-2.6.17.7-vs2.1.1-rc27/fs/hfsplus/ioctl.c
+diff -NurpP --minimal linux-2.6.17.7/fs/hfsplus/ioctl.c linux-2.6.17.7-vs2.1.1-rc28/fs/hfsplus/ioctl.c
--- linux-2.6.17.7/fs/hfsplus/ioctl.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/hfsplus/ioctl.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/hfsplus/ioctl.c 2006-07-09 17:06:49 +0200
@@ -16,6 +16,7 @@
#include <linux/fs.h>
#include <linux/sched.h>
return -EROFS;
if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-diff -NurpP --minimal linux-2.6.17.7/fs/inode.c linux-2.6.17.7-vs2.1.1-rc27/fs/inode.c
+diff -NurpP --minimal linux-2.6.17.7/fs/inode.c linux-2.6.17.7-vs2.1.1-rc28/fs/inode.c
--- linux-2.6.17.7/fs/inode.c 2006-06-18 04:54:35 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/inode.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/inode.c 2006-07-09 17:06:49 +0200
@@ -116,6 +116,9 @@ static struct inode *alloc_inode(struct
struct address_space * const mapping = &inode->i_data;
return; /* nothing to do */
spin_lock(&inode_lock); /* This lock is for inodes code */
-diff -NurpP --minimal linux-2.6.17.7/fs/ioctl.c linux-2.6.17.7-vs2.1.1-rc27/fs/ioctl.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ioctl.c linux-2.6.17.7-vs2.1.1-rc28/fs/ioctl.c
--- linux-2.6.17.7/fs/ioctl.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ioctl.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ioctl.c 2006-07-09 17:06:49 +0200
@@ -13,10 +13,19 @@
#include <linux/fs.h>
#include <linux/security.h>
default:
if (S_ISREG(filp->f_dentry->d_inode->i_mode))
error = file_ioctl(filp, cmd, arg);
-diff -NurpP --minimal linux-2.6.17.7/fs/ioprio.c linux-2.6.17.7-vs2.1.1-rc27/fs/ioprio.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ioprio.c linux-2.6.17.7-vs2.1.1-rc28/fs/ioprio.c
--- linux-2.6.17.7/fs/ioprio.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ioprio.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ioprio.c 2006-07-09 17:06:49 +0200
@@ -24,6 +24,7 @@
#include <linux/blkdev.h>
#include <linux/capability.h>
if (!user)
break;
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/acl.c linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/acl.c
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/acl.c linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/acl.c
--- linux-2.6.17.7/fs/jfs/acl.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/acl.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/acl.c 2006-07-09 17:06:49 +0200
@@ -232,7 +232,8 @@ int jfs_setattr(struct dentry *dentry, s
return rc;
if (DQUOT_TRANSFER(inode, iattr))
return -EDQUOT;
}
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/file.c linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/file.c
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/file.c linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/file.c
--- linux-2.6.17.7/fs/jfs/file.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/file.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/file.c 2006-07-09 17:06:49 +0200
@@ -98,6 +98,7 @@ struct inode_operations jfs_file_inode_o
.setattr = jfs_setattr,
.permission = jfs_permission,
.fsync = jfs_fsync,
.release = jfs_release,
.ioctl = jfs_ioctl,
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/inode.c linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/inode.c
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/inode.c linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/inode.c
--- linux-2.6.17.7/fs/jfs/inode.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/inode.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/inode.c 2006-07-09 17:06:49 +0200
@@ -22,6 +22,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
}
clear_inode(inode);
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/ioctl.c linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/ioctl.c
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/ioctl.c linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/ioctl.c
--- linux-2.6.17.7/fs/jfs/ioctl.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/ioctl.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/ioctl.c 2006-07-09 17:06:49 +0200
@@ -10,6 +10,7 @@
#include <linux/ctype.h>
#include <linux/capability.h>
if (!capable(CAP_LINUX_IMMUTABLE))
return -EPERM;
}
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_dinode.h linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_dinode.h
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_dinode.h linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_dinode.h
--- linux-2.6.17.7/fs/jfs/jfs_dinode.h 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_dinode.h 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_dinode.h 2006-07-09 17:06:49 +0200
@@ -162,13 +162,15 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
#define JFS_IMMUTABLE_FL 0x02000000 /* Immutable file */
-
#endif /*_H_JFS_DINODE */
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_dtree.c linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_dtree.c
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_dtree.c linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_dtree.c
--- linux-2.6.17.7/fs/jfs/jfs_dtree.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_dtree.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_dtree.c 2006-07-09 17:06:49 +0200
@@ -102,6 +102,7 @@
#include <linux/fs.h>
/* Free quota allocation */
DQUOT_FREE_BLOCK(ip, xlen);
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_extent.c linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_extent.c
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_extent.c linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_extent.c
--- linux-2.6.17.7/fs/jfs/jfs_extent.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_extent.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_extent.c 2006-07-09 17:06:49 +0200
@@ -18,6 +18,7 @@
#include <linux/fs.h>
DQUOT_FREE_BLOCK(ip, nxlen);
goto exit;
}
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_filsys.h linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_filsys.h
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_filsys.h linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_filsys.h
--- linux-2.6.17.7/fs/jfs/jfs_filsys.h 2005-10-28 20:49:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_filsys.h 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_filsys.h 2006-07-09 17:06:49 +0200
@@ -84,6 +84,7 @@
#define JFS_DIR_INDEX 0x00200000 /* Persistant index for */
/* directory entries */
/*
* buffer cache configuration
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_imap.c linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_imap.c
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_imap.c linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_imap.c
--- linux-2.6.17.7/fs/jfs/jfs_imap.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_imap.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_imap.c 2006-07-09 17:06:49 +0200
@@ -45,6 +45,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
/*
* mode2 is only needed for storing the higher order bits.
* Trust i_mode for the lower order ones
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_inode.c linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_inode.c
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_inode.c linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_inode.c
--- linux-2.6.17.7/fs/jfs/jfs_inode.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_inode.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_inode.c 2006-07-09 17:06:49 +0200
@@ -18,6 +18,8 @@
#include <linux/fs.h>
DQUOT_DROP(inode);
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_inode.h linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_inode.h
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_inode.h linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_inode.h
--- linux-2.6.17.7/fs/jfs/jfs_inode.h 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_inode.h 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_inode.h 2006-07-09 17:06:49 +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 *);
extern void jfs_set_inode_flags(struct inode *);
extern struct address_space_operations jfs_aops;
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_xtree.c linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_xtree.c
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/jfs_xtree.c linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_xtree.c
--- linux-2.6.17.7/fs/jfs/jfs_xtree.c 2006-01-03 17:29:57 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/jfs_xtree.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/jfs_xtree.c 2006-07-09 17:06:49 +0200
@@ -21,6 +21,7 @@
#include <linux/fs.h>
/* update quota allocation to reflect freed blocks */
DQUOT_FREE_BLOCK(ip, nfreed);
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/namei.c linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/namei.c
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/namei.c linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/namei.c
--- linux-2.6.17.7/fs/jfs/namei.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/namei.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/namei.c 2006-07-09 17:06:49 +0200
@@ -20,6 +20,7 @@
#include <linux/fs.h>
#include <linux/ctype.h>
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/super.c linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/super.c
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/super.c linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/super.c
--- linux-2.6.17.7/fs/jfs/super.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/super.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/super.c 2006-07-09 17:06:49 +0200
@@ -194,7 +194,8 @@ static void jfs_put_super(struct super_b
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-2.6.17.7/fs/jfs/xattr.c linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/xattr.c
+diff -NurpP --minimal linux-2.6.17.7/fs/jfs/xattr.c linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/xattr.c
--- linux-2.6.17.7/fs/jfs/xattr.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/jfs/xattr.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/jfs/xattr.c 2006-07-09 17:06:49 +0200
@@ -23,6 +23,7 @@
#include <linux/posix_acl_xattr.h>
#include <linux/quotaops.h>
inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-2.6.17.7/fs/libfs.c linux-2.6.17.7-vs2.1.1-rc27/fs/libfs.c
+diff -NurpP --minimal linux-2.6.17.7/fs/libfs.c linux-2.6.17.7-vs2.1.1-rc28/fs/libfs.c
--- linux-2.6.17.7/fs/libfs.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/libfs.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/libfs.c 2006-07-09 17:06:49 +0200
@@ -124,7 +124,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(get_sb_pseudo);
EXPORT_SYMBOL(simple_commit_write);
-diff -NurpP --minimal linux-2.6.17.7/fs/lockd/clntproc.c linux-2.6.17.7-vs2.1.1-rc27/fs/lockd/clntproc.c
+diff -NurpP --minimal linux-2.6.17.7/fs/lockd/clntproc.c linux-2.6.17.7-vs2.1.1-rc28/fs/lockd/clntproc.c
--- linux-2.6.17.7/fs/lockd/clntproc.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/lockd/clntproc.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/lockd/clntproc.c 2006-07-09 17:06:49 +0200
@@ -14,6 +14,7 @@
#include <linux/nfs_fs.h>
#include <linux/utsname.h>
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.17.7/fs/lockd/mon.c linux-2.6.17.7-vs2.1.1-rc27/fs/lockd/mon.c
+diff -NurpP --minimal linux-2.6.17.7/fs/lockd/mon.c linux-2.6.17.7-vs2.1.1-rc28/fs/lockd/mon.c
--- linux-2.6.17.7/fs/lockd/mon.c 2006-06-18 04:54:37 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/lockd/mon.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/lockd/mon.c 2006-07-09 17:06:49 +0200
@@ -13,6 +13,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/lockd/lockd.h>
return ERR_PTR(-EIO);
*p++ = htonl(argp->prog);
*p++ = htonl(argp->vers);
-diff -NurpP --minimal linux-2.6.17.7/fs/locks.c linux-2.6.17.7-vs2.1.1-rc27/fs/locks.c
+diff -NurpP --minimal linux-2.6.17.7/fs/locks.c linux-2.6.17.7-vs2.1.1-rc28/fs/locks.c
--- linux-2.6.17.7/fs/locks.c 2006-06-18 04:54:37 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/locks.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/locks.c 2006-07-09 17:06:49 +0200
@@ -125,6 +125,7 @@
#include <linux/syscalls.h>
#include <linux/time.h>
lock_get_status(q, fl, ++i, "");
move_lock_status(&q, &pos, offset);
-diff -NurpP --minimal linux-2.6.17.7/fs/namei.c linux-2.6.17.7-vs2.1.1-rc27/fs/namei.c
+diff -NurpP --minimal linux-2.6.17.7/fs/namei.c linux-2.6.17.7-vs2.1.1-rc28/fs/namei.c
--- linux-2.6.17.7/fs/namei.c 2006-07-27 19:19:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/namei.c 2006-07-26 21:36:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/namei.c 2006-07-26 21:36:47 +0200
@@ -32,6 +32,10 @@
#include <linux/file.h>
#include <linux/fcntl.h>
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-2.6.17.7/fs/namespace.c linux-2.6.17.7-vs2.1.1-rc27/fs/namespace.c
+diff -NurpP --minimal linux-2.6.17.7/fs/namespace.c linux-2.6.17.7-vs2.1.1-rc28/fs/namespace.c
--- linux-2.6.17.7/fs/namespace.c 2006-06-18 04:54:37 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/namespace.c 2006-07-27 19:03:51 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/namespace.c 2006-08-05 04:01:24 +0200
@@ -23,6 +23,8 @@
#include <linux/namei.h>
#include <linux/security.h>
if (mnt->mnt_sb->s_op->show_options)
err = mnt->mnt_sb->s_op->show_options(m, mnt);
seq_puts(m, " 0 0\n");
-@@ -597,7 +642,7 @@ static int do_umount(struct vfsmount *mn
+@@ -404,17 +449,27 @@ static int show_vfsstat(struct seq_file
+ struct vfsmount *mnt = v;
+ int err = 0;
+
+- /* device */
+- if (mnt->mnt_devname) {
+- seq_puts(m, "device ");
+- mangle(m, mnt->mnt_devname);
+- } else
+- seq_puts(m, "no device");
++ if (vx_flags(VXF_HIDE_MOUNT, 0))
++ return 0;
++ if (!mnt_is_reachable(mnt) && !vx_check(0, VX_WATCH))
++ return 0;
+
+- /* mount point */
+- seq_puts(m, " mounted on ");
+- seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
+- seq_putc(m, ' ');
++ if (!vx_check(0, VX_ADMIN|VX_WATCH) &&
++ mnt == current->fs->rootmnt) {
++ seq_puts(m, "device /dev/root mounted on / ");
++ } else {
++ /* device */
++ if (mnt->mnt_devname) {
++ seq_puts(m, "device ");
++ mangle(m, mnt->mnt_devname);
++ } else
++ seq_puts(m, "no device");
++
++ /* mount point */
++ seq_puts(m, " mounted on ");
++ seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
++ seq_putc(m, ' ');
++ }
+
+ /* file system type */
+ seq_puts(m, "with fstype ");
+@@ -597,7 +652,7 @@ static int do_umount(struct vfsmount *mn
down_write(&sb->s_umount);
if (!(sb->s_flags & MS_RDONLY)) {
lock_kernel();
retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
unlock_kernel();
}
-@@ -646,7 +691,7 @@ asmlinkage long sys_umount(char __user *
+@@ -646,7 +701,7 @@ asmlinkage long sys_umount(char __user *
goto dput_and_out;
retval = -EPERM;
goto dput_and_out;
retval = do_umount(nd.mnt, flags);
-@@ -670,7 +715,7 @@ asmlinkage long sys_oldumount(char __use
+@@ -670,7 +725,7 @@ asmlinkage long sys_oldumount(char __use
static int mount_is_safe(struct nameidata *nd)
{
return 0;
return -EPERM;
#ifdef notyet
-@@ -899,11 +944,13 @@ static int do_change_type(struct nameida
+@@ -899,11 +954,13 @@ static int do_change_type(struct nameida
/*
* do loopback mount.
*/
if (err)
return err;
if (!old_name || !*old_name)
-@@ -929,6 +976,12 @@ static int do_loopback(struct nameidata
+@@ -929,6 +986,12 @@ static int do_loopback(struct nameidata
if (!mnt)
goto out;
err = graft_tree(mnt, nd);
if (err) {
LIST_HEAD(umount_list);
-@@ -937,6 +990,7 @@ static int do_loopback(struct nameidata
+@@ -937,6 +1000,7 @@ static int do_loopback(struct nameidata
spin_unlock(&vfsmount_lock);
release_mounts(&umount_list);
}
out:
up_write(&namespace_sem);
-@@ -950,12 +1004,12 @@ out:
+@@ -950,12 +1014,12 @@ out:
* on it - tough luck.
*/
static int do_remount(struct nameidata *nd, int flags, int mnt_flags,
return -EPERM;
if (!check_mnt(nd->mnt))
-@@ -989,7 +1043,7 @@ static int do_move_mount(struct nameidat
+@@ -989,7 +1053,7 @@ static int do_move_mount(struct nameidat
struct nameidata old_nd, parent_nd;
struct vfsmount *p;
int err = 0;
return -EPERM;
if (!old_name || !*old_name)
return -EINVAL;
-@@ -1069,7 +1123,7 @@ static int do_new_mount(struct nameidata
+@@ -1069,7 +1133,7 @@ static int do_new_mount(struct nameidata
return -EINVAL;
/* we need capabilities... */
return -EPERM;
mnt = do_kern_mount(type, flags, name, data);
-@@ -1307,6 +1361,7 @@ long do_mount(char *dev_name, char *dir_
+@@ -1307,6 +1371,7 @@ long do_mount(char *dev_name, char *dir_
struct nameidata nd;
int retval = 0;
int mnt_flags = 0;
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -1322,7 +1377,19 @@ long do_mount(char *dev_name, char *dir_
+@@ -1322,7 +1387,19 @@ long do_mount(char *dev_name, char *dir_
if (data_page)
((char *)data_page)[PAGE_SIZE - 1] = 0;
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
if (flags & MS_NODEV)
-@@ -1334,6 +1401,8 @@ long do_mount(char *dev_name, char *dir_
+@@ -1334,6 +1411,8 @@ long do_mount(char *dev_name, char *dir_
if (flags & MS_NODIRATIME)
mnt_flags |= MNT_NODIRATIME;
flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE |
MS_NOATIME | MS_NODIRATIME);
-@@ -1348,9 +1417,9 @@ long do_mount(char *dev_name, char *dir_
+@@ -1348,9 +1427,9 @@ long do_mount(char *dev_name, char *dir_
if (flags & MS_REMOUNT)
retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&nd, flags);
else if (flags & MS_MOVE)
-@@ -1448,7 +1517,7 @@ int copy_namespace(int flags, struct tas
+@@ -1448,7 +1527,7 @@ int copy_namespace(int flags, struct tas
if (!(flags & CLONE_NEWNS))
return 0;
err = -EPERM;
goto out;
}
-diff -NurpP --minimal linux-2.6.17.7/fs/nfs/dir.c linux-2.6.17.7-vs2.1.1-rc27/fs/nfs/dir.c
+diff -NurpP --minimal linux-2.6.17.7/fs/nfs/dir.c linux-2.6.17.7-vs2.1.1-rc28/fs/nfs/dir.c
--- linux-2.6.17.7/fs/nfs/dir.c 2006-06-18 04:54:38 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/nfs/dir.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/nfs/dir.c 2006-07-09 17:06:49 +0200
@@ -28,9 +28,11 @@
#include <linux/sunrpc/clnt.h>
#include <linux/nfs_fs.h>
return 0;
return 1;
}
-diff -NurpP --minimal linux-2.6.17.7/fs/nfs/inode.c linux-2.6.17.7-vs2.1.1-rc27/fs/nfs/inode.c
+diff -NurpP --minimal linux-2.6.17.7/fs/nfs/inode.c linux-2.6.17.7-vs2.1.1-rc28/fs/nfs/inode.c
--- linux-2.6.17.7/fs/nfs/inode.c 2006-06-18 04:54:41 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/nfs/inode.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/nfs/inode.c 2006-07-09 17:06:49 +0200
@@ -36,6 +36,7 @@
#include <linux/mount.h>
#include <linux/nfs_idmap.h>
if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
/*
-diff -NurpP --minimal linux-2.6.17.7/fs/nfs/nfs3xdr.c linux-2.6.17.7-vs2.1.1-rc27/fs/nfs/nfs3xdr.c
+diff -NurpP --minimal linux-2.6.17.7/fs/nfs/nfs3xdr.c linux-2.6.17.7-vs2.1.1-rc28/fs/nfs/nfs3xdr.c
--- linux-2.6.17.7/fs/nfs/nfs3xdr.c 2006-06-18 04:54:41 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/nfs/nfs3xdr.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/nfs/nfs3xdr.c 2006-07-09 17:06:49 +0200
@@ -22,6 +22,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
if (args->type == NF3CHR || args->type == NF3BLK) {
*p++ = htonl(MAJOR(args->rdev));
*p++ = htonl(MINOR(args->rdev));
-diff -NurpP --minimal linux-2.6.17.7/fs/nfs/nfsroot.c linux-2.6.17.7-vs2.1.1-rc27/fs/nfs/nfsroot.c
+diff -NurpP --minimal linux-2.6.17.7/fs/nfs/nfsroot.c linux-2.6.17.7-vs2.1.1-rc28/fs/nfs/nfsroot.c
--- linux-2.6.17.7/fs/nfs/nfsroot.c 2006-02-18 14:40:23 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/nfs/nfsroot.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/nfs/nfsroot.c 2006-07-09 17:06:49 +0200
@@ -87,6 +87,7 @@
#include <linux/root_dev.h>
#include <net/ipconfig.h>
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.17.7/fs/nfsd/auth.c linux-2.6.17.7-vs2.1.1-rc27/fs/nfsd/auth.c
+diff -NurpP --minimal linux-2.6.17.7/fs/nfsd/auth.c linux-2.6.17.7-vs2.1.1-rc28/fs/nfsd/auth.c
--- linux-2.6.17.7/fs/nfsd/auth.c 2006-06-18 04:54:42 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/nfsd/auth.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/nfsd/auth.c 2006-07-09 17:06:49 +0200
@@ -9,6 +9,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/sunrpc/svcauth.h>
cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
} else {
cap_t(current->cap_effective) |= (CAP_NFSD_MASK &
-diff -NurpP --minimal linux-2.6.17.7/fs/nfsd/nfs3xdr.c linux-2.6.17.7-vs2.1.1-rc27/fs/nfsd/nfs3xdr.c
+diff -NurpP --minimal linux-2.6.17.7/fs/nfsd/nfs3xdr.c linux-2.6.17.7-vs2.1.1-rc28/fs/nfsd/nfs3xdr.c
--- linux-2.6.17.7/fs/nfsd/nfs3xdr.c 2006-04-09 13:49:54 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/nfsd/nfs3xdr.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/nfsd/nfs3xdr.c 2006-07-09 17:06:49 +0200
@@ -21,6 +21,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/nfsd/nfsd.h>
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-2.6.17.7/fs/nfsd/nfs4recover.c linux-2.6.17.7-vs2.1.1-rc27/fs/nfsd/nfs4recover.c
+diff -NurpP --minimal linux-2.6.17.7/fs/nfsd/nfs4recover.c linux-2.6.17.7-vs2.1.1-rc28/fs/nfsd/nfs4recover.c
--- linux-2.6.17.7/fs/nfsd/nfs4recover.c 2006-02-18 14:40:23 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/nfsd/nfs4recover.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/nfsd/nfs4recover.c 2006-07-09 17:06:49 +0200
@@ -155,7 +155,7 @@ nfsd4_create_clid_dir(struct nfs4_client
dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n");
goto out_put;
mutex_unlock(&dir->d_inode->i_mutex);
return status;
}
-diff -NurpP --minimal linux-2.6.17.7/fs/nfsd/nfs4xdr.c linux-2.6.17.7-vs2.1.1-rc27/fs/nfsd/nfs4xdr.c
+diff -NurpP --minimal linux-2.6.17.7/fs/nfsd/nfs4xdr.c linux-2.6.17.7-vs2.1.1-rc28/fs/nfsd/nfs4xdr.c
--- linux-2.6.17.7/fs/nfsd/nfs4xdr.c 2006-06-18 04:54:42 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/nfsd/nfs4xdr.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/nfsd/nfs4xdr.c 2006-07-09 17:06:49 +0200
@@ -57,6 +57,7 @@
#include <linux/nfsd_idmap.h>
#include <linux/nfs4.h>
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-2.6.17.7/fs/nfsd/nfsxdr.c linux-2.6.17.7-vs2.1.1-rc27/fs/nfsd/nfsxdr.c
+diff -NurpP --minimal linux-2.6.17.7/fs/nfsd/nfsxdr.c linux-2.6.17.7-vs2.1.1-rc28/fs/nfsd/nfsxdr.c
--- linux-2.6.17.7/fs/nfsd/nfsxdr.c 2006-04-09 13:49:54 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/nfsd/nfsxdr.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/nfsd/nfsxdr.c 2006-07-09 17:06:49 +0200
@@ -15,6 +15,7 @@
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/xdr.h>
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-2.6.17.7/fs/nfsd/vfs.c linux-2.6.17.7-vs2.1.1-rc27/fs/nfsd/vfs.c
+diff -NurpP --minimal linux-2.6.17.7/fs/nfsd/vfs.c linux-2.6.17.7-vs2.1.1-rc28/fs/nfsd/vfs.c
--- linux-2.6.17.7/fs/nfsd/vfs.c 2006-06-18 04:54:42 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/nfsd/vfs.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/nfsd/vfs.c 2006-07-09 17:06:49 +0200
@@ -1156,13 +1156,13 @@ nfsd_create(struct svc_rqst *rqstp, stru
err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
break;
return nfserr_rofs;
if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode))
return nfserr_perm;
-diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/Makefile linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/Makefile
+diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/Makefile linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/Makefile
--- linux-2.6.17.7/fs/ocfs2/Makefile 2006-01-18 06:08:34 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/Makefile 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/Makefile 2006-07-09 17:06:49 +0200
@@ -16,6 +16,7 @@ ocfs2-objs := \
file.o \
heartbeat.o \
journal.o \
localalloc.o \
mmap.o \
-diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/dlm/dlmfs.c linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/dlm/dlmfs.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/dlm/dlmfs.c linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/dlm/dlmfs.c
--- linux-2.6.17.7/fs/ocfs2/dlm/dlmfs.c 2006-06-18 04:54:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/dlm/dlmfs.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/dlm/dlmfs.c 2006-07-09 17:06:49 +0200
@@ -44,6 +44,7 @@
#include <linux/string.h>
#include <linux/smp_lock.h>
inode->i_blksize = PAGE_CACHE_SIZE;
inode->i_blocks = 0;
inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
-diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/dlmglue.c linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/dlmglue.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/dlmglue.c linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/dlmglue.c
--- linux-2.6.17.7/fs/ocfs2/dlmglue.c 2006-06-18 04:54:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/dlmglue.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/dlmglue.c 2006-07-09 17:06:49 +0200
@@ -1320,8 +1320,10 @@ static void __ocfs2_stuff_meta_lvb(struc
lvb->lvb_version = cpu_to_be32(OCFS2_LVB_VERSION);
lvb->lvb_isize = cpu_to_be64(i_size_read(inode));
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
inode->i_nlink = be16_to_cpu(lvb->lvb_inlink);
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/dlmglue.h linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/dlmglue.h
+diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/dlmglue.h linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/dlmglue.h
--- linux-2.6.17.7/fs/ocfs2/dlmglue.h 2006-01-18 06:08:34 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/dlmglue.h 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/dlmglue.h 2006-07-09 17:06:49 +0200
@@ -27,7 +27,7 @@
#ifndef DLMGLUE_H
#define DLMGLUE_H
};
/* ocfs2_meta_lock_full() and ocfs2_data_lock_full() 'arg_flags' flags */
-diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/file.c linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/file.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/file.c linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/file.c
--- linux-2.6.17.7/fs/ocfs2/file.c 2006-06-18 04:54:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/file.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/file.c 2006-07-09 17:06:49 +0200
@@ -44,6 +44,7 @@
#include "file.h"
#include "sysfile.h"
.fsync = ocfs2_sync_file,
+ .ioctl = ocfs2_ioctl,
};
-diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/inode.c linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/inode.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/inode.c linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/inode.c
--- linux-2.6.17.7/fs/ocfs2/inode.c 2006-06-18 04:54:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/inode.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/inode.c 2006-07-09 17:06:49 +0200
@@ -29,6 +29,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
inode->i_mode = le16_to_cpu(fe->i_mode);
inode->i_blksize = (u32) osb->s_clustersize;
if (S_ISLNK(inode->i_mode) && le32_to_cpu(fe->i_clusters) == 0)
-diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/inode.h linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/inode.h
+diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/inode.h linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/inode.h
--- linux-2.6.17.7/fs/ocfs2/inode.h 2006-04-09 13:49:54 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/inode.h 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/inode.h 2006-07-09 17:06:49 +0200
@@ -142,4 +142,7 @@ int ocfs2_mark_inode_dirty(struct ocfs2_
int ocfs2_aio_read(struct file *file, struct kiocb *req, struct iocb *iocb);
int ocfs2_aio_write(struct file *file, struct kiocb *req, struct iocb *iocb);
+int ocfs2_sync_flags(struct inode *inode);
+
#endif /* OCFS2_INODE_H */
-diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/ioctl.c linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/ioctl.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/ioctl.c linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/ioctl.c
--- linux-2.6.17.7/fs/ocfs2/ioctl.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/ioctl.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/ioctl.c 2006-07-09 17:06:49 +0200
@@ -0,0 +1,166 @@
+/*
+ * linux/fs/ocfs2/ioctl.c
+ }
+}
+
-diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/ioctl.h linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/ioctl.h
+diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/ioctl.h linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/ioctl.h
--- linux-2.6.17.7/fs/ocfs2/ioctl.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/ioctl.h 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/ioctl.h 2006-07-09 17:06:49 +0200
@@ -0,0 +1,17 @@
+/*
+ * ioctl.h
+ unsigned int cmd, unsigned long arg);
+
+#endif /* OCFS2_IOCTL_H */
-diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/namei.c linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/namei.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/namei.c linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/namei.c
--- linux-2.6.17.7/fs/ocfs2/namei.c 2006-06-18 04:54:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/namei.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/namei.c 2006-07-09 17:06:49 +0200
@@ -40,6 +40,7 @@
#include <linux/types.h>
#include <linux/slab.h>
.getattr = ocfs2_getattr,
+ .sync_flags = ocfs2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/ocfs2.h linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/ocfs2.h
+diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/ocfs2.h linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/ocfs2.h
--- linux-2.6.17.7/fs/ocfs2/ocfs2.h 2006-06-18 04:54:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/ocfs2.h 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/ocfs2.h 2006-07-09 17:06:49 +0200
@@ -174,6 +174,7 @@ enum ocfs2_mount_options
OCFS2_MOUNT_NOINTR = 1 << 2, /* Don't catch signals */
OCFS2_MOUNT_ERRORS_PANIC = 1 << 3, /* Panic on errors */
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/ocfs2_fs.h linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/ocfs2_fs.h
+diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/ocfs2_fs.h linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/ocfs2_fs.h
--- linux-2.6.17.7/fs/ocfs2/ocfs2_fs.h 2006-04-09 13:49:54 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/ocfs2_fs.h 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/ocfs2_fs.h 2006-07-09 17:06:49 +0200
@@ -114,6 +114,30 @@
#define OCFS2_CHAIN_FL (0x00000400) /* Chain allocator */
#define OCFS2_DEALLOC_FL (0x00000800) /* Truncate log */
/*
* Journal Flags (ocfs2_dinode.id1.journal1.i_flags)
*/
-diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/super.c linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/super.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ocfs2/super.c linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/super.c
--- linux-2.6.17.7/fs/ocfs2/super.c 2006-06-18 04:54:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ocfs2/super.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ocfs2/super.c 2006-07-09 17:06:49 +0200
@@ -148,6 +148,7 @@ enum {
Opt_hb_local,
Opt_data_ordered,
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-2.6.17.7/fs/open.c linux-2.6.17.7-vs2.1.1-rc27/fs/open.c
+diff -NurpP --minimal linux-2.6.17.7/fs/open.c linux-2.6.17.7-vs2.1.1-rc28/fs/open.c
--- linux-2.6.17.7/fs/open.c 2006-06-18 04:54:44 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/open.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/open.c 2006-07-09 17:06:49 +0200
@@ -28,6 +28,9 @@
#include <linux/syscalls.h>
#include <linux/rcupdate.h>
}
void fastcall put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-2.6.17.7/fs/proc/array.c linux-2.6.17.7-vs2.1.1-rc27/fs/proc/array.c
+diff -NurpP --minimal linux-2.6.17.7/fs/proc/array.c linux-2.6.17.7-vs2.1.1-rc28/fs/proc/array.c
--- linux-2.6.17.7/fs/proc/array.c 2006-06-18 04:54:45 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/proc/array.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/proc/array.c 2006-07-09 17:06:49 +0200
@@ -75,6 +75,9 @@
#include <linux/times.h>
#include <linux/cpuset.h>
tcomm,
state,
ppid,
-diff -NurpP --minimal linux-2.6.17.7/fs/proc/base.c linux-2.6.17.7-vs2.1.1-rc27/fs/proc/base.c
+diff -NurpP --minimal linux-2.6.17.7/fs/proc/base.c linux-2.6.17.7-vs2.1.1-rc28/fs/proc/base.c
--- linux-2.6.17.7/fs/proc/base.c 2006-07-27 19:19:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/proc/base.c 2006-07-26 21:36:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/proc/base.c 2006-07-26 21:36:47 +0200
@@ -72,6 +72,8 @@
#include <linux/cpuset.h>
#include <linux/audit.h>
goto out;
retval = 0;
-diff -NurpP --minimal linux-2.6.17.7/fs/proc/generic.c linux-2.6.17.7-vs2.1.1-rc27/fs/proc/generic.c
+diff -NurpP --minimal linux-2.6.17.7/fs/proc/generic.c linux-2.6.17.7-vs2.1.1-rc28/fs/proc/generic.c
--- linux-2.6.17.7/fs/proc/generic.c 2006-06-18 04:54:45 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/proc/generic.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/proc/generic.c 2006-07-09 17:06:49 +0200
@@ -20,6 +20,7 @@
#include <linux/namei.h>
#include <linux/bitops.h>
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-2.6.17.7/fs/proc/inode.c linux-2.6.17.7-vs2.1.1-rc27/fs/proc/inode.c
+diff -NurpP --minimal linux-2.6.17.7/fs/proc/inode.c linux-2.6.17.7-vs2.1.1-rc28/fs/proc/inode.c
--- linux-2.6.17.7/fs/proc/inode.c 2006-06-18 04:54:46 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/proc/inode.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/proc/inode.c 2006-07-09 17:06:49 +0200
@@ -171,6 +171,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-2.6.17.7/fs/proc/proc_misc.c linux-2.6.17.7-vs2.1.1-rc27/fs/proc/proc_misc.c
+diff -NurpP --minimal linux-2.6.17.7/fs/proc/proc_misc.c linux-2.6.17.7-vs2.1.1-rc28/fs/proc/proc_misc.c
--- linux-2.6.17.7/fs/proc/proc_misc.c 2006-06-18 04:54:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/proc/proc_misc.c 2006-07-09 17:06:49 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/proc/proc_misc.c 2006-07-09 17:06:49 +0200
@@ -53,6 +53,8 @@
#include <asm/div64.h>
#include "internal.h"
return proc_calc_metrics(page, start, off, count, eof, len);
}
-diff -NurpP --minimal linux-2.6.17.7/fs/proc/root.c linux-2.6.17.7-vs2.1.1-rc27/fs/proc/root.c
+diff -NurpP --minimal linux-2.6.17.7/fs/proc/root.c linux-2.6.17.7-vs2.1.1-rc28/fs/proc/root.c
--- linux-2.6.17.7/fs/proc/root.c 2006-04-09 13:49:54 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/proc/root.c 2006-07-09 17:06:50 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/proc/root.c 2006-07-09 17:06:50 +0200
@@ -25,6 +25,9 @@ struct proc_dir_entry *proc_net, *proc_n
#ifdef CONFIG_SYSCTL
struct proc_dir_entry *proc_sys_root;
}
static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
-diff -NurpP --minimal linux-2.6.17.7/fs/quota.c linux-2.6.17.7-vs2.1.1-rc27/fs/quota.c
+diff -NurpP --minimal linux-2.6.17.7/fs/quota.c linux-2.6.17.7-vs2.1.1-rc28/fs/quota.c
--- linux-2.6.17.7/fs/quota.c 2006-06-18 04:54:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/quota.c 2006-07-09 17:06:50 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/quota.c 2006-07-09 17:06:50 +0200
@@ -17,47 +17,50 @@
#include <linux/buffer_head.h>
#include <linux/capability.h>
if (sb)
drop_super(sb);
-diff -NurpP --minimal linux-2.6.17.7/fs/quota_v1.c linux-2.6.17.7-vs2.1.1-rc27/fs/quota_v1.c
+diff -NurpP --minimal linux-2.6.17.7/fs/quota_v1.c linux-2.6.17.7-vs2.1.1-rc28/fs/quota_v1.c
--- linux-2.6.17.7/fs/quota_v1.c 2005-03-02 12:38:45 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/quota_v1.c 2006-07-09 17:06:50 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/quota_v1.c 2006-07-09 17:06:50 +0200
@@ -42,12 +42,13 @@ static int v1_read_dqblk(struct dquot *d
int type = dquot->dq_type;
struct v1_disk_dqblk dqblk;
sizeof(struct v1_disk_dqblk), v1_dqoff(0));
if (ret == sizeof(struct v1_disk_dqblk))
ret = 0;
-diff -NurpP --minimal linux-2.6.17.7/fs/quota_v2.c linux-2.6.17.7-vs2.1.1-rc27/fs/quota_v2.c
+diff -NurpP --minimal linux-2.6.17.7/fs/quota_v2.c linux-2.6.17.7-vs2.1.1-rc28/fs/quota_v2.c
--- linux-2.6.17.7/fs/quota_v2.c 2006-06-18 04:54:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/quota_v2.c 2006-07-09 17:06:50 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/quota_v2.c 2006-07-09 17:06:50 +0200
@@ -26,14 +26,15 @@ typedef char *dqbuf_t;
#define GETENTRIES(buf) ((struct v2_disk_dqblk *)(((char *)buf)+sizeof(struct v2_disk_dqdbheader)))
(char *)&ddquot, sizeof(struct v2_disk_dqblk), offset))
!= sizeof(struct v2_disk_dqblk)) {
if (ret >= 0)
-diff -NurpP --minimal linux-2.6.17.7/fs/read_write.c linux-2.6.17.7-vs2.1.1-rc27/fs/read_write.c
+diff -NurpP --minimal linux-2.6.17.7/fs/read_write.c linux-2.6.17.7-vs2.1.1-rc28/fs/read_write.c
--- linux-2.6.17.7/fs/read_write.c 2006-06-18 04:54:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/read_write.c 2006-07-09 17:06:50 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/read_write.c 2006-07-09 17:06:50 +0200
@@ -636,12 +636,77 @@ sys_writev(unsigned long fd, const struc
return ret;
}
fput_out:
fput_light(out_file, fput_needed_out);
fput_in:
-diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/bitmap.c linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/bitmap.c
+diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/bitmap.c linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/bitmap.c
--- linux-2.6.17.7/fs/reiserfs/bitmap.c 2005-08-29 22:25:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/bitmap.c 2006-07-09 17:06:50 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/bitmap.c 2006-07-09 17:06:50 +0200
@@ -13,6 +13,7 @@
#include <linux/reiserfs_fs_sb.h>
#include <linux/reiserfs_fs_i.h>
}
return CARRY_ON;
-diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/file.c linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/file.c
+diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/file.c linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/file.c
--- linux-2.6.17.7/fs/reiserfs/file.c 2006-06-18 04:54:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/file.c 2006-07-09 17:06:50 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/file.c 2006-07-09 17:06:50 +0200
@@ -1574,6 +1574,7 @@ const struct file_operations reiserfs_fi
.release = reiserfs_file_release,
.fsync = reiserfs_sync_file,
.permission = reiserfs_permission,
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/inode.c linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/inode.c
+diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/inode.c linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/inode.c
--- linux-2.6.17.7/fs/reiserfs/inode.c 2006-06-18 04:54:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/inode.c 2006-07-09 17:06:50 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/inode.c 2006-07-09 17:06:50 +0200
@@ -17,6 +17,8 @@
#include <linux/mpage.h>
#include <linux/writeback.h>
mark_inode_dirty(inode);
error =
journal_end(&th, inode->i_sb, jbegin_count);
-diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/ioctl.c linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/ioctl.c
+diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/ioctl.c linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/ioctl.c
--- linux-2.6.17.7/fs/reiserfs/ioctl.c 2006-04-09 13:49:55 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/ioctl.c 2006-07-09 17:06:50 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/ioctl.c 2006-07-09 17:06:50 +0200
@@ -4,6 +4,7 @@
#include <linux/capability.h>
return -EROFS;
if (get_user(inode->i_generation, (int __user *)arg))
return -EFAULT;
-diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/namei.c linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/namei.c
+diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/namei.c linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/namei.c
--- linux-2.6.17.7/fs/reiserfs/namei.c 2006-04-09 13:49:55 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/namei.c 2006-07-09 17:06:50 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/namei.c 2006-07-09 17:06:50 +0200
@@ -19,6 +19,7 @@
#include <linux/reiserfs_xattr.h>
#include <linux/smp_lock.h>
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/stree.c linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/stree.c
+diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/stree.c linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/stree.c
--- linux-2.6.17.7/fs/reiserfs/stree.c 2006-06-18 04:54:48 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/stree.c 2006-07-09 17:06:50 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/stree.c 2006-07-09 17:06:50 +0200
@@ -57,6 +57,7 @@
#include <linux/smp_lock.h>
#include <linux/buffer_head.h>
+ }
return retval;
}
-diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/super.c linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/super.c
+diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/super.c linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/super.c
--- linux-2.6.17.7/fs/reiserfs/super.c 2006-06-18 04:54:48 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/super.c 2006-07-09 17:06:50 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/super.c 2006-07-09 17:06:50 +0200
@@ -138,7 +138,7 @@ static int remove_save_link_only(struct
}
unsigned long blk = off >> sb->s_blocksize_bits;
int err = 0, offset = off & (sb->s_blocksize - 1), tocopy;
int journal_quota = REISERFS_SB(sb)->s_qf_names[type] != NULL;
-diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/xattr.c linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/xattr.c
+diff -NurpP --minimal linux-2.6.17.7/fs/reiserfs/xattr.c linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/xattr.c
--- linux-2.6.17.7/fs/reiserfs/xattr.c 2006-02-18 14:40:26 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/reiserfs/xattr.c 2006-07-09 17:06:51 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/reiserfs/xattr.c 2006-07-09 17:06:51 +0200
@@ -35,6 +35,7 @@
#include <linux/namei.h>
#include <linux/errno.h>
reiserfs_write_unlock_xattrs(inode->i_sb);
dput(root);
} else {
-diff -NurpP --minimal linux-2.6.17.7/fs/stat.c linux-2.6.17.7-vs2.1.1-rc27/fs/stat.c
+diff -NurpP --minimal linux-2.6.17.7/fs/stat.c linux-2.6.17.7-vs2.1.1-rc28/fs/stat.c
--- linux-2.6.17.7/fs/stat.c 2006-06-18 04:54:48 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/stat.c 2006-07-09 17:06:57 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/stat.c 2006-07-09 17:06:57 +0200
@@ -27,6 +27,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
stat->rdev = inode->i_rdev;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-2.6.17.7/fs/super.c linux-2.6.17.7-vs2.1.1-rc27/fs/super.c
+diff -NurpP --minimal linux-2.6.17.7/fs/super.c linux-2.6.17.7-vs2.1.1-rc28/fs/super.c
--- linux-2.6.17.7/fs/super.c 2006-06-18 04:54:48 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/super.c 2006-07-09 17:07:04 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/super.c 2006-07-09 17:07:04 +0200
@@ -38,6 +38,8 @@
#include <linux/idr.h>
#include <linux/kobject.h>
error = security_sb_kern_mount(sb, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-2.6.17.7/fs/sysfs/mount.c linux-2.6.17.7-vs2.1.1-rc27/fs/sysfs/mount.c
+diff -NurpP --minimal linux-2.6.17.7/fs/sysfs/mount.c linux-2.6.17.7-vs2.1.1-rc28/fs/sysfs/mount.c
--- linux-2.6.17.7/fs/sysfs/mount.c 2005-08-29 22:25:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/sysfs/mount.c 2006-07-09 17:07:08 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/sysfs/mount.c 2006-07-09 17:07:08 +0200
@@ -11,8 +11,6 @@
#include "sysfs.h"
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
sysfs_sb = sb;
-diff -NurpP --minimal linux-2.6.17.7/fs/udf/super.c linux-2.6.17.7-vs2.1.1-rc27/fs/udf/super.c
+diff -NurpP --minimal linux-2.6.17.7/fs/udf/super.c linux-2.6.17.7-vs2.1.1-rc28/fs/udf/super.c
--- linux-2.6.17.7/fs/udf/super.c 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/udf/super.c 2006-07-09 17:07:12 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/udf/super.c 2006-07-09 17:07:12 +0200
@@ -1571,7 +1571,7 @@ static int udf_fill_super(struct super_b
/* Fill in the rest of the superblock */
sb->s_dirt = 0;
sb->s_magic = UDF_SUPER_MAGIC;
sb->s_time_gran = 1000;
-diff -NurpP --minimal linux-2.6.17.7/fs/ufs/super.c linux-2.6.17.7-vs2.1.1-rc27/fs/ufs/super.c
+diff -NurpP --minimal linux-2.6.17.7/fs/ufs/super.c linux-2.6.17.7-vs2.1.1-rc28/fs/ufs/super.c
--- linux-2.6.17.7/fs/ufs/super.c 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/ufs/super.c 2006-07-09 17:07:12 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/ufs/super.c 2006-07-09 17:07:12 +0200
@@ -873,7 +873,7 @@ magic_found:
* Read ufs_super_block into internal data structures
*/
sector_t blk = off >> sb->s_blocksize_bits;
int err = 0;
int offset = off & (sb->s_blocksize - 1);
-diff -NurpP --minimal linux-2.6.17.7/fs/xattr.c linux-2.6.17.7-vs2.1.1-rc27/fs/xattr.c
+diff -NurpP --minimal linux-2.6.17.7/fs/xattr.c linux-2.6.17.7-vs2.1.1-rc28/fs/xattr.c
--- linux-2.6.17.7/fs/xattr.c 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xattr.c 2006-07-09 17:07:12 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xattr.c 2006-07-09 17:07:12 +0200
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
fput(f);
return error;
}
-diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_file.c linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_file.c
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_file.c linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_file.c
--- linux-2.6.17.7/fs/xfs/linux-2.6/xfs_file.c 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_file.c 2006-07-09 17:07:12 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_file.c 2006-07-09 17:07:12 +0200
@@ -584,6 +584,7 @@ const struct file_operations xfs_file_op
.aio_read = xfs_file_aio_read,
.aio_write = xfs_file_aio_write,
.splice_read = xfs_file_splice_read_invis,
.splice_write = xfs_file_splice_write_invis,
.unlocked_ioctl = xfs_file_ioctl_invis,
-diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_ioctl.c
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_ioctl.c
--- linux-2.6.17.7/fs/xfs/linux-2.6/xfs_ioctl.c 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_ioctl.c 2006-07-09 17:07:12 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_ioctl.c 2006-07-09 17:07:12 +0200
@@ -1100,6 +1100,8 @@ xfs_ioc_fsgeometry(
#define LINUX_XFLAG_APPEND 0x00000020 /* writes to file may only append */
#define LINUX_XFLAG_NODUMP 0x00000040 /* do not dump file */
if (di_flags & XFS_DIFLAG_APPEND)
flags |= LINUX_XFLAG_APPEND;
if (di_flags & XFS_DIFLAG_SYNC)
-diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_iops.c
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_iops.c
--- linux-2.6.17.7/fs/xfs/linux-2.6/xfs_iops.c 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_iops.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_iops.c 2006-07-09 17:07:13 +0200
@@ -55,6 +55,7 @@
#include <linux/xattr.h>
#include <linux/namei.h>
.removexattr = xfs_vn_removexattr,
+ .sync_flags = xfs_vn_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_linux.h
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_linux.h
--- linux-2.6.17.7/fs/xfs/linux-2.6/xfs_linux.h 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_linux.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_linux.h 2006-07-09 17:07:13 +0200
@@ -142,6 +142,7 @@ BUFFER_FNS(PrivateStart, unwritten);
#define current_pid() (current->pid)
#define current_fsuid(cred) (current->fsuid)
#define NBPP PAGE_SIZE
#define DPPSHFT (PAGE_SHIFT - 9)
-diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_super.c linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_super.c
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_super.c linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_super.c
--- linux-2.6.17.7/fs/xfs/linux-2.6/xfs_super.c 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_super.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_super.c 2006-07-09 17:07:13 +0200
@@ -160,6 +160,7 @@ xfs_revalidate_inode(
inode->i_nlink = ip->i_d.di_nlink;
inode->i_uid = ip->i_d.di_uid;
sb->s_op = &xfs_super_operations;
VFS_MOUNT(vfsp, args, NULL, error);
-diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_sysctl.c linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_sysctl.c
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_sysctl.c linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_sysctl.c
--- linux-2.6.17.7/fs/xfs/linux-2.6/xfs_sysctl.c 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_sysctl.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_sysctl.c 2006-07-09 17:07:13 +0200
@@ -57,74 +57,74 @@ xfs_stats_clear_proc_handler(
STATIC ctl_table xfs_table[] = {
{XFS_RESTRICT_CHOWN, "restrict_chown", &xfs_params.restrict_chown.val,
&xfs_params.stats_clear.min, &xfs_params.stats_clear.max},
#endif /* CONFIG_PROC_FS */
-diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_vnode.c linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_vnode.c
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_vnode.c linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_vnode.c
--- linux-2.6.17.7/fs/xfs/linux-2.6/xfs_vnode.c 2006-06-18 04:54:50 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_vnode.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_vnode.c 2006-07-09 17:07:13 +0200
@@ -103,6 +103,7 @@ vn_revalidate_core(
inode->i_nlink = vap->va_nlink;
inode->i_uid = vap->va_uid;
if (vap->va_xflags & XFS_XFLAG_APPEND)
inode->i_flags |= S_APPEND;
else
-diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_vnode.h linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_vnode.h
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/linux-2.6/xfs_vnode.h linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_vnode.h
--- linux-2.6.17.7/fs/xfs/linux-2.6/xfs_vnode.h 2006-06-18 04:54:50 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/linux-2.6/xfs_vnode.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/linux-2.6/xfs_vnode.h 2006-07-09 17:07:13 +0200
@@ -404,6 +404,7 @@ typedef struct vattr {
xfs_nlink_t va_nlink; /* number of references to file */
uid_t va_uid; /* owner user id */
#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.17.7/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/quota/xfs_qm_syscalls.c
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/quota/xfs_qm_syscalls.c
--- linux-2.6.17.7/fs/xfs/quota/xfs_qm_syscalls.c 2006-06-18 04:54:50 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/quota/xfs_qm_syscalls.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/quota/xfs_qm_syscalls.c 2006-07-09 17:07:13 +0200
@@ -215,7 +215,7 @@ xfs_qm_scall_quotaoff(
xfs_qoff_logitem_t *qoffstart;
int nculprits;
return XFS_ERROR(EPERM);
if ((newlim->d_fieldmask &
-diff -NurpP --minimal linux-2.6.17.7/fs/xfs/xfs_clnt.h linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_clnt.h
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/xfs_clnt.h linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_clnt.h
--- linux-2.6.17.7/fs/xfs/xfs_clnt.h 2006-06-18 04:54:50 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_clnt.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_clnt.h 2006-07-09 17:07:13 +0200
@@ -99,5 +99,7 @@ struct xfs_mount_args {
*/
#define XFSMNT2_COMPAT_IOSIZE 0x00000001 /* don't report large preferred
+
#endif /* __XFS_CLNT_H__ */
-diff -NurpP --minimal linux-2.6.17.7/fs/xfs/xfs_dinode.h linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_dinode.h
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/xfs_dinode.h linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_dinode.h
--- linux-2.6.17.7/fs/xfs/xfs_dinode.h 2006-04-09 13:49:55 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_dinode.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_dinode.h 2006-07-09 17:07:13 +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 */
+ XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_BARRIER | XFS_DIFLAG_IUNLINK)
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-2.6.17.7/fs/xfs/xfs_fs.h linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_fs.h
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/xfs_fs.h linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_fs.h
--- linux-2.6.17.7/fs/xfs/xfs_fs.h 2006-04-09 13:49:55 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_fs.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_fs.h 2006-07-09 17:07:13 +0200
@@ -67,6 +67,8 @@ struct fsxattr {
#define XFS_XFLAG_NOSYMLINKS 0x00000400 /* disallow symlink creation */
#define XFS_XFLAG_EXTSIZE 0x00000800 /* extent size allocator hint */
__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.17.7/fs/xfs/xfs_inode.c linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_inode.c
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/xfs_inode.c linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_inode.c
--- linux-2.6.17.7/fs/xfs/xfs_inode.c 2006-06-18 04:54:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_inode.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_inode.c 2006-07-09 17:07:13 +0200
@@ -52,6 +52,7 @@
#include "xfs_mac.h"
#include "xfs_acl.h"
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.17.7/fs/xfs/xfs_itable.c linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_itable.c
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/xfs_itable.c linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_itable.c
--- linux-2.6.17.7/fs/xfs/xfs_itable.c 2006-06-18 04:54:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_itable.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_itable.c 2006-07-09 17:07:13 +0200
@@ -85,6 +85,7 @@ xfs_bulkstat_one_iget(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
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.17.7/fs/xfs/xfs_mount.h linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_mount.h
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/xfs_mount.h linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_mount.h
--- linux-2.6.17.7/fs/xfs/xfs_mount.h 2006-06-18 04:54:53 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_mount.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_mount.h 2006-07-09 17:07:13 +0200
@@ -445,6 +445,7 @@ typedef struct xfs_mount {
#define XFS_MOUNT_NO_PERCPU_SB (1ULL << 23) /* don't use per-cpu superblock
counters */
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-2.6.17.7/fs/xfs/xfs_vfsops.c linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_vfsops.c
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/xfs_vfsops.c linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_vfsops.c
--- linux-2.6.17.7/fs/xfs/xfs_vfsops.c 2006-06-18 04:54:54 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_vfsops.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_vfsops.c 2006-07-09 17:07:13 +0200
@@ -308,6 +308,8 @@ xfs_start_flags(
if (ap->flags2 & XFSMNT2_COMPAT_IOSIZE)
} else if (!strcmp(this_char, "osyncisdsync")) {
/* no-op, this is now the default */
printk("XFS: osyncisdsync is now the default, option is deprecated.\n");
-diff -NurpP --minimal linux-2.6.17.7/fs/xfs/xfs_vnodeops.c linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_vnodeops.c
+diff -NurpP --minimal linux-2.6.17.7/fs/xfs/xfs_vnodeops.c linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_vnodeops.c
--- linux-2.6.17.7/fs/xfs/xfs_vnodeops.c 2006-06-18 04:54:54 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/fs/xfs/xfs_vnodeops.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/fs/xfs/xfs_vnodeops.c 2006-07-09 17:07:13 +0200
@@ -154,6 +154,7 @@ xfs_getattr(
vap->va_mode = ip->i_d.di_mode;
vap->va_uid = ip->i_d.di_uid;
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.17.7/include/asm-arm/tlb.h linux-2.6.17.7-vs2.1.1-rc27/include/asm-arm/tlb.h
+diff -NurpP --minimal linux-2.6.17.7/include/asm-arm/tlb.h linux-2.6.17.7-vs2.1.1-rc28/include/asm-arm/tlb.h
--- linux-2.6.17.7/include/asm-arm/tlb.h 2006-06-18 04:54:58 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/asm-arm/tlb.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/asm-arm/tlb.h 2006-07-09 17:07:13 +0200
@@ -28,6 +28,7 @@
#else /* !CONFIG_MMU */
/*
* TLB handling. This allows us to remove pages from the page
-diff -NurpP --minimal linux-2.6.17.7/include/asm-arm26/tlb.h linux-2.6.17.7-vs2.1.1-rc27/include/asm-arm26/tlb.h
+diff -NurpP --minimal linux-2.6.17.7/include/asm-arm26/tlb.h linux-2.6.17.7-vs2.1.1-rc28/include/asm-arm26/tlb.h
--- linux-2.6.17.7/include/asm-arm26/tlb.h 2006-01-03 17:30:02 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/asm-arm26/tlb.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/asm-arm26/tlb.h 2006-07-09 17:07:13 +0200
@@ -3,6 +3,7 @@
#include <asm/pgalloc.h>
/*
* TLB handling. This allows us to remove pages from the page
-diff -NurpP --minimal linux-2.6.17.7/include/asm-arm26/unistd.h linux-2.6.17.7-vs2.1.1-rc27/include/asm-arm26/unistd.h
+diff -NurpP --minimal linux-2.6.17.7/include/asm-arm26/unistd.h linux-2.6.17.7-vs2.1.1-rc28/include/asm-arm26/unistd.h
--- linux-2.6.17.7/include/asm-arm26/unistd.h 2006-01-03 17:30:02 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/asm-arm26/unistd.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/asm-arm26/unistd.h 2006-07-09 17:07:13 +0200
@@ -304,6 +304,8 @@
#define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279)
#define __NR_waitid (__NR_SYSCALL_BASE+280)
/*
* The following SWIs are ARM private. FIXME - make appropriate for arm26
*/
-diff -NurpP --minimal linux-2.6.17.7/include/asm-generic/tlb.h linux-2.6.17.7-vs2.1.1-rc27/include/asm-generic/tlb.h
+diff -NurpP --minimal linux-2.6.17.7/include/asm-generic/tlb.h linux-2.6.17.7-vs2.1.1-rc28/include/asm-generic/tlb.h
--- linux-2.6.17.7/include/asm-generic/tlb.h 2006-01-03 17:30:02 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/asm-generic/tlb.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/asm-generic/tlb.h 2006-07-09 17:07:13 +0200
@@ -15,6 +15,7 @@
#include <linux/config.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.17.7/include/asm-i386/elf.h linux-2.6.17.7-vs2.1.1-rc27/include/asm-i386/elf.h
+diff -NurpP --minimal linux-2.6.17.7/include/asm-i386/elf.h linux-2.6.17.7-vs2.1.1-rc28/include/asm-i386/elf.h
--- linux-2.6.17.7/include/asm-i386/elf.h 2006-01-03 17:30:04 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/asm-i386/elf.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/asm-i386/elf.h 2006-07-09 17:07:13 +0200
@@ -71,7 +71,7 @@ typedef struct user_fxsr_struct elf_fpxr
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
#ifdef __KERNEL__
#define SET_PERSONALITY(ex, ibcs2) do { } while (0)
-diff -NurpP --minimal linux-2.6.17.7/include/asm-ia64/tlb.h linux-2.6.17.7-vs2.1.1-rc27/include/asm-ia64/tlb.h
+diff -NurpP --minimal linux-2.6.17.7/include/asm-ia64/tlb.h linux-2.6.17.7-vs2.1.1-rc28/include/asm-ia64/tlb.h
--- linux-2.6.17.7/include/asm-ia64/tlb.h 2006-01-03 17:30:05 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/asm-ia64/tlb.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/asm-ia64/tlb.h 2006-07-09 17:07:13 +0200
@@ -41,6 +41,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.17.7/include/asm-powerpc/unistd.h linux-2.6.17.7-vs2.1.1-rc27/include/asm-powerpc/unistd.h
+diff -NurpP --minimal linux-2.6.17.7/include/asm-powerpc/unistd.h linux-2.6.17.7-vs2.1.1-rc28/include/asm-powerpc/unistd.h
--- linux-2.6.17.7/include/asm-powerpc/unistd.h 2006-06-18 04:55:08 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/asm-powerpc/unistd.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/asm-powerpc/unistd.h 2006-07-09 17:07:13 +0200
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
/* 258 currently unused */
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-2.6.17.7/include/asm-s390/unistd.h linux-2.6.17.7-vs2.1.1-rc27/include/asm-s390/unistd.h
+diff -NurpP --minimal linux-2.6.17.7/include/asm-s390/unistd.h linux-2.6.17.7-vs2.1.1-rc28/include/asm-s390/unistd.h
--- linux-2.6.17.7/include/asm-s390/unistd.h 2006-06-18 04:55:09 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/asm-s390/unistd.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/asm-s390/unistd.h 2006-07-09 17:07:13 +0200
@@ -255,7 +255,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
#define __NR_fadvise64_64 264
#define __NR_statfs64 265
#define __NR_fstatfs64 266
-diff -NurpP --minimal linux-2.6.17.7/include/asm-sparc/unistd.h linux-2.6.17.7-vs2.1.1-rc27/include/asm-sparc/unistd.h
+diff -NurpP --minimal linux-2.6.17.7/include/asm-sparc/unistd.h linux-2.6.17.7-vs2.1.1-rc28/include/asm-sparc/unistd.h
--- linux-2.6.17.7/include/asm-sparc/unistd.h 2006-06-18 04:55:10 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/asm-sparc/unistd.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/asm-sparc/unistd.h 2006-07-09 17:07:13 +0200
@@ -283,7 +283,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.17.7/include/asm-sparc64/tlb.h linux-2.6.17.7-vs2.1.1-rc27/include/asm-sparc64/tlb.h
+diff -NurpP --minimal linux-2.6.17.7/include/asm-sparc64/tlb.h linux-2.6.17.7-vs2.1.1-rc28/include/asm-sparc64/tlb.h
--- linux-2.6.17.7/include/asm-sparc64/tlb.h 2006-01-03 17:30:08 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/asm-sparc64/tlb.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/asm-sparc64/tlb.h 2006-07-09 17:07:13 +0200
@@ -3,6 +3,7 @@
#include <linux/config.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
-diff -NurpP --minimal linux-2.6.17.7/include/asm-sparc64/unistd.h linux-2.6.17.7-vs2.1.1-rc27/include/asm-sparc64/unistd.h
+diff -NurpP --minimal linux-2.6.17.7/include/asm-sparc64/unistd.h linux-2.6.17.7-vs2.1.1-rc28/include/asm-sparc64/unistd.h
--- linux-2.6.17.7/include/asm-sparc64/unistd.h 2006-06-18 04:55:11 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/asm-sparc64/unistd.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/asm-sparc64/unistd.h 2006-07-09 17:07:13 +0200
@@ -285,7 +285,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.17.7/include/asm-x86_64/unistd.h linux-2.6.17.7-vs2.1.1-rc27/include/asm-x86_64/unistd.h
+diff -NurpP --minimal linux-2.6.17.7/include/asm-x86_64/unistd.h linux-2.6.17.7-vs2.1.1-rc28/include/asm-x86_64/unistd.h
--- linux-2.6.17.7/include/asm-x86_64/unistd.h 2006-06-18 04:55:15 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/asm-x86_64/unistd.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/asm-x86_64/unistd.h 2006-07-09 17:07:13 +0200
@@ -532,7 +532,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
#define __NR_utimes 235
__SYSCALL(__NR_utimes, sys_utimes)
#define __NR_mbind 237
__SYSCALL(__NR_mbind, sys_mbind)
#define __NR_set_mempolicy 238
-diff -NurpP --minimal linux-2.6.17.7/include/linux/capability.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/capability.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/capability.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/capability.h
--- linux-2.6.17.7/include/linux/capability.h 2006-06-18 04:55:15 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/capability.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/capability.h 2006-07-09 17:07:13 +0200
@@ -235,6 +235,7 @@ typedef __u32 kernel_cap_t;
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
#ifdef __KERNEL__
/*
* Bounding set
-diff -NurpP --minimal linux-2.6.17.7/include/linux/devpts_fs.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/devpts_fs.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/devpts_fs.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/devpts_fs.h
--- linux-2.6.17.7/include/linux/devpts_fs.h 2004-08-14 12:55:59 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/devpts_fs.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/devpts_fs.h 2006-07-09 17:07:13 +0200
@@ -30,5 +30,7 @@ static inline void devpts_pty_kill(int n
#endif
+
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/ext2_fs.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/ext2_fs.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/ext2_fs.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/ext2_fs.h
--- linux-2.6.17.7/include/linux/ext2_fs.h 2005-10-28 20:49:54 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/ext2_fs.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/ext2_fs.h 2006-07-09 17:07:13 +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) */
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-2.6.17.7/include/linux/ext3_fs.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/ext3_fs.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/ext3_fs.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/ext3_fs.h
--- linux-2.6.17.7/include/linux/ext3_fs.h 2006-06-18 04:55:17 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/ext3_fs.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/ext3_fs.h 2006-07-09 17:07:13 +0200
@@ -186,10 +186,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) */
extern void ext3_read_inode (struct inode *);
extern int ext3_write_inode (struct inode *, int);
-diff -NurpP --minimal linux-2.6.17.7/include/linux/ext3_jbd.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/ext3_jbd.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/ext3_jbd.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/ext3_jbd.h
--- linux-2.6.17.7/include/linux/ext3_jbd.h 2005-08-29 22:25:41 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/ext3_jbd.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/ext3_jbd.h 2006-07-09 17:07:13 +0200
@@ -77,10 +77,10 @@
#define EXT3_QUOTA_TRANS_BLOCKS(sb) (test_opt(sb, QUOTA) ? 2 : 0)
/* Amount of blocks needed for quota insert/delete - we do some block writes
#else
#define EXT3_QUOTA_TRANS_BLOCKS(sb) 0
#define EXT3_QUOTA_INIT_BLOCKS(sb) 0
-diff -NurpP --minimal linux-2.6.17.7/include/linux/fs.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/fs.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/fs.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/fs.h
--- linux-2.6.17.7/include/linux/fs.h 2006-06-18 04:55:17 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/fs.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/fs.h 2006-07-09 17:07:13 +0200
@@ -116,6 +116,8 @@ extern int dir_notify_enable;
#define MS_PRIVATE (1<<18) /* change to private */
#define MS_SLAVE (1<<19) /* change to slave */
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct super_block *, struct kstatfs *);
extern int simple_link(struct dentry *, struct inode *, struct dentry *);
-diff -NurpP --minimal linux-2.6.17.7/include/linux/init_task.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/init_task.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/init_task.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/init_task.h
--- linux-2.6.17.7/include/linux/init_task.h 2006-06-18 04:55:18 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/init_task.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/init_task.h 2006-07-09 17:07:13 +0200
@@ -123,6 +123,10 @@ extern struct group_info init_groups;
.journal_info = NULL, \
.cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \
}
-diff -NurpP --minimal linux-2.6.17.7/include/linux/ipc.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/ipc.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/ipc.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/ipc.h
--- linux-2.6.17.7/include/linux/ipc.h 2004-08-14 12:54:46 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/ipc.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/ipc.h 2006-07-09 17:07:13 +0200
@@ -66,6 +66,7 @@ struct kern_ipc_perm
mode_t mode;
unsigned long seq;
};
#endif /* __KERNEL__ */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/kernel.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/kernel.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/kernel.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/kernel.h
--- linux-2.6.17.7/include/linux/kernel.h 2006-06-18 04:55:18 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/kernel.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/kernel.h 2006-07-09 17:07:13 +0200
@@ -17,6 +17,7 @@
#include <asm/bug.h>
#define INT_MAX ((int)(~0U>>1))
#define INT_MIN (-INT_MAX - 1)
-diff -NurpP --minimal linux-2.6.17.7/include/linux/major.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/major.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/loop.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/loop.h
+--- linux-2.6.17.7/include/linux/loop.h 2006-06-18 04:55:19 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/loop.h 2006-08-04 20:07:26 +0200
+@@ -45,6 +45,7 @@ struct loop_device {
+ struct loop_func_table *lo_encryption;
+ __u32 lo_init[2];
+ uid_t lo_key_owner; /* Who set the key */
++ xid_t lo_xid;
+ int (*ioctl)(struct loop_device *, int cmd,
+ unsigned long arg);
+
+diff -NurpP --minimal linux-2.6.17.7/include/linux/major.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/major.h
--- linux-2.6.17.7/include/linux/major.h 2006-06-18 04:55:19 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/major.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/major.h 2006-07-09 17:07:13 +0200
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-2.6.17.7/include/linux/mount.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/mount.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/mount.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/mount.h
--- linux-2.6.17.7/include/linux/mount.h 2006-04-09 13:49:57 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/mount.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/mount.h 2006-07-09 17:07:13 +0200
@@ -22,10 +22,14 @@
#define MNT_NOEXEC 0x04
#define MNT_NOATIME 0x08
};
static inline struct vfsmount *mntget(struct vfsmount *mnt)
-diff -NurpP --minimal linux-2.6.17.7/include/linux/net.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/net.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/net.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/net.h
--- linux-2.6.17.7/include/linux/net.h 2006-06-18 04:55:19 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/net.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/net.h 2006-07-09 17:07:13 +0200
@@ -62,6 +62,7 @@ typedef enum {
#define SOCK_ASYNC_WAITDATA 1
#define SOCK_NOSPACE 2
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-2.6.17.7/include/linux/nfs_mount.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/nfs_mount.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/nfs_mount.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/nfs_mount.h
--- linux-2.6.17.7/include/linux/nfs_mount.h 2005-08-29 22:25:42 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/nfs_mount.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/nfs_mount.h 2006-07-09 17:07:13 +0200
@@ -61,6 +61,7 @@ struct nfs_mount_data {
#define NFS_MOUNT_NOACL 0x0800 /* 4 */
#define NFS_MOUNT_STRICTLOCK 0x1000 /* reserved for NFSv4 */
#define NFS_MOUNT_FLAGMASK 0xFFFF
#endif
-diff -NurpP --minimal linux-2.6.17.7/include/linux/percpu.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/percpu.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/percpu.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/percpu.h
--- linux-2.6.17.7/include/linux/percpu.h 2006-04-09 13:49:57 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/percpu.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/percpu.h 2006-07-09 17:07:13 +0200
@@ -8,7 +8,7 @@
/* Enough to cover all DEFINE_PER_CPUs in kernel, including modules. */
#endif
/* Must be an lvalue. */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/proc_fs.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/proc_fs.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/proc_fs.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/proc_fs.h
--- linux-2.6.17.7/include/linux/proc_fs.h 2006-06-18 04:55:21 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/proc_fs.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/proc_fs.h 2006-07-09 17:07:13 +0200
@@ -56,6 +56,7 @@ struct proc_dir_entry {
nlink_t nlink;
uid_t uid;
} op;
struct proc_dir_entry *pde;
struct inode vfs_inode;
-diff -NurpP --minimal linux-2.6.17.7/include/linux/quota.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/quota.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/quota.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/quota.h
--- linux-2.6.17.7/include/linux/quota.h 2006-06-18 04:55:21 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/quota.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/quota.h 2006-07-09 17:07:13 +0200
@@ -57,6 +57,13 @@ extern spinlock_t dq_data_lock;
#define kb2qb(x) ((x) >> (QUOTABLOCK_BITS-10))
#define toqb(x) (((x) + QUOTABLOCK_SIZE - 1) >> QUOTABLOCK_BITS)
#else
# /* nodep */ include <sys/cdefs.h>
-diff -NurpP --minimal linux-2.6.17.7/include/linux/quotaops.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/quotaops.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/quotaops.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/quotaops.h
--- linux-2.6.17.7/include/linux/quotaops.h 2006-04-09 13:49:57 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/quotaops.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/quotaops.h 2006-07-09 17:07:13 +0200
@@ -20,7 +20,7 @@
/*
* declaration of quota_function calls in kernel.
#define DQUOT_TRANSFER(inode, iattr) (0)
static inline int DQUOT_PREALLOC_SPACE_NODIRTY(struct inode *inode, qsize_t nr)
{
-diff -NurpP --minimal linux-2.6.17.7/include/linux/reiserfs_fs.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/reiserfs_fs.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/reiserfs_fs.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/reiserfs_fs.h
--- linux-2.6.17.7/include/linux/reiserfs_fs.h 2006-06-18 04:55:21 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/reiserfs_fs.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/reiserfs_fs.h 2006-07-09 17:07:13 +0200
@@ -829,6 +829,18 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL EXT2_COMPR_FL
#define REISERFS_NOTAIL_FL EXT2_NOTAIL_FL
/* namei.c */
void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
-diff -NurpP --minimal linux-2.6.17.7/include/linux/reiserfs_fs_sb.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/reiserfs_fs_sb.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/reiserfs_fs_sb.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/reiserfs_fs_sb.h
--- linux-2.6.17.7/include/linux/reiserfs_fs_sb.h 2006-02-18 14:40:35 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/reiserfs_fs_sb.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/reiserfs_fs_sb.h 2006-07-09 17:07:13 +0200
@@ -456,6 +456,7 @@ enum reiserfs_mount_options {
REISERFS_POSIXACL,
REISERFS_BARRIER_NONE,
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-2.6.17.7/include/linux/sched.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/sched.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/sched.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/sched.h
--- linux-2.6.17.7/include/linux/sched.h 2006-06-18 04:55:21 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/sched.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/sched.h 2006-07-09 17:07:13 +0200
@@ -15,6 +15,7 @@
#include <linux/cpumask.h>
#include <linux/errno.h>
static inline struct user_struct *get_uid(struct user_struct *u)
{
atomic_inc(&u->__count);
-diff -NurpP --minimal linux-2.6.17.7/include/linux/security.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/security.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/security.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/security.h
--- linux-2.6.17.7/include/linux/security.h 2006-06-18 04:55:21 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/security.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/security.h 2006-07-09 17:07:13 +0200
@@ -1102,7 +1102,7 @@ struct security_operations {
int (*capable) (struct task_struct * tsk, int cap);
int (*acct) (struct file * file);
{
return 0;
}
-diff -NurpP --minimal linux-2.6.17.7/include/linux/shmem_fs.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/shmem_fs.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/shmem_fs.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/shmem_fs.h
--- linux-2.6.17.7/include/linux/shmem_fs.h 2006-04-09 13:49:57 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/shmem_fs.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/shmem_fs.h 2006-07-09 17:07:13 +0200
@@ -8,6 +8,9 @@
#define SHMEM_NR_DIRECT 16
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-2.6.17.7/include/linux/stat.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/stat.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/stat.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/stat.h
--- linux-2.6.17.7/include/linux/stat.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/stat.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/stat.h 2006-07-09 17:07:13 +0200
@@ -63,6 +63,7 @@ struct kstat {
unsigned int nlink;
uid_t uid;
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-2.6.17.7/include/linux/sunrpc/auth.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/sunrpc/auth.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/sunrpc/auth.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/sunrpc/auth.h
--- linux-2.6.17.7/include/linux/sunrpc/auth.h 2006-02-18 14:40:35 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/sunrpc/auth.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/sunrpc/auth.h 2006-07-09 17:07:13 +0200
@@ -28,6 +28,7 @@
struct auth_cred {
uid_t uid;
struct group_info *group_info;
};
-diff -NurpP --minimal linux-2.6.17.7/include/linux/sunrpc/clnt.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/sunrpc/clnt.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/sunrpc/clnt.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/sunrpc/clnt.h
--- linux-2.6.17.7/include/linux/sunrpc/clnt.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/sunrpc/clnt.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/sunrpc/clnt.h 2006-07-09 17:07:13 +0200
@@ -52,7 +52,8 @@ struct rpc_clnt {
cl_intr : 1,/* interruptible */
cl_autobind : 1,/* use getport() */
struct rpc_rtt * cl_rtt; /* RTO estimator data */
struct rpc_portmap * cl_pmap; /* port mapping */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/syscalls.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/syscalls.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/syscalls.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/syscalls.h
--- linux-2.6.17.7/include/linux/syscalls.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/syscalls.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/syscalls.h 2006-07-09 17:07:13 +0200
@@ -294,6 +294,8 @@ asmlinkage long sys_symlink(const char _
asmlinkage long sys_unlink(const char __user *pathname);
asmlinkage long sys_rename(const char __user *oldname,
asmlinkage long sys_chmod(const char __user *filename, mode_t mode);
asmlinkage long sys_fchmod(unsigned int fd, mode_t mode);
-diff -NurpP --minimal linux-2.6.17.7/include/linux/sysctl.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/sysctl.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/sysctl.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/sysctl.h
--- linux-2.6.17.7/include/linux/sysctl.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/sysctl.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/sysctl.h 2006-07-09 17:07:13 +0200
@@ -93,6 +93,7 @@ enum
KERN_CAP_BSET=14, /* int: capability bounding set */
KERN_PANIC=15, /* int: panic timeout */
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.17.7/include/linux/sysfs.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/sysfs.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/sysfs.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/sysfs.h
--- linux-2.6.17.7/include/linux/sysfs.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/sysfs.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/sysfs.h 2006-07-09 17:07:13 +0200
@@ -12,6 +12,8 @@
#include <asm/atomic.h>
struct kobject;
struct module;
-diff -NurpP --minimal linux-2.6.17.7/include/linux/time.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/time.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/time.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/time.h
--- linux-2.6.17.7/include/linux/time.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/time.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/time.h 2006-07-09 17:07:13 +0200
@@ -142,6 +142,8 @@ extern struct timespec ns_to_timespec(co
*/
extern struct timeval ns_to_timeval(const s64 nsec);
#endif /* __KERNEL__ */
#define NFDBITS __NFDBITS
-diff -NurpP --minimal linux-2.6.17.7/include/linux/types.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/types.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/types.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/types.h
--- linux-2.6.17.7/include/linux/types.h 2006-06-18 04:55:26 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/types.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/types.h 2006-07-09 17:07:13 +0200
@@ -38,6 +38,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
#ifdef CONFIG_UID16
/* This is defined by include/asm-{arch}/posix_types.h */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vroot.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vroot.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vroot.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vroot.h
--- linux-2.6.17.7/include/linux/vroot.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vroot.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vroot.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,51 @@
+
+/*
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_base.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_base.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_base.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_base.h
--- linux-2.6.17.7/include/linux/vs_base.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_base.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_base.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,130 @@
+#ifndef _VX_VS_BASE_H
+#define _VX_VS_BASE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_context.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_context.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_context.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_context.h
--- linux-2.6.17.7/include/linux/vs_context.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_context.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_context.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,241 @@
+#ifndef _VX_VS_CONTEXT_H
+#define _VX_VS_CONTEXT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_cvirt.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_cvirt.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_cvirt.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_cvirt.h
--- linux-2.6.17.7/include/linux/vs_cvirt.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_cvirt.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_cvirt.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,59 @@
+#ifndef _VX_VS_CVIRT_H
+#define _VX_VS_CVIRT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_dlimit.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_dlimit.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_dlimit.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_dlimit.h
--- linux-2.6.17.7/include/linux/vs_dlimit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_dlimit.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_dlimit.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,213 @@
+#ifndef _VX_VS_DLIMIT_H
+#define _VX_VS_DLIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_limit.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_limit.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_limit.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_limit.h
--- linux-2.6.17.7/include/linux/vs_limit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_limit.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_limit.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,137 @@
+#ifndef _VX_VS_LIMIT_H
+#define _VX_VS_LIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_memory.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_memory.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_memory.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_memory.h
--- linux-2.6.17.7/include/linux/vs_memory.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_memory.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_memory.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,149 @@
+#ifndef _VX_VS_MEMORY_H
+#define _VX_VS_MEMORY_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_network.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_network.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_network.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_network.h
--- linux-2.6.17.7/include/linux/vs_network.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_network.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_network.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,244 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_pid.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_pid.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_pid.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_pid.h
--- linux-2.6.17.7/include/linux/vs_pid.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_pid.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_pid.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,57 @@
+#ifndef _VX_VS_PID_H
+#define _VX_VS_PID_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_sched.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_sched.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_sched.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_sched.h
--- linux-2.6.17.7/include/linux/vs_sched.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_sched.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_sched.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,107 @@
+#ifndef _VX_VS_SCHED_H
+#define _VX_VS_SCHED_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_socket.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_socket.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_socket.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_socket.h
--- linux-2.6.17.7/include/linux/vs_socket.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_socket.h 2006-07-09 23:04:01 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_socket.h 2006-07-09 23:04:01 +0200
@@ -0,0 +1,59 @@
+#ifndef _VX_VS_SOCKET_H
+#define _VX_VS_SOCKET_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_tag.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_tag.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_tag.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_tag.h
--- linux-2.6.17.7/include/linux/vs_tag.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_tag.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_tag.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,45 @@
+#ifndef _VX_VS_TAG_H
+#define _VX_VS_TAG_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_time.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_time.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vs_time.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_time.h
--- linux-2.6.17.7/include/linux/vs_time.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vs_time.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vs_time.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,19 @@
+#ifndef _VX_VS_TIME_H
+#define _VX_VS_TIME_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/context.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/context.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/cacct_cmd.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/cacct_cmd.h
+--- linux-2.6.17.7/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/cacct_cmd.h 2006-08-05 04:28:29 +0200
+@@ -0,0 +1,33 @@
++#ifndef _VX_CACCT_CMD_H
++#define _VX_CACCT_CMD_H
++
++
++/* virtual host info name commands */
++
++#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0)
++
++struct vcmd_sock_stat_v0 {
++ uint32_t field;
++ uint32_t count;
++ uint64_t total;
++};
++
++
++enum sock_stat_field {
++ SOCK_UNSPEC=0,
++ SOCK_UNIX,
++ SOCK_INET,
++ SOCK_INET6,
++ SOCK_PACKET,
++ SOCK_OTHER,
++};
++
++
++#ifdef __KERNEL__
++
++#include <linux/compiler.h>
++
++extern int vc_sock_stat(struct vx_info *, void __user *);
++
++#endif /* __KERNEL__ */
++#endif /* _VX_CACCT_CMD_H */
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/cacct_def.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/cacct_def.h
+--- linux-2.6.17.7/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/cacct_def.h 2006-07-30 16:49:23 +0200
+@@ -0,0 +1,42 @@
++#ifndef _VX_CACCT_DEF_H
++#define _VX_CACCT_DEF_H
++
++#include <asm/atomic.h>
++
++
++struct _vx_sock_acc {
++ atomic_t count;
++ atomic_t total;
++};
++
++/* context sub struct */
++
++struct _vx_cacct {
++ struct _vx_sock_acc sock[6][3];
++ atomic_t slab[8];
++ atomic_t page[6][8];
++};
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
++{
++ int i,j;
++
++ printk("\t_vx_cacct:");
++ for (i=0; i<6; i++) {
++ struct _vx_sock_acc *ptr = cacct->sock[i];
++
++ printk("\t [%d] =", i);
++ for (j=0; j<3; j++) {
++ printk(" [%d] = %8d, %8d", j,
++ atomic_read(&ptr[j].count),
++ atomic_read(&ptr[j].total));
++ }
++ printk("\n");
++ }
++}
++
++#endif
++
++#endif /* _VX_CACCT_DEF_H */
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/context.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/context.h
--- linux-2.6.17.7/include/linux/vserver/context.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/context.h 2006-07-09 17:07:13 +0200
-@@ -0,0 +1,206 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/context.h 2006-07-30 16:50:15 +0200
+@@ -0,0 +1,208 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
+
+
+#define VXF_STATE_SETUP (1ULL<<32)
+#define VXF_STATE_INIT (1ULL<<33)
++#define VXF_STATE_ADMIN (1ULL<<34)
+
+#define VXF_SC_HELPER (1ULL<<36)
+#define VXF_REBOOT_KILL (1ULL<<37)
+
+#define VXF_IGNEG_NICE (1ULL<<52)
+
-+#define VXF_ONE_TIME (0x0003ULL<<32)
++#define VXF_ONE_TIME (0x0007ULL<<32)
+
-+#define VXF_INIT_SET (VXF_STATE_SETUP|VXF_STATE_INIT)
++#define VXF_INIT_SET (VXF_STATE_SETUP|VXF_STATE_INIT|VXF_STATE_ADMIN)
+
+
+/* context migration */
+#include "limit_def.h"
+#include "sched_def.h"
+#include "cvirt_def.h"
++#include "cacct_def.h"
+
+struct _vx_info_pc {
+ struct _vx_sched_pc sched_pc;
+#else /* _VX_CONTEXT_H */
+#warning duplicate inclusion
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/context_cmd.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/context_cmd.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/context_cmd.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/context_cmd.h
--- linux-2.6.17.7/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/context_cmd.h 2006-07-10 01:52:23 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/context_cmd.h 2006-07-10 01:52:23 +0200
@@ -0,0 +1,111 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/cvirt.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/cvirt.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/cvirt.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/cvirt.h
--- linux-2.6.17.7/include/linux/vserver/cvirt.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/cvirt.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/cvirt.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,26 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
+#else /* _VX_CVIRT_H */
+#warning duplicate inclusion
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/cvirt_cmd.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/cvirt_cmd.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/cvirt_cmd.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/cvirt_cmd.h
--- linux-2.6.17.7/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/cvirt_cmd.h 2006-07-09 19:24:57 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/cvirt_cmd.h 2006-07-09 19:24:57 +0200
@@ -0,0 +1,35 @@
+#ifndef _VX_CVIRT_CMD_H
+#define _VX_CVIRT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/cvirt_def.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/cvirt_def.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/cvirt_def.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/cvirt_def.h
--- linux-2.6.17.7/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/cvirt_def.h 2006-07-09 23:05:48 +0200
-@@ -0,0 +1,120 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/cvirt_def.h 2006-07-30 16:48:35 +0200
+@@ -0,0 +1,84 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
+
+
+#endif
+
-+
-+struct _vx_sock_acc {
-+ atomic_t count;
-+ atomic_t total;
-+};
-+
-+/* context sub struct */
-+
-+struct _vx_cacct {
-+ struct _vx_sock_acc sock[6][3];
-+ atomic_t slab[8];
-+ atomic_t page[6][8];
-+};
-+
-+#ifdef CONFIG_VSERVER_DEBUG
-+
-+static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
-+{
-+ int i,j;
-+
-+ printk("\t_vx_cacct:");
-+ for (i=0; i<6; i++) {
-+ struct _vx_sock_acc *ptr = cacct->sock[i];
-+
-+ printk("\t [%d] =", i);
-+ for (j=0; j<3; j++) {
-+ printk(" [%d] = %8d, %8d", j,
-+ atomic_read(&ptr[j].count),
-+ atomic_read(&ptr[j].total));
-+ }
-+ printk("\n");
-+ }
-+}
-+
-+#endif
-+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/debug.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/debug.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/debug.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/debug.h
--- linux-2.6.17.7/include/linux/vserver/debug.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/debug.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/debug.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,110 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/debug_cmd.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/debug_cmd.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/debug_cmd.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/debug_cmd.h
--- linux-2.6.17.7/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/debug_cmd.h 2006-07-09 19:25:01 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/debug_cmd.h 2006-07-09 19:25:01 +0200
@@ -0,0 +1,14 @@
+#ifndef _VX_DEBUG_CMD_H
+#define _VX_DEBUG_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/dlimit.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/dlimit.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/dlimit.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/dlimit.h
--- linux-2.6.17.7/include/linux/vserver/dlimit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/dlimit.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/dlimit.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_DLIMIT_H
+#define _VX_DLIMIT_H
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/dlimit_cmd.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/dlimit_cmd.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/dlimit_cmd.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/dlimit_cmd.h
--- linux-2.6.17.7/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/dlimit_cmd.h 2006-07-09 19:25:12 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/dlimit_cmd.h 2006-07-09 19:25:12 +0200
@@ -0,0 +1,72 @@
+#ifndef _VX_DLIMIT_CMD_H
+#define _VX_DLIMIT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/global.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/global.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/global.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/global.h
--- linux-2.6.17.7/include/linux/vserver/global.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/global.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/global.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,8 @@
+#ifndef _VX_GLOBAL_H
+#define _VX_GLOBAL_H
+extern atomic_t vx_global_cactive;
+
+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/history.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/history.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/history.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/history.h
--- linux-2.6.17.7/include/linux/vserver/history.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/history.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/history.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,196 @@
+#ifndef _VX_HISTORY_H
+#define _VX_HISTORY_H
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/inode.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/inode.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/inode.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/inode.h
--- linux-2.6.17.7/include/linux/vserver/inode.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/inode.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/inode.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,38 @@
+#ifndef _VX_INODE_H
+#define _VX_INODE_H
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/inode_cmd.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/inode_cmd.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/inode_cmd.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/inode_cmd.h
--- linux-2.6.17.7/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/inode_cmd.h 2006-07-09 19:25:23 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/inode_cmd.h 2006-07-09 19:25:23 +0200
@@ -0,0 +1,59 @@
+#ifndef _VX_INODE_CMD_H
+#define _VX_INODE_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/legacy.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/legacy.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/legacy.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/legacy.h
--- linux-2.6.17.7/include/linux/vserver/legacy.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/legacy.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/legacy.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,49 @@
+#ifndef _VX_LEGACY_H
+#define _VX_LEGACY_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LEGACY_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/limit.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/limit.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/limit.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/limit.h
--- linux-2.6.17.7/include/linux/vserver/limit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/limit.h 2006-07-12 14:16:06 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/limit.h 2006-07-12 14:16:06 +0200
@@ -0,0 +1,66 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/limit_cmd.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/limit_cmd.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/limit_cmd.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/limit_cmd.h
--- linux-2.6.17.7/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/limit_cmd.h 2006-07-09 19:26:04 +0200
-@@ -0,0 +1,57 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/limit_cmd.h 2006-07-30 17:06:43 +0200
+@@ -0,0 +1,69 @@
+#ifndef _VX_LIMIT_CMD_H
+#define _VX_LIMIT_CMD_H
+
+ uint32_t maximum;
+};
+
++#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0)
++
++struct vcmd_rlimit_stat_v0 {
++ uint32_t id;
++ uint32_t hits;
++ uint64_t value;
++ uint64_t minimum;
++ uint64_t maximum;
++};
++
+#define CRLIM_UNSET (0ULL)
+#define CRLIM_INFINITY (~0ULL)
+#define CRLIM_KEEP (~1ULL)
+extern int vc_set_rlimit(struct vx_info *, void __user *);
+extern int vc_reset_minmax(struct vx_info *, void __user *);
+
++extern int vc_rlimit_stat(struct vx_info *, void __user *);
++
+#ifdef CONFIG_IA32_EMULATION
+
+extern int vc_get_rlimit_x32(struct vx_info *, void __user *);
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/limit_def.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/limit_def.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/limit_def.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/limit_def.h
--- linux-2.6.17.7/include/linux/vserver/limit_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/limit_def.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/limit_def.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,47 @@
+#ifndef _VX_LIMIT_DEF_H
+#define _VX_LIMIT_DEF_H
+#endif
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/limit_int.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/limit_int.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/limit_int.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/limit_int.h
--- linux-2.6.17.7/include/linux/vserver/limit_int.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/limit_int.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/limit_int.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,83 @@
+#ifndef _VX_LIMIT_INT_H
+#define _VX_LIMIT_INT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/monitor.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/monitor.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/monitor.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/monitor.h
--- linux-2.6.17.7/include/linux/vserver/monitor.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/monitor.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/monitor.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,97 @@
+#ifndef _VX_MONITOR_H
+#define _VX_MONITOR_H
+
+
+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/namespace.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/namespace.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/namespace.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/namespace.h
--- linux-2.6.17.7/include/linux/vserver/namespace.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/namespace.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/namespace.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,15 @@
+#ifndef _VX_NAMESPACE_H
+#define _VX_NAMESPACE_H
+#else /* _VX_NAMESPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_NAMESPACE_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/namespace_cmd.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/namespace_cmd.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/namespace_cmd.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/namespace_cmd.h
--- linux-2.6.17.7/include/linux/vserver/namespace_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/namespace_cmd.h 2006-07-27 19:03:51 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/namespace_cmd.h 2006-07-27 19:03:51 +0200
@@ -0,0 +1,17 @@
+#ifndef _VX_NAMESPACE_CMD_H
+#define _VX_NAMESPACE_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NAMESPACE_CMD_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/network.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/network.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/network.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/network.h
--- linux-2.6.17.7/include/linux/vserver/network.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/network.h 2006-07-09 17:07:13 +0200
-@@ -0,0 +1,139 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/network.h 2006-07-30 03:19:01 +0200
+@@ -0,0 +1,142 @@
+#ifndef _VX_NETWORK_H
+#define _VX_NETWORK_H
+
+
+/* network flags */
+
++#define NXF_INFO_LOCK 0x00000001
++
+#define NXF_STATE_SETUP (1ULL<<32)
++#define NXF_STATE_ADMIN (1ULL<<34)
+
+#define NXF_SC_HELPER (1ULL<<36)
+#define NXF_PERSISTENT (1ULL<<38)
+
-+#define NXF_ONE_TIME (0x0001ULL<<32)
++#define NXF_ONE_TIME (0x0005ULL<<32)
+
-+#define NXF_INIT_SET (0)
++#define NXF_INIT_SET (NXF_STATE_ADMIN)
+
+
+/* address types */
+#else /* _VX_NETWORK_H */
+#warning duplicate inclusion
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/network_cmd.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/network_cmd.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/network_cmd.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/network_cmd.h
--- linux-2.6.17.7/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/network_cmd.h 2006-07-09 19:32:36 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/network_cmd.h 2006-07-09 19:32:36 +0200
@@ -0,0 +1,89 @@
+#ifndef _VX_NETWORK_CMD_H
+#define _VX_NETWORK_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/sched.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/sched.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/sched.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/sched.h
--- linux-2.6.17.7/include/linux/vserver/sched.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/sched.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/sched.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,26 @@
+#ifndef _VX_SCHED_H
+#define _VX_SCHED_H
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/sched_cmd.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/sched_cmd.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/sched_cmd.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/sched_cmd.h
--- linux-2.6.17.7/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/sched_cmd.h 2006-07-09 19:27:34 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/sched_cmd.h 2006-07-09 19:27:34 +0200
@@ -0,0 +1,72 @@
+#ifndef _VX_SCHED_CMD_H
+#define _VX_SCHED_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/sched_def.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/sched_def.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/sched_def.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/sched_def.h
--- linux-2.6.17.7/include/linux/vserver/sched_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/sched_def.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/sched_def.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,67 @@
+#ifndef _VX_SCHED_DEF_H
+#define _VX_SCHED_DEF_H
+#endif
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/signal.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/signal.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/signal.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/signal.h
--- linux-2.6.17.7/include/linux/vserver/signal.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/signal.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/signal.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,14 @@
+#ifndef _VX_SIGNAL_H
+#define _VX_SIGNAL_H
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/signal_cmd.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/signal_cmd.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/signal_cmd.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/signal_cmd.h
--- linux-2.6.17.7/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/signal_cmd.h 2006-07-09 19:27:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/signal_cmd.h 2006-07-09 19:27:47 +0200
@@ -0,0 +1,26 @@
+#ifndef _VX_SIGNAL_CMD_H
+#define _VX_SIGNAL_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/switch.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/switch.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/switch.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/switch.h
--- linux-2.6.17.7/include/linux/vserver/switch.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/switch.h 2006-07-09 17:07:13 +0200
-@@ -0,0 +1,99 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/switch.h 2006-07-30 16:32:52 +0200
+@@ -0,0 +1,100 @@
+#ifndef _VX_SWITCH_H
+#define _VX_SWITCH_H
+
+ DISK | | | | |DLIMIT | | |INODE | |
+ VFS | 32| 33| 34| 35| 36| 37| | 38| 39|
+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-+ OTHER | | | | | | | |VINFO | |
++ OTHER |VSTAT | | | | | | |VINFO | |
+ | 40| 41| 42| 43| 44| 45| | 46| 47|
+ =======+=======+=======+=======+=======+=======+=======+ +=======+=======+
+ SPECIAL|EVENT | | | |FLAGS | | | | |
+#define VC_CAT_DLIMIT 36
+#define VC_CAT_INODE 38
+
++#define VC_CAT_VSTAT 40
+#define VC_CAT_VINFO 46
+#define VC_CAT_EVENT 48
+
+
+/* interface version */
+
-+#define VCI_VERSION 0x00020101
++#define VCI_VERSION 0x00020102
+#define VCI_LEGACY_VERSION 0x000100FF
+
+/* query version */
+#endif /* __KERNEL__ */
+
+#endif /* _VX_SWITCH_H */
-diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/tag.h linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/tag.h
+diff -NurpP --minimal linux-2.6.17.7/include/linux/vserver/tag.h linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/tag.h
--- linux-2.6.17.7/include/linux/vserver/tag.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/linux/vserver/tag.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/linux/vserver/tag.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,153 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-2.6.17.7/include/net/af_unix.h linux-2.6.17.7-vs2.1.1-rc27/include/net/af_unix.h
+diff -NurpP --minimal linux-2.6.17.7/include/net/af_unix.h linux-2.6.17.7-vs2.1.1-rc28/include/net/af_unix.h
--- linux-2.6.17.7/include/net/af_unix.h 2006-06-18 04:55:27 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/net/af_unix.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/net/af_unix.h 2006-07-09 17:07:13 +0200
@@ -18,9 +18,9 @@ extern spinlock_t unix_table_lock;
extern atomic_t unix_tot_inflight;
}
#define forall_unix_sockets(i, s) \
-diff -NurpP --minimal linux-2.6.17.7/include/net/inet_hashtables.h linux-2.6.17.7-vs2.1.1-rc27/include/net/inet_hashtables.h
+diff -NurpP --minimal linux-2.6.17.7/include/net/inet_hashtables.h linux-2.6.17.7-vs2.1.1-rc28/include/net/inet_hashtables.h
--- linux-2.6.17.7/include/net/inet_hashtables.h 2006-04-09 13:49:58 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/net/inet_hashtables.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/net/inet_hashtables.h 2006-07-09 17:07:13 +0200
@@ -272,6 +272,25 @@ static inline int inet_iif(const struct
return ((struct rtable *)skb->dst)->rt_iif;
}
(sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&
!sk->sk_bound_dev_if)
goto sherry_cache;
-diff -NurpP --minimal linux-2.6.17.7/include/net/inet_sock.h linux-2.6.17.7-vs2.1.1-rc27/include/net/inet_sock.h
+diff -NurpP --minimal linux-2.6.17.7/include/net/inet_sock.h linux-2.6.17.7-vs2.1.1-rc28/include/net/inet_sock.h
--- linux-2.6.17.7/include/net/inet_sock.h 2006-04-09 13:49:58 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/net/inet_sock.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/net/inet_sock.h 2006-07-09 17:07:13 +0200
@@ -115,6 +115,7 @@ struct inet_sock {
/* Socket demultiplex comparisons on incoming packets. */
__u32 daddr;
__u16 dport;
__u16 num;
__u32 saddr;
-diff -NurpP --minimal linux-2.6.17.7/include/net/inet_timewait_sock.h linux-2.6.17.7-vs2.1.1-rc27/include/net/inet_timewait_sock.h
+diff -NurpP --minimal linux-2.6.17.7/include/net/inet_timewait_sock.h linux-2.6.17.7-vs2.1.1-rc28/include/net/inet_timewait_sock.h
--- linux-2.6.17.7/include/net/inet_timewait_sock.h 2006-06-18 04:55:27 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/net/inet_timewait_sock.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/net/inet_timewait_sock.h 2006-07-09 17:07:13 +0200
@@ -116,6 +116,10 @@ struct inet_timewait_sock {
#define tw_refcnt __tw_common.skc_refcnt
#define tw_hash __tw_common.skc_hash
volatile unsigned char tw_substate;
/* 3 bits hole, try to pack */
unsigned char tw_rcv_wscale;
-diff -NurpP --minimal linux-2.6.17.7/include/net/route.h linux-2.6.17.7-vs2.1.1-rc27/include/net/route.h
+diff -NurpP --minimal linux-2.6.17.7/include/net/route.h linux-2.6.17.7-vs2.1.1-rc28/include/net/route.h
--- linux-2.6.17.7/include/net/route.h 2006-06-18 04:55:28 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/net/route.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/net/route.h 2006-07-09 17:07:13 +0200
@@ -28,11 +28,14 @@
#include <net/dst.h>
#include <net/inetpeer.h>
err = __ip_route_output_key(rp, &fl);
if (err)
return err;
-diff -NurpP --minimal linux-2.6.17.7/include/net/sock.h linux-2.6.17.7-vs2.1.1-rc27/include/net/sock.h
+diff -NurpP --minimal linux-2.6.17.7/include/net/sock.h linux-2.6.17.7-vs2.1.1-rc28/include/net/sock.h
--- linux-2.6.17.7/include/net/sock.h 2006-06-18 04:55:28 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/include/net/sock.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/include/net/sock.h 2006-07-09 17:07:13 +0200
@@ -115,6 +115,10 @@ struct sock_common {
atomic_t skc_refcnt;
unsigned int skc_hash;
unsigned char sk_shutdown : 2,
sk_no_check : 2,
sk_userlocks : 4;
-diff -NurpP --minimal linux-2.6.17.7/init/version.c linux-2.6.17.7-vs2.1.1-rc27/init/version.c
+diff -NurpP --minimal linux-2.6.17.7/init/version.c linux-2.6.17.7-vs2.1.1-rc28/init/version.c
--- linux-2.6.17.7/init/version.c 2005-03-02 12:39:08 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/init/version.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/init/version.c 2006-07-09 17:07:13 +0200
@@ -31,3 +31,8 @@ EXPORT_SYMBOL(system_utsname);
const char linux_banner[] =
"Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
+ "Linux version %s (" LINUX_COMPILE_BY "@"
+ LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") %s\n";
+
-diff -NurpP --minimal linux-2.6.17.7/ipc/mqueue.c linux-2.6.17.7-vs2.1.1-rc27/ipc/mqueue.c
+diff -NurpP --minimal linux-2.6.17.7/ipc/mqueue.c linux-2.6.17.7-vs2.1.1-rc28/ipc/mqueue.c
--- linux-2.6.17.7/ipc/mqueue.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/ipc/mqueue.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/ipc/mqueue.c 2006-07-09 17:07:13 +0200
@@ -26,6 +26,8 @@
#include <linux/syscalls.h>
#include <linux/signal.h>
out_err:
dput(dentry);
-diff -NurpP --minimal linux-2.6.17.7/ipc/msg.c linux-2.6.17.7-vs2.1.1-rc27/ipc/msg.c
+diff -NurpP --minimal linux-2.6.17.7/ipc/msg.c linux-2.6.17.7-vs2.1.1-rc28/ipc/msg.c
--- linux-2.6.17.7/ipc/msg.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/ipc/msg.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/ipc/msg.c 2006-07-09 17:07:13 +0200
@@ -105,6 +105,7 @@ static int newque (key_t key, int msgflg
msq->q_perm.mode = (msgflg & S_IRWXUGO);
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.17.7/ipc/sem.c linux-2.6.17.7-vs2.1.1-rc27/ipc/sem.c
+diff -NurpP --minimal linux-2.6.17.7/ipc/sem.c linux-2.6.17.7-vs2.1.1-rc28/ipc/sem.c
--- linux-2.6.17.7/ipc/sem.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/ipc/sem.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/ipc/sem.c 2006-07-09 17:07:13 +0200
@@ -79,6 +79,7 @@
#include <linux/capability.h>
#include <linux/seq_file.h>
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.17.7/ipc/shm.c linux-2.6.17.7-vs2.1.1-rc27/ipc/shm.c
+diff -NurpP --minimal linux-2.6.17.7/ipc/shm.c linux-2.6.17.7-vs2.1.1-rc28/ipc/shm.c
--- linux-2.6.17.7/ipc/shm.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/ipc/shm.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/ipc/shm.c 2006-07-09 17:07:13 +0200
@@ -33,6 +33,8 @@
#include <linux/ptrace.h>
#include <linux/seq_file.h>
if (sizeof(size_t) <= sizeof(int))
format = SMALL_STRING;
else
-diff -NurpP --minimal linux-2.6.17.7/ipc/util.c linux-2.6.17.7-vs2.1.1-rc27/ipc/util.c
+diff -NurpP --minimal linux-2.6.17.7/ipc/util.c linux-2.6.17.7-vs2.1.1-rc28/ipc/util.c
--- linux-2.6.17.7/ipc/util.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/ipc/util.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/ipc/util.c 2006-07-09 17:07:13 +0200
@@ -158,7 +158,9 @@ int ipc_findkey(struct ipc_ids* ids, key
*/
for (id = 0; id <= max_id; id++) {
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.17.7/kernel/Makefile linux-2.6.17.7-vs2.1.1-rc27/kernel/Makefile
+diff -NurpP --minimal linux-2.6.17.7/kernel/Makefile linux-2.6.17.7-vs2.1.1-rc28/kernel/Makefile
--- linux-2.6.17.7/kernel/Makefile 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/Makefile 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/Makefile 2006-07-09 17:07:13 +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
obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
obj-$(CONFIG_FUTEX) += futex.o
ifeq ($(CONFIG_COMPAT),y)
-diff -NurpP --minimal linux-2.6.17.7/kernel/capability.c linux-2.6.17.7-vs2.1.1-rc27/kernel/capability.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/capability.c linux-2.6.17.7-vs2.1.1-rc28/kernel/capability.c
--- linux-2.6.17.7/kernel/capability.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/capability.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/capability.c 2006-07-09 17:07:13 +0200
@@ -12,6 +12,7 @@
#include <linux/module.h>
#include <linux/security.h>
}
EXPORT_SYMBOL(capable);
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/compat.c linux-2.6.17.7-vs2.1.1-rc27/kernel/compat.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/compat.c linux-2.6.17.7-vs2.1.1-rc28/kernel/compat.c
--- linux-2.6.17.7/kernel/compat.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/compat.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/compat.c 2006-07-09 17:07:13 +0200
@@ -819,7 +819,7 @@ asmlinkage long compat_sys_time(compat_t
compat_time_t i;
struct timeval tv;
return 0;
}
-diff -NurpP --minimal linux-2.6.17.7/kernel/cpuset.c linux-2.6.17.7-vs2.1.1-rc27/kernel/cpuset.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/cpuset.c linux-2.6.17.7-vs2.1.1-rc28/kernel/cpuset.c
--- linux-2.6.17.7/kernel/cpuset.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/cpuset.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/cpuset.c 2006-07-09 17:07:13 +0200
@@ -49,6 +49,7 @@
#include <linux/time.h>
#include <linux/backing-dev.h>
#include <asm/uaccess.h>
#include <asm/atomic.h>
-diff -NurpP --minimal linux-2.6.17.7/kernel/exit.c linux-2.6.17.7-vs2.1.1-rc27/kernel/exit.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/exit.c linux-2.6.17.7-vs2.1.1-rc28/kernel/exit.c
--- linux-2.6.17.7/kernel/exit.c 2006-07-27 19:19:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/exit.c 2006-07-26 21:36:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/exit.c 2006-07-26 21:36:47 +0200
@@ -36,6 +36,10 @@
#include <linux/compat.h>
#include <linux/pipe_fs_i.h>
exit_thread();
cpuset_exit(tsk);
exit_keys(tsk);
-diff -NurpP --minimal linux-2.6.17.7/kernel/fork.c linux-2.6.17.7-vs2.1.1-rc27/kernel/fork.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/fork.c linux-2.6.17.7-vs2.1.1-rc28/kernel/fork.c
--- linux-2.6.17.7/kernel/fork.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/fork.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/fork.c 2006-07-09 17:07:13 +0200
@@ -44,6 +44,10 @@
#include <linux/rmap.h>
#include <linux/acct.h>
nr = pid->nr;
if (unlikely(current->ptrace)) {
trace = fork_traceflag (clone_flags);
-diff -NurpP --minimal linux-2.6.17.7/kernel/futex.c linux-2.6.17.7-vs2.1.1-rc27/kernel/futex.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/futex.c linux-2.6.17.7-vs2.1.1-rc28/kernel/futex.c
--- linux-2.6.17.7/kernel/futex.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/futex.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/futex.c 2006-07-09 17:07:13 +0200
@@ -44,6 +44,7 @@
#include <linux/pagemap.h>
#include <linux/syscalls.h>
#include <asm/futex.h>
#define FUTEX_HASHBITS (CONFIG_BASE_SMALL ? 4 : 8)
-diff -NurpP --minimal linux-2.6.17.7/kernel/futex_compat.c linux-2.6.17.7-vs2.1.1-rc27/kernel/futex_compat.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/futex_compat.c linux-2.6.17.7-vs2.1.1-rc28/kernel/futex_compat.c
--- linux-2.6.17.7/kernel/futex_compat.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/futex_compat.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/futex_compat.c 2006-07-09 17:07:13 +0200
@@ -9,6 +9,7 @@
#include <linux/linkage.h>
#include <linux/compat.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.17.7/kernel/kthread.c linux-2.6.17.7-vs2.1.1-rc27/kernel/kthread.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/kthread.c linux-2.6.17.7-vs2.1.1-rc28/kernel/kthread.c
--- linux-2.6.17.7/kernel/kthread.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/kthread.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/kthread.c 2006-07-09 17:07:13 +0200
@@ -116,7 +116,7 @@ static void keventd_create_kthread(void
} else {
wait_for_completion(&create->started);
read_unlock(&tasklist_lock);
}
complete(&create->done);
-diff -NurpP --minimal linux-2.6.17.7/kernel/posix-cpu-timers.c linux-2.6.17.7-vs2.1.1-rc27/kernel/posix-cpu-timers.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/posix-cpu-timers.c linux-2.6.17.7-vs2.1.1-rc28/kernel/posix-cpu-timers.c
--- linux-2.6.17.7/kernel/posix-cpu-timers.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/posix-cpu-timers.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/posix-cpu-timers.c 2006-07-09 17:07:13 +0200
@@ -6,6 +6,7 @@
#include <linux/posix-timers.h>
#include <asm/uaccess.h>
static int check_clock(const clockid_t which_clock)
{
-diff -NurpP --minimal linux-2.6.17.7/kernel/posix-timers.c linux-2.6.17.7-vs2.1.1-rc27/kernel/posix-timers.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/posix-timers.c linux-2.6.17.7-vs2.1.1-rc28/kernel/posix-timers.c
--- linux-2.6.17.7/kernel/posix-timers.c 2006-06-18 04:55:31 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/posix-timers.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/posix-timers.c 2006-07-09 17:07:13 +0200
@@ -48,6 +48,8 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
rtn->tgid != current->tgid ||
(event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_SIGNAL))
return NULL;
-diff -NurpP --minimal linux-2.6.17.7/kernel/printk.c linux-2.6.17.7-vs2.1.1-rc27/kernel/printk.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/printk.c linux-2.6.17.7-vs2.1.1-rc28/kernel/printk.c
--- linux-2.6.17.7/kernel/printk.c 2006-06-18 04:55:31 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/printk.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/printk.c 2006-07-09 17:07:13 +0200
@@ -31,6 +31,8 @@
#include <linux/security.h>
#include <linux/bootmem.h>
va_end(args);
return r;
-diff -NurpP --minimal linux-2.6.17.7/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc27/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/ptrace.c linux-2.6.17.7-vs2.1.1-rc28/kernel/ptrace.c
--- linux-2.6.17.7/kernel/ptrace.c 2006-06-18 04:55:31 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/ptrace.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/ptrace.c 2006-07-09 17:07:13 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/security.h>
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out_put_task_struct;
-diff -NurpP --minimal linux-2.6.17.7/kernel/sched.c linux-2.6.17.7-vs2.1.1-rc27/kernel/sched.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/sched.c linux-2.6.17.7-vs2.1.1-rc28/kernel/sched.c
--- linux-2.6.17.7/kernel/sched.c 2006-06-18 04:55:33 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/sched.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/sched.c 2006-07-09 17:07:13 +0200
@@ -53,6 +53,10 @@
#include <asm/tlb.h>
__activate_task(p, task_rq(p));
resched_task(rq->curr);
}
-diff -NurpP --minimal linux-2.6.17.7/kernel/sched_hard.h linux-2.6.17.7-vs2.1.1-rc27/kernel/sched_hard.h
+diff -NurpP --minimal linux-2.6.17.7/kernel/sched_hard.h linux-2.6.17.7-vs2.1.1-rc28/kernel/sched_hard.h
--- linux-2.6.17.7/kernel/sched_hard.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/sched_hard.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/sched_hard.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,324 @@
+
+#ifdef CONFIG_VSERVER_IDLELIMIT
+
+#endif /* CONFIG_VSERVER_HARDCPU */
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/sched_mon.h linux-2.6.17.7-vs2.1.1-rc27/kernel/sched_mon.h
+diff -NurpP --minimal linux-2.6.17.7/kernel/sched_mon.h linux-2.6.17.7-vs2.1.1-rc28/kernel/sched_mon.h
--- linux-2.6.17.7/kernel/sched_mon.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/sched_mon.h 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/sched_mon.h 2006-07-09 17:07:13 +0200
@@ -0,0 +1,188 @@
+
+#include <linux/vserver/monitor.h>
+
+#endif /* CONFIG_VSERVER_MONITOR */
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/signal.c linux-2.6.17.7-vs2.1.1-rc27/kernel/signal.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/signal.c linux-2.6.17.7-vs2.1.1-rc28/kernel/signal.c
--- linux-2.6.17.7/kernel/signal.c 2006-06-18 04:55:34 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/signal.c 2006-07-09 17:07:13 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/signal.c 2006-07-09 17:07:13 +0200
@@ -25,6 +25,7 @@
#include <linux/signal.h>
#include <linux/audit.h>
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-2.6.17.7/kernel/softirq.c linux-2.6.17.7-vs2.1.1-rc27/kernel/softirq.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/softirq.c linux-2.6.17.7-vs2.1.1-rc28/kernel/softirq.c
--- linux-2.6.17.7/kernel/softirq.c 2006-06-18 04:55:34 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/softirq.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/softirq.c 2006-07-09 17:07:14 +0200
@@ -17,6 +17,7 @@
#include <linux/kthread.h>
#include <linux/rcupdate.h>
__local_bh_enable();
}
-diff -NurpP --minimal linux-2.6.17.7/kernel/sys.c linux-2.6.17.7-vs2.1.1-rc27/kernel/sys.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/sys.c linux-2.6.17.7-vs2.1.1-rc28/kernel/sys.c
--- linux-2.6.17.7/kernel/sys.c 2006-07-27 19:19:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/sys.c 2006-07-26 21:36:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/sys.c 2006-07-26 21:36:47 +0200
@@ -11,6 +11,7 @@
#include <linux/mman.h>
#include <linux/smp_lock.h>
return -EPERM;
if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > NR_OPEN)
return -EPERM;
-diff -NurpP --minimal linux-2.6.17.7/kernel/sysctl.c linux-2.6.17.7-vs2.1.1-rc27/kernel/sysctl.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/sysctl.c linux-2.6.17.7-vs2.1.1-rc28/kernel/sysctl.c
--- linux-2.6.17.7/kernel/sysctl.c 2006-06-18 04:55:34 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/sysctl.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/sysctl.c 2006-07-09 17:07:14 +0200
@@ -46,6 +46,7 @@
#include <linux/syscalls.h>
#include <linux/nfs_fs.h>
return -EFAULT;
if (len < *lenp) {
if(put_user('\n', ((char __user *) buffer) + len))
-diff -NurpP --minimal linux-2.6.17.7/kernel/time.c linux-2.6.17.7-vs2.1.1-rc27/kernel/time.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/time.c linux-2.6.17.7-vs2.1.1-rc28/kernel/time.c
--- linux-2.6.17.7/kernel/time.c 2006-06-18 04:55:34 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/time.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/time.c 2006-07-09 17:07:14 +0200
@@ -61,7 +61,7 @@ asmlinkage long sys_time(time_t __user *
time_t i;
struct timeval tv;
tv->tv_sec = x.tv_sec;
tv->tv_nsec = x.tv_usec * NSEC_PER_USEC;
}
-diff -NurpP --minimal linux-2.6.17.7/kernel/timer.c linux-2.6.17.7-vs2.1.1-rc27/kernel/timer.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/timer.c linux-2.6.17.7-vs2.1.1-rc28/kernel/timer.c
--- linux-2.6.17.7/kernel/timer.c 2006-06-18 04:55:34 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/timer.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/timer.c 2006-07-09 17:07:14 +0200
+@@ -34,6 +34,9 @@
+ #include <linux/cpu.h>
+ #include <linux/syscalls.h>
+ #include <linux/delay.h>
++#include <linux/vs_cvirt.h>
++#include <linux/vs_pid.h>
++#include <linux/vserver/sched.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
@@ -953,12 +956,6 @@ asmlinkage unsigned long sys_alarm(unsig
#endif
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.17.7/kernel/user.c linux-2.6.17.7-vs2.1.1-rc27/kernel/user.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/user.c linux-2.6.17.7-vs2.1.1-rc28/kernel/user.c
--- linux-2.6.17.7/kernel/user.c 2006-06-18 04:55:35 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/user.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/user.c 2006-07-09 17:07:14 +0200
@@ -23,8 +23,8 @@
#define UIDHASH_BITS (CONFIG_BASE_SMALL ? 3 : 8)
#define UIDHASH_SZ (1 << UIDHASH_BITS)
spin_unlock_irq(&uidhash_lock);
return 0;
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/Kconfig linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/Kconfig
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/Kconfig linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/Kconfig
--- linux-2.6.17.7/kernel/vserver/Kconfig 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/Kconfig 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/Kconfig 2006-07-09 17:07:14 +0200
@@ -0,0 +1,265 @@
+#
+# Linux VServer configuration
+ depends on !VSERVER_NGNET
+ default y
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/Makefile linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/Makefile
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/Makefile linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/Makefile
--- linux-2.6.17.7/kernel/vserver/Makefile 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/Makefile 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/Makefile 2006-07-09 17:07:14 +0200
@@ -0,0 +1,17 @@
+#
+# Makefile for the Linux vserver routines.
+vserver-$(CONFIG_VSERVER_HISTORY) += history.o
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/context.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/context.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/cacct_init.h linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/cacct_init.h
+--- linux-2.6.17.7/kernel/vserver/cacct_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/cacct_init.h 2006-07-30 16:52:43 +0200
+@@ -0,0 +1,25 @@
++
++
++static inline void vx_info_init_cacct(struct _vx_cacct *cacct)
++{
++ int i,j;
++
++
++ for (i=0; i<6; i++) {
++ for (j=0; j<3; j++) {
++ atomic_set(&cacct->sock[i][j].count, 0);
++ atomic_set(&cacct->sock[i][j].total, 0);
++ }
++ }
++ for (i=0; i<8; i++)
++ atomic_set(&cacct->slab[i], 0);
++ for (i=0; i<5; i++)
++ for (j=0; j<4; j++)
++ atomic_set(&cacct->page[i][j], 0);
++}
++
++static inline void vx_info_exit_cacct(struct _vx_cacct *cacct)
++{
++ return;
++}
++
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/cacct_proc.h linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/cacct_proc.h
+--- linux-2.6.17.7/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/cacct_proc.h 2006-07-30 17:01:23 +0200
+@@ -0,0 +1,68 @@
++#ifndef _VX_CACCT_PROC_H
++#define _VX_CACCT_PROC_H
++
++
++static inline long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
++{
++ return atomic_read(&cacct->sock[type][pos].count);
++}
++
++
++static inline long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
++{
++ return atomic_read(&cacct->sock[type][pos].total);
++}
++
++
++#define VX_SOCKA_TOP \
++ "Type\t recv #/bytes\t\t send #/bytes\t\t fail #/bytes\n"
++
++static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer)
++{
++ int i,j, length = 0;
++ static char *type[] = {
++ "UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER" };
++
++ length += sprintf(buffer + length, VX_SOCKA_TOP);
++ for (i=0; i<6; i++) {
++ length += sprintf(buffer + length,
++ "%s:", type[i]);
++ for (j=0; j<3; j++) {
++ length += sprintf(buffer + length,
++ "\t%10lu/%-10lu"
++ ,vx_sock_count(cacct, i, j)
++ ,vx_sock_total(cacct, i, j)
++ );
++ }
++ buffer[length++] = '\n';
++ }
++
++ length += sprintf(buffer + length, "\n");
++ length += sprintf(buffer + length,
++ "slab:\t %8u %8u %8u %8u\n"
++ ,atomic_read(&cacct->slab[1])
++ ,atomic_read(&cacct->slab[4])
++ ,atomic_read(&cacct->slab[0])
++ ,atomic_read(&cacct->slab[2])
++ );
++
++ length += sprintf(buffer + length, "\n");
++ for (i=0; i<5; i++) {
++ length += sprintf(buffer + length,
++ "page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n"
++ ,i
++ ,atomic_read(&cacct->page[i][0])
++ ,atomic_read(&cacct->page[i][1])
++ ,atomic_read(&cacct->page[i][2])
++ ,atomic_read(&cacct->page[i][3])
++ ,atomic_read(&cacct->page[i][4])
++ ,atomic_read(&cacct->page[i][5])
++ ,atomic_read(&cacct->page[i][6])
++ ,atomic_read(&cacct->page[i][7])
++ );
++ }
++
++ return length;
++}
++
++#endif /* _VX_CACCT_PROC_H */
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/context.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/context.c
--- linux-2.6.17.7/kernel/vserver/context.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/context.c 2006-07-10 01:38:49 +0200
-@@ -0,0 +1,1005 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/context.c 2006-07-30 16:51:25 +0200
+@@ -0,0 +1,1025 @@
+/*
+ * linux/kernel/vserver/context.c
+ *
+#include <asm/errno.h>
+
+#include "cvirt_init.h"
++#include "cacct_init.h"
+#include "limit_init.h"
+#include "sched_init.h"
+
+
+ if (!p || !vxi)
+ BUG();
++
++ if (vx_info_flags(vxi, VXF_INFO_LOCK, 0))
++ return -EACCES;
++
+ new_user = alloc_uid(vxi->vx_id, p->uid);
+ if (!new_user)
+ return -ENOMEM;
+ if (!p || !vxi)
+ BUG();
+
-+ old_vxi = task_get_vx_info(p);
-+ if (old_vxi == vxi)
-+ goto out;
-+
+ vxdprintk(VXD_CBIT(xid, 5),
+ "vx_migrate_task(%p,%p[#%d.%d])", p, vxi,
+ vxi->vx_id, atomic_read(&vxi->vx_usecnt));
+
++ if (vx_info_flags(vxi, VXF_INFO_LOCK, 0))
++ return -EACCES;
++
++ old_vxi = task_get_vx_info(p);
++ if (old_vxi == vxi)
++ goto out;
++
+ if (!(ret = vx_migrate_user(p, vxi))) {
+ int openfd;
+
+ vx_set_persistent(new_vxi);
+
+ vs_state_change(new_vxi, VSC_STARTUP);
-+ ret = new_vxi->vx_id;
-+ vx_migrate_task(current, new_vxi);
++ ret = vx_migrate_task(current, new_vxi);
+ /* if this fails, we might end up with a hashed vx_info */
++ if (ret == 0)
++ ret = new_vxi->vx_id;
+ put_vx_info(new_vxi);
+ return ret;
+}
+int vc_ctx_migrate(struct vx_info *vxi, void __user *data)
+{
+ struct vcmd_ctx_migrate vc_data = { .flagword = 0 };
++ int ret;
+
+ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ vx_migrate_task(current, vxi);
++ ret = vx_migrate_task(current, vxi);
++ if (ret)
++ return ret;
+ if (vc_data.flagword & VXM_SET_INIT)
-+ vx_set_init(vxi, current);
++ ret = vx_set_init(vxi, current);
++ if (ret)
++ return ret;
+ if (vc_data.flagword & VXM_SET_REAPER)
-+ vx_set_reaper(vxi, current);
-+ return 0;
++ ret = vx_set_reaper(vxi, current);
++ return ret;
+}
+
+
+ if (trigger & VXF_STATE_SETUP)
+ vx_mask_cap_bset(vxi, current);
+ if (trigger & VXF_STATE_INIT) {
-+ vx_set_init(vxi, current);
-+ vx_set_reaper(vxi, current);
++ int ret;
++
++ ret = vx_set_init(vxi, current);
++ if (ret)
++ return ret;
++ ret = vx_set_reaper(vxi, current);
++ if (ret)
++ return ret;
+ }
+ }
+
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/cvirt.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/cvirt.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/cvirt.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/cvirt.c
--- linux-2.6.17.7/kernel/vserver/cvirt.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/cvirt.c 2006-07-27 19:45:26 +0200
-@@ -0,0 +1,288 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/cvirt.c 2006-07-30 16:50:56 +0200
+@@ -0,0 +1,289 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+ *
+#include <linux/vs_cvirt.h>
+#include <linux/vserver/switch.h>
+#include <linux/vserver/cvirt_cmd.h>
++#include <linux/vserver/cacct_cmd.h>
+
+#include <asm/errno.h>
+#include <asm/uaccess.h>
+
+#endif
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/cvirt_init.h linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/cvirt_init.h
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/cvirt_init.h linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/cvirt_init.h
--- linux-2.6.17.7/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/cvirt_init.h 2006-07-09 23:06:16 +0200
-@@ -0,0 +1,99 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/cvirt_init.h 2006-07-30 16:52:39 +0200
+@@ -0,0 +1,75 @@
+
+
+extern uint64_t vx_idle_jiffies(void);
+ return;
+}
+
-+
-+static inline void vx_info_init_cacct(struct _vx_cacct *cacct)
-+{
-+ int i,j;
-+
-+
-+ for (i=0; i<6; i++) {
-+ for (j=0; j<3; j++) {
-+ atomic_set(&cacct->sock[i][j].count, 0);
-+ atomic_set(&cacct->sock[i][j].total, 0);
-+ }
-+ }
-+ for (i=0; i<8; i++)
-+ atomic_set(&cacct->slab[i], 0);
-+ for (i=0; i<5; i++)
-+ for (j=0; j<4; j++)
-+ atomic_set(&cacct->page[i][j], 0);
-+}
-+
-+static inline void vx_info_exit_cacct(struct _vx_cacct *cacct)
-+{
-+ return;
-+}
-+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/cvirt_proc.h linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/cvirt_proc.h
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/cvirt_proc.h linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/cvirt_proc.h
--- linux-2.6.17.7/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/cvirt_proc.h 2006-07-10 01:53:57 +0200
-@@ -0,0 +1,130 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/cvirt_proc.h 2006-07-30 17:01:29 +0200
+@@ -0,0 +1,67 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
+
+ return length;
+}
+
-+static inline long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
-+{
-+ return atomic_read(&cacct->sock[type][pos].count);
-+}
-+
-+
-+static inline long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
-+{
-+ return atomic_read(&cacct->sock[type][pos].total);
-+}
-+
-+
-+#define VX_SOCKA_TOP \
-+ "Type\t recv #/bytes\t\t send #/bytes\t\t fail #/bytes\n"
-+
-+static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer)
-+{
-+ int i,j, length = 0;
-+ static char *type[] = {
-+ "UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER" };
-+
-+ length += sprintf(buffer + length, VX_SOCKA_TOP);
-+ for (i=0; i<6; i++) {
-+ length += sprintf(buffer + length,
-+ "%s:", type[i]);
-+ for (j=0; j<3; j++) {
-+ length += sprintf(buffer + length,
-+ "\t%10lu/%-10lu"
-+ ,vx_sock_count(cacct, i, j)
-+ ,vx_sock_total(cacct, i, j)
-+ );
-+ }
-+ buffer[length++] = '\n';
-+ }
-+
-+ length += sprintf(buffer + length, "\n");
-+ length += sprintf(buffer + length,
-+ "slab:\t %8u %8u %8u %8u\n"
-+ ,atomic_read(&cacct->slab[1])
-+ ,atomic_read(&cacct->slab[4])
-+ ,atomic_read(&cacct->slab[0])
-+ ,atomic_read(&cacct->slab[2])
-+ );
-+
-+ length += sprintf(buffer + length, "\n");
-+ for (i=0; i<5; i++) {
-+ length += sprintf(buffer + length,
-+ "page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n"
-+ ,i
-+ ,atomic_read(&cacct->page[i][0])
-+ ,atomic_read(&cacct->page[i][1])
-+ ,atomic_read(&cacct->page[i][2])
-+ ,atomic_read(&cacct->page[i][3])
-+ ,atomic_read(&cacct->page[i][4])
-+ ,atomic_read(&cacct->page[i][5])
-+ ,atomic_read(&cacct->page[i][6])
-+ ,atomic_read(&cacct->page[i][7])
-+ );
-+ }
-+
-+ return length;
-+}
-+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/debug.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/debug.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/debug.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/debug.c
--- linux-2.6.17.7/kernel/vserver/debug.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/debug.c 2006-07-09 17:07:14 +0200
-@@ -0,0 +1,36 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/debug.c 2006-07-30 16:50:27 +0200
+@@ -0,0 +1,37 @@
+/*
+ * kernel/vserver/debug.c
+ *
+#include <linux/module.h>
+
+#include <linux/vserver/cvirt_def.h>
++#include <linux/vserver/cacct_def.h>
+#include <linux/vserver/limit_def.h>
+#include <linux/vserver/sched_def.h>
+
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/dlimit.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/dlimit.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/dlimit.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/dlimit.c
--- linux-2.6.17.7/kernel/vserver/dlimit.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/dlimit.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/dlimit.c 2006-07-09 17:07:14 +0200
@@ -0,0 +1,530 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/helper.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/helper.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/helper.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/helper.c
--- linux-2.6.17.7/kernel/vserver/helper.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/helper.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/helper.c 2006-07-09 17:07:14 +0200
@@ -0,0 +1,210 @@
+/*
+ * linux/kernel/vserver/helper.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/history.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/history.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/history.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/history.c
--- linux-2.6.17.7/kernel/vserver/history.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/history.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/history.c 2006-07-09 17:07:14 +0200
@@ -0,0 +1,184 @@
+/*
+ * kernel/vserver/history.c
+
+EXPORT_SYMBOL_GPL(vxh_advance);
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/init.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/init.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/init.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/init.c
--- linux-2.6.17.7/kernel/vserver/init.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/init.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/init.c 2006-07-09 17:07:14 +0200
@@ -0,0 +1,46 @@
+/*
+ * linux/kernel/init.c
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/inode.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/inode.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/inode.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/inode.c
--- linux-2.6.17.7/kernel/vserver/inode.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/inode.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/inode.c 2006-07-09 17:07:14 +0200
@@ -0,0 +1,369 @@
+/*
+ * linux/kernel/vserver/inode.c
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/legacy.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/legacy.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/legacy.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/legacy.c
--- linux-2.6.17.7/kernel/vserver/legacy.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/legacy.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/legacy.c 2006-07-09 17:07:14 +0200
@@ -0,0 +1,115 @@
+/*
+ * linux/kernel/vserver/legacy.c
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/legacynet.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/legacynet.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/legacynet.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/legacynet.c
--- linux-2.6.17.7/kernel/vserver/legacynet.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/legacynet.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/legacynet.c 2006-07-09 17:07:14 +0200
@@ -0,0 +1,85 @@
+
+/*
+}
+
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/limit.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/limit.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/limit.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/limit.c
--- linux-2.6.17.7/kernel/vserver/limit.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/limit.c 2006-07-09 19:22:06 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/limit.c 2006-07-09 19:22:06 +0200
@@ -0,0 +1,273 @@
+/*
+ * linux/kernel/vserver/limit.c
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/limit_init.h linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/limit_init.h
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/limit_init.h linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/limit_init.h
--- linux-2.6.17.7/kernel/vserver/limit_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/limit_init.h 2006-07-12 14:16:06 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/limit_init.h 2006-07-12 14:16:06 +0200
@@ -0,0 +1,33 @@
+
+
+#endif
+}
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/limit_proc.h linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/limit_proc.h
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/limit_proc.h linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/limit_proc.h
--- linux-2.6.17.7/kernel/vserver/limit_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/limit_proc.h 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/limit_proc.h 2006-07-09 17:07:14 +0200
@@ -0,0 +1,71 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/monitor.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/monitor.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/monitor.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/monitor.c
--- linux-2.6.17.7/kernel/vserver/monitor.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/monitor.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/monitor.c 2006-07-09 17:07:14 +0200
@@ -0,0 +1,64 @@
+/*
+ * kernel/vserver/monitor.c
+
+EXPORT_SYMBOL_GPL(vxm_advance);
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/namespace.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/namespace.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/namespace.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/namespace.c
--- linux-2.6.17.7/kernel/vserver/namespace.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/namespace.c 2006-07-27 19:03:51 +0200
-@@ -0,0 +1,93 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/namespace.c 2006-07-30 03:46:39 +0200
+@@ -0,0 +1,101 @@
+/*
+ * linux/kernel/vserver/namespace.c
+ *
+ * Virtual Server: Context Namespace Support
+ *
-+ * Copyright (C) 2003-2005 Herbert Pötzl
++ * Copyright (C) 2003-2006 Herbert Pötzl
+ *
+ * V0.01 broken out from context.c 0.07
+ * V0.02 added task locking for namespace
++ * V0.03 broken out vx_enter_namespace
+ *
+ */
+
+
+#include <linux/namespace.h>
+
-+int vx_set_namespace(struct vx_info *vxi, struct namespace *ns, struct fs_struct *fs)
-+{
-+ struct fs_struct *fs_copy;
-+
-+ if (vxi->vx_namespace)
-+ return -EPERM;
-+ if (!ns || !fs)
-+ return -EINVAL;
-+
-+ fs_copy = copy_fs_struct(fs);
-+ if (!fs_copy)
-+ return -ENOMEM;
-+
-+ get_namespace(ns);
-+ vxi->vx_namespace = ns;
-+ vxi->vx_fs = fs_copy;
-+ return 0;
-+}
-+
-+int vc_enter_namespace(struct vx_info *vxi, void __user *data)
++int vx_enter_namespace(struct vx_info *vxi)
+{
+ struct fs_struct *old_fs, *fs;
+ struct namespace *old_ns;
+
++ if (vx_info_flags(vxi, VXF_INFO_LOCK, 0))
++ return -EACCES;
+ if (!vxi->vx_namespace)
+ return -EINVAL;
+
+ return 0;
+}
+
++int vx_set_namespace(struct vx_info *vxi, struct namespace *ns, struct fs_struct *fs)
++{
++ struct fs_struct *fs_copy;
++
++ if (vxi->vx_namespace)
++ return -EPERM;
++ if (!ns || !fs)
++ return -EINVAL;
++
++ fs_copy = copy_fs_struct(fs);
++ if (!fs_copy)
++ return -ENOMEM;
++
++ get_namespace(ns);
++ vxi->vx_namespace = ns;
++ vxi->vx_fs = fs_copy;
++ return 0;
++}
++
++int vc_enter_namespace(struct vx_info *vxi, void __user *data)
++{
++ return vx_enter_namespace(vxi);
++}
++
+int vc_set_namespace(struct vx_info *vxi, void __user *data)
+{
+ struct fs_struct *fs;
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/network.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/network.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/network.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/network.c
--- linux-2.6.17.7/kernel/vserver/network.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/network.c 2006-07-10 01:52:23 +0200
-@@ -0,0 +1,726 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/network.c 2006-07-30 03:14:46 +0200
+@@ -0,0 +1,728 @@
+/*
+ * linux/kernel/vserver/network.c
+ *
+ atomic_read(&nxi->nx_usecnt),
+ atomic_read(&nxi->nx_tasks));
+
++ if (nx_info_flags(nxi, NXF_INFO_LOCK, 0))
++ return -EACCES;
++
+ /* maybe disallow this completely? */
+ old_nxi = task_get_nx_info(p);
+ if (old_nxi == nxi)
+
+int vc_net_migrate(struct nx_info *nxi, void __user *data)
+{
-+ nx_migrate_task(current, nxi);
-+ return 0;
++ return nx_migrate_task(current, nxi);
+}
+
+int vc_net_add(struct nx_info *nxi, void __user *data)
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/proc.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/proc.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/proc.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/proc.c
--- linux-2.6.17.7/kernel/vserver/proc.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/proc.c 2006-07-09 17:07:14 +0200
-@@ -0,0 +1,921 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/proc.c 2006-07-30 17:07:36 +0200
+@@ -0,0 +1,922 @@
+/*
+ * linux/kernel/vserver/proc.c
+ *
+#include <asm/unistd.h>
+
+#include "cvirt_proc.h"
++#include "cacct_proc.h"
+#include "limit_proc.h"
+#include "sched_proc.h"
+#include "vci_config.h"
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/sched.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/sched.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/sched.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/sched.c
--- linux-2.6.17.7/kernel/vserver/sched.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/sched.c 2006-07-09 19:29:31 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/sched.c 2006-07-09 19:29:31 +0200
@@ -0,0 +1,314 @@
+/*
+ * linux/kernel/vserver/sched.c
+ return do_set_sched(vxi, &vc_data);
+}
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/sched_init.h linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/sched_init.h
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/sched_init.h linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/sched_init.h
--- linux-2.6.17.7/kernel/vserver/sched_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/sched_init.h 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/sched_init.h 2006-07-09 17:07:14 +0200
@@ -0,0 +1,47 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/sched_proc.h linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/sched_proc.h
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/sched_proc.h linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/sched_proc.h
--- linux-2.6.17.7/kernel/vserver/sched_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/sched_proc.h 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/sched_proc.h 2006-07-09 17:07:14 +0200
@@ -0,0 +1,59 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/signal.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/signal.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/signal.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/signal.c
--- linux-2.6.17.7/kernel/vserver/signal.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/signal.c 2006-07-10 01:52:23 +0200
-@@ -0,0 +1,124 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/signal.c 2006-07-30 03:19:01 +0200
+@@ -0,0 +1,128 @@
+/*
+ * linux/kernel/vserver/signal.c
+ *
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
++ /* special check to allow guest shutdown */
++ if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) && (vc_data.pid != 1))
++ return -EACCES;
++
+ return vx_info_kill(vxi, vc_data.pid, vc_data.sig);
+}
+
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/switch.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/switch.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/switch.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/switch.c
--- linux-2.6.17.7/kernel/vserver/switch.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/switch.c 2006-07-10 01:39:13 +0200
-@@ -0,0 +1,454 @@
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/switch.c 2006-07-30 16:51:10 +0200
+@@ -0,0 +1,472 @@
+/*
+ * linux/kernel/vserver/switch.c
+ *
+
+#include <linux/vserver/context_cmd.h>
+#include <linux/vserver/cvirt_cmd.h>
++#include <linux/vserver/cacct_cmd.h>
+#include <linux/vserver/limit_cmd.h>
+#include <linux/vserver/network_cmd.h>
+#include <linux/vserver/sched_cmd.h>
+ VC_VERSION(cmd), id, data, compat,
+ perm, args, flags);
+
-+ ret = -EPERM;
++ ret = -ENOSYS;
+ if (perm < 0)
+ goto out;
+
+ vxi = lookup_vx_info(id);
+ if (!vxi)
+ goto out;
++
++ if ((flags & VCF_ADMIN) &&
++ /* special case kill for shutdown */
++ (cmd != VCMD_ctx_kill) &&
++ /* can context be administrated? */
++ !vx_info_flags(vxi, VXF_STATE_ADMIN, 0)) {
++ ret = -EACCES;
++ goto out_vxi;
++ }
+ }
+ state = 7;
+ if (args & VCA_NXI) {
+ nxi = lookup_nx_info(id);
+ if (!nxi)
+ goto out_vxi;
++
++ if ((flags & VCF_ADMIN) &&
++ /* can context be administrated? */
++ !nx_info_flags(nxi, NXF_STATE_ADMIN, 0)) {
++ ret = -EACCES;
++ goto out_nxi;
++ }
+ }
+
+ state = 8;
+ ret = do_vcmd(cmd, id, vxi, nxi, data, compat);
+
++out_nxi:
+ if (args & VCA_NXI)
+ put_nx_info(nxi);
+out_vxi:
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/sysctl.c linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/sysctl.c
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/sysctl.c linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/sysctl.c
--- linux-2.6.17.7/kernel/vserver/sysctl.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/sysctl.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/sysctl.c 2006-07-09 17:07:14 +0200
@@ -0,0 +1,241 @@
+/*
+ * kernel/vserver/sysctl.c
+EXPORT_SYMBOL_GPL(vx_debug_cvirt);
+EXPORT_SYMBOL_GPL(vx_debug_misc);
+
-diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/vci_config.h linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/vci_config.h
+diff -NurpP --minimal linux-2.6.17.7/kernel/vserver/vci_config.h linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/vci_config.h
--- linux-2.6.17.7/kernel/vserver/vci_config.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/kernel/vserver/vci_config.h 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/kernel/vserver/vci_config.h 2006-07-09 17:07:14 +0200
@@ -0,0 +1,78 @@
+
+enum {
+ 0;
+}
+
-diff -NurpP --minimal linux-2.6.17.7/mm/filemap.c linux-2.6.17.7-vs2.1.1-rc27/mm/filemap.c
+diff -NurpP --minimal linux-2.6.17.7/mm/filemap.c linux-2.6.17.7-vs2.1.1-rc28/mm/filemap.c
--- linux-2.6.17.7/mm/filemap.c 2006-07-27 19:19:47 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/filemap.c 2006-07-26 21:36:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/filemap.c 2006-07-26 21:36:47 +0200
@@ -1174,6 +1174,31 @@ int file_send_actor(read_descriptor_t *
return written;
}
ssize_t generic_file_readv(struct file *filp, const struct iovec *iov,
unsigned long nr_segs, loff_t *ppos)
{
-diff -NurpP --minimal linux-2.6.17.7/mm/filemap_xip.c linux-2.6.17.7-vs2.1.1-rc27/mm/filemap_xip.c
+diff -NurpP --minimal linux-2.6.17.7/mm/filemap_xip.c linux-2.6.17.7-vs2.1.1-rc28/mm/filemap_xip.c
--- linux-2.6.17.7/mm/filemap_xip.c 2006-04-09 13:49:58 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/filemap_xip.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/filemap_xip.c 2006-07-09 17:07:14 +0200
@@ -13,6 +13,7 @@
#include <linux/module.h>
#include <linux/uio.h>
#include <asm/tlbflush.h>
#include "filemap.h"
-diff -NurpP --minimal linux-2.6.17.7/mm/fremap.c linux-2.6.17.7-vs2.1.1-rc27/mm/fremap.c
+diff -NurpP --minimal linux-2.6.17.7/mm/fremap.c linux-2.6.17.7-vs2.1.1-rc28/mm/fremap.c
--- linux-2.6.17.7/mm/fremap.c 2006-01-03 17:30:13 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/fremap.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/fremap.c 2006-07-09 17:07:14 +0200
@@ -15,6 +15,7 @@
#include <linux/rmap.h>
#include <linux/module.h>
if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte))
inc_mm_counter(mm, file_rss);
-diff -NurpP --minimal linux-2.6.17.7/mm/hugetlb.c linux-2.6.17.7-vs2.1.1-rc27/mm/hugetlb.c
+diff -NurpP --minimal linux-2.6.17.7/mm/hugetlb.c linux-2.6.17.7-vs2.1.1-rc28/mm/hugetlb.c
--- linux-2.6.17.7/mm/hugetlb.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/hugetlb.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/hugetlb.c 2006-07-09 17:07:14 +0200
@@ -19,6 +19,7 @@
#include <asm/pgtable.h>
#include "internal.h"
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-2.6.17.7/mm/memory.c linux-2.6.17.7-vs2.1.1-rc27/mm/memory.c
+diff -NurpP --minimal linux-2.6.17.7/mm/memory.c linux-2.6.17.7-vs2.1.1-rc28/mm/memory.c
--- linux-2.6.17.7/mm/memory.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/memory.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/memory.c 2006-07-09 17:07:14 +0200
@@ -1901,6 +1901,10 @@ again:
grab_swap_token();
}
}
/*
-diff -NurpP --minimal linux-2.6.17.7/mm/mempolicy.c linux-2.6.17.7-vs2.1.1-rc27/mm/mempolicy.c
+diff -NurpP --minimal linux-2.6.17.7/mm/mempolicy.c linux-2.6.17.7-vs2.1.1-rc28/mm/mempolicy.c
--- linux-2.6.17.7/mm/mempolicy.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/mempolicy.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/mempolicy.c 2006-07-09 17:07:14 +0200
@@ -87,6 +87,7 @@
#include <linux/seq_file.h>
#include <linux/proc_fs.h>
#include <asm/tlbflush.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.17.7/mm/mlock.c linux-2.6.17.7-vs2.1.1-rc27/mm/mlock.c
+diff -NurpP --minimal linux-2.6.17.7/mm/mlock.c linux-2.6.17.7-vs2.1.1-rc28/mm/mlock.c
--- linux-2.6.17.7/mm/mlock.c 2006-04-09 13:49:58 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/mlock.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/mlock.c 2006-07-09 17:07:14 +0200
@@ -10,6 +10,7 @@
#include <linux/mm.h>
#include <linux/mempolicy.h>
if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
-diff -NurpP --minimal linux-2.6.17.7/mm/mmap.c linux-2.6.17.7-vs2.1.1-rc27/mm/mmap.c
+diff -NurpP --minimal linux-2.6.17.7/mm/mmap.c linux-2.6.17.7-vs2.1.1-rc28/mm/mmap.c
--- linux-2.6.17.7/mm/mmap.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/mmap.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/mmap.c 2006-07-09 17:07:14 +0200
@@ -1122,10 +1122,10 @@ munmap_back:
kmem_cache_free(vm_area_cachep, vma);
}
+ return 0;
return 1;
}
-diff -NurpP --minimal linux-2.6.17.7/mm/mremap.c linux-2.6.17.7-vs2.1.1-rc27/mm/mremap.c
+diff -NurpP --minimal linux-2.6.17.7/mm/mremap.c linux-2.6.17.7-vs2.1.1-rc28/mm/mremap.c
--- linux-2.6.17.7/mm/mremap.c 2006-04-09 13:49:58 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/mremap.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/mremap.c 2006-07-09 17:07:14 +0200
@@ -18,6 +18,7 @@
#include <linux/highmem.h>
#include <linux/security.h>
make_pages_present(addr + old_len,
addr + new_len);
}
-diff -NurpP --minimal linux-2.6.17.7/mm/nommu.c linux-2.6.17.7-vs2.1.1-rc27/mm/nommu.c
+diff -NurpP --minimal linux-2.6.17.7/mm/nommu.c linux-2.6.17.7-vs2.1.1-rc28/mm/nommu.c
--- linux-2.6.17.7/mm/nommu.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/nommu.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/nommu.c 2006-07-09 17:07:14 +0200
@@ -820,7 +820,7 @@ unsigned long do_mmap_pgoff(struct file
realalloc += kobjsize(vma);
askedalloc += sizeof(*vma);
while ((tmp = mm->context.vmlist)) {
mm->context.vmlist = tmp->next;
-diff -NurpP --minimal linux-2.6.17.7/mm/oom_kill.c linux-2.6.17.7-vs2.1.1-rc27/mm/oom_kill.c
+diff -NurpP --minimal linux-2.6.17.7/mm/oom_kill.c linux-2.6.17.7-vs2.1.1-rc28/mm/oom_kill.c
--- linux-2.6.17.7/mm/oom_kill.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/oom_kill.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/oom_kill.c 2006-07-09 17:07:14 +0200
@@ -66,6 +66,8 @@ unsigned long badness(struct task_struct
*/
task_unlock(p);
/*
* We give our sacrificial lamb high priority and access to
-diff -NurpP --minimal linux-2.6.17.7/mm/page_alloc.c linux-2.6.17.7-vs2.1.1-rc27/mm/page_alloc.c
+diff -NurpP --minimal linux-2.6.17.7/mm/page_alloc.c linux-2.6.17.7-vs2.1.1-rc28/mm/page_alloc.c
--- linux-2.6.17.7/mm/page_alloc.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/page_alloc.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/page_alloc.c 2006-07-09 17:07:14 +0200
@@ -37,6 +37,7 @@
#include <linux/nodemask.h>
#include <linux/vmalloc.h>
}
#endif
-diff -NurpP --minimal linux-2.6.17.7/mm/rmap.c linux-2.6.17.7-vs2.1.1-rc27/mm/rmap.c
+diff -NurpP --minimal linux-2.6.17.7/mm/rmap.c linux-2.6.17.7-vs2.1.1-rc28/mm/rmap.c
--- linux-2.6.17.7/mm/rmap.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/rmap.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/rmap.c 2006-07-09 17:07:14 +0200
@@ -53,6 +53,7 @@
#include <linux/rmap.h>
#include <linux/rcupdate.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.17.7/mm/shmem.c linux-2.6.17.7-vs2.1.1-rc27/mm/shmem.c
+diff -NurpP --minimal linux-2.6.17.7/mm/shmem.c linux-2.6.17.7-vs2.1.1-rc28/mm/shmem.c
--- linux-2.6.17.7/mm/shmem.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/shmem.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/shmem.c 2006-07-09 17:07:14 +0200
@@ -53,7 +53,6 @@
#include <asm/pgtable.h>
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-2.6.17.7/mm/slab.c linux-2.6.17.7-vs2.1.1-rc27/mm/slab.c
+diff -NurpP --minimal linux-2.6.17.7/mm/slab.c linux-2.6.17.7-vs2.1.1-rc28/mm/slab.c
--- linux-2.6.17.7/mm/slab.c 2006-06-18 04:55:37 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/slab.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/slab.c 2006-07-09 17:07:14 +0200
@@ -489,6 +489,8 @@ struct kmem_cache {
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
/* Make sure we are not freeing a object from another
* node to the array cache on this cpu.
-diff -NurpP --minimal linux-2.6.17.7/mm/slab_vs.h linux-2.6.17.7-vs2.1.1-rc27/mm/slab_vs.h
+diff -NurpP --minimal linux-2.6.17.7/mm/slab_vs.h linux-2.6.17.7-vs2.1.1-rc28/mm/slab_vs.h
--- linux-2.6.17.7/mm/slab_vs.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/slab_vs.h 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/slab_vs.h 2006-07-09 17:07:14 +0200
@@ -0,0 +1,23 @@
+
+static inline
+ atomic_sub(cachep->buffer_size, ¤t->vx_info->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-2.6.17.7/mm/swapfile.c linux-2.6.17.7-vs2.1.1-rc27/mm/swapfile.c
+diff -NurpP --minimal linux-2.6.17.7/mm/swapfile.c linux-2.6.17.7-vs2.1.1-rc28/mm/swapfile.c
--- linux-2.6.17.7/mm/swapfile.c 2006-06-18 04:55:37 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/swapfile.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/swapfile.c 2006-07-09 17:07:14 +0200
@@ -32,6 +32,7 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
}
/*
-diff -NurpP --minimal linux-2.6.17.7/mm/vmscan.c linux-2.6.17.7-vs2.1.1-rc27/mm/vmscan.c
+diff -NurpP --minimal linux-2.6.17.7/mm/vmscan.c linux-2.6.17.7-vs2.1.1-rc28/mm/vmscan.c
--- linux-2.6.17.7/mm/vmscan.c 2006-06-18 04:55:37 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/mm/vmscan.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/mm/vmscan.c 2006-07-09 17:07:14 +0200
@@ -1357,7 +1357,7 @@ static int __init kswapd_init(void)
pid = kernel_thread(kswapd, pgdat, CLONE_KERNEL);
BUG_ON(pid < 0);
read_unlock(&tasklist_lock);
}
total_memory = nr_free_pagecache_pages();
-diff -NurpP --minimal linux-2.6.17.7/net/core/dev.c linux-2.6.17.7-vs2.1.1-rc27/net/core/dev.c
+diff -NurpP --minimal linux-2.6.17.7/net/core/dev.c linux-2.6.17.7-vs2.1.1-rc28/net/core/dev.c
--- linux-2.6.17.7/net/core/dev.c 2006-07-27 19:19:48 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/core/dev.c 2006-07-26 21:36:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/core/dev.c 2006-07-26 21:36:47 +0200
@@ -115,6 +115,7 @@
#include <net/iw_handler.h>
#include <asm/current.h>
if (dev->get_stats) {
struct net_device_stats *stats = dev->get_stats(dev);
-diff -NurpP --minimal linux-2.6.17.7/net/core/rtnetlink.c linux-2.6.17.7-vs2.1.1-rc27/net/core/rtnetlink.c
+diff -NurpP --minimal linux-2.6.17.7/net/core/rtnetlink.c linux-2.6.17.7-vs2.1.1-rc28/net/core/rtnetlink.c
--- linux-2.6.17.7/net/core/rtnetlink.c 2006-06-18 04:55:39 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/core/rtnetlink.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/core/rtnetlink.c 2006-07-09 17:07:14 +0200
@@ -323,6 +323,9 @@ static int rtnetlink_dump_ifinfo(struct
for (dev=dev_base, idx=0; dev; dev = dev->next, idx++) {
if (idx < s_idx)
skb = alloc_skb(size, GFP_KERNEL);
if (!skb)
return;
-diff -NurpP --minimal linux-2.6.17.7/net/core/sock.c linux-2.6.17.7-vs2.1.1-rc27/net/core/sock.c
+diff -NurpP --minimal linux-2.6.17.7/net/core/sock.c linux-2.6.17.7-vs2.1.1-rc28/net/core/sock.c
--- linux-2.6.17.7/net/core/sock.c 2006-06-18 04:55:39 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/core/sock.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/core/sock.c 2006-07-09 17:07:14 +0200
@@ -125,6 +125,9 @@
#include <linux/ipsec.h>
atomic_set(&sk->sk_refcnt, 1);
}
-diff -NurpP --minimal linux-2.6.17.7/net/ipv4/af_inet.c linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/af_inet.c
+diff -NurpP --minimal linux-2.6.17.7/net/ipv4/af_inet.c linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/af_inet.c
--- linux-2.6.17.7/net/ipv4/af_inet.c 2006-06-18 04:55:43 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/af_inet.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/af_inet.c 2006-07-09 17:07:14 +0200
@@ -114,6 +114,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->saddr = 0; /* Use device */
-diff -NurpP --minimal linux-2.6.17.7/net/ipv4/devinet.c linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/devinet.c
+diff -NurpP --minimal linux-2.6.17.7/net/ipv4/devinet.c linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/devinet.c
--- linux-2.6.17.7/net/ipv4/devinet.c 2006-06-18 04:55:43 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/devinet.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/devinet.c 2006-07-09 17:07:14 +0200
@@ -609,6 +609,9 @@ int devinet_ioctl(unsigned int cmd, void
*colon = ':';
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
-diff -NurpP --minimal linux-2.6.17.7/net/ipv4/fib_hash.c linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/fib_hash.c
+diff -NurpP --minimal linux-2.6.17.7/net/ipv4/fib_hash.c linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/fib_hash.c
--- linux-2.6.17.7/net/ipv4/fib_hash.c 2006-04-09 13:49:59 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/fib_hash.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/fib_hash.c 2006-07-09 17:07:14 +0200
@@ -989,6 +989,8 @@ static unsigned fib_flag_trans(int type,
return flags;
}
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.17.7/net/ipv4/inet_connection_sock.c linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/inet_connection_sock.c
+diff -NurpP --minimal linux-2.6.17.7/net/ipv4/inet_connection_sock.c linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/inet_connection_sock.c
--- linux-2.6.17.7/net/ipv4/inet_connection_sock.c 2006-06-18 04:55:43 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/inet_connection_sock.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/inet_connection_sock.c 2006-07-09 17:07:14 +0200
@@ -40,7 +40,6 @@ int sysctl_local_port_range[2] = { 1024,
int inet_csk_bind_conflict(const struct sock *sk,
const struct inet_bind_bucket *tb)
break;
}
}
-diff -NurpP --minimal linux-2.6.17.7/net/ipv4/inet_diag.c linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/inet_diag.c
+diff -NurpP --minimal linux-2.6.17.7/net/ipv4/inet_diag.c linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/inet_diag.c
--- linux-2.6.17.7/net/ipv4/inet_diag.c 2006-04-09 13:49:59 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/inet_diag.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/inet_diag.c 2006-07-09 17:07:14 +0200
@@ -694,6 +694,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);
if (num < s_num)
goto next_dying;
if (r->id.idiag_sport != tw->tw_sport &&
-diff -NurpP --minimal linux-2.6.17.7/net/ipv4/inet_hashtables.c linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/inet_hashtables.c
+diff -NurpP --minimal linux-2.6.17.7/net/ipv4/inet_hashtables.c linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/inet_hashtables.c
--- linux-2.6.17.7/net/ipv4/inet_hashtables.c 2006-06-18 04:55:43 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/inet_hashtables.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/inet_hashtables.c 2006-07-09 17:07:14 +0200
@@ -139,11 +139,10 @@ struct sock *__inet_lookup_listener(cons
const __u32 rcv_saddr = inet->rcv_saddr;
int score = sk->sk_family == PF_INET ? 1 : 0;
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
continue;
-diff -NurpP --minimal linux-2.6.17.7/net/ipv4/raw.c linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/raw.c
+diff -NurpP --minimal linux-2.6.17.7/net/ipv4/raw.c linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/raw.c
--- linux-2.6.17.7/net/ipv4/raw.c 2006-06-18 04:55:45 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/raw.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/raw.c 2006-07-09 17:07:14 +0200
@@ -102,6 +102,27 @@ static void raw_v4_unhash(struct sock *s
write_unlock_bh(&raw_v4_lock);
}
if (!sk && ++state->bucket < RAWV4_HTABLE_SIZE) {
sk = sk_head(&raw_v4_htable[state->bucket]);
-diff -NurpP --minimal linux-2.6.17.7/net/ipv4/tcp.c linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/tcp.c
+diff -NurpP --minimal linux-2.6.17.7/net/ipv4/tcp.c linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/tcp.c
--- linux-2.6.17.7/net/ipv4/tcp.c 2006-06-18 04:55:45 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/tcp.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/tcp.c 2006-07-09 17:07:14 +0200
@@ -258,6 +258,7 @@
#include <linux/random.h>
#include <linux/bootmem.h>
#include <net/icmp.h>
#include <net/tcp.h>
-diff -NurpP --minimal linux-2.6.17.7/net/ipv4/tcp_ipv4.c linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/tcp_ipv4.c
+diff -NurpP --minimal linux-2.6.17.7/net/ipv4/tcp_ipv4.c linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/tcp_ipv4.c
--- linux-2.6.17.7/net/ipv4/tcp_ipv4.c 2006-06-18 04:55:45 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/tcp_ipv4.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/tcp_ipv4.c 2006-07-09 17:07:14 +0200
@@ -77,6 +77,7 @@
#include <linux/stddef.h>
#include <linux/proc_fs.h>
if (sk->sk_family == st->family)
goto found;
}
-diff -NurpP --minimal linux-2.6.17.7/net/ipv4/tcp_minisocks.c linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/tcp_minisocks.c
+diff -NurpP --minimal linux-2.6.17.7/net/ipv4/tcp_minisocks.c linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/tcp_minisocks.c
--- linux-2.6.17.7/net/ipv4/tcp_minisocks.c 2006-04-09 13:49:59 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/tcp_minisocks.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/tcp_minisocks.c 2006-07-09 17:07:14 +0200
@@ -29,6 +29,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-2.6.17.7/net/ipv4/udp.c linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/udp.c
+diff -NurpP --minimal linux-2.6.17.7/net/ipv4/udp.c linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/udp.c
--- linux-2.6.17.7/net/ipv4/udp.c 2006-06-18 04:55:45 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/ipv4/udp.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/ipv4/udp.c 2006-07-09 17:07:14 +0200
@@ -176,14 +176,12 @@ gotit:
struct inet_sock *inet2 = inet_sk(sk2);
if (!sk && ++state->bucket < UDP_HTABLE_SIZE) {
sk = sk_head(&udp_hash[state->bucket]);
-diff -NurpP --minimal linux-2.6.17.7/net/ipv6/addrconf.c linux-2.6.17.7-vs2.1.1-rc27/net/ipv6/addrconf.c
+diff -NurpP --minimal linux-2.6.17.7/net/ipv6/addrconf.c linux-2.6.17.7-vs2.1.1-rc28/net/ipv6/addrconf.c
--- linux-2.6.17.7/net/ipv6/addrconf.c 2006-07-27 19:19:48 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/ipv6/addrconf.c 2006-07-26 21:36:47 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/ipv6/addrconf.c 2006-07-26 21:36:47 +0200
@@ -2654,7 +2654,10 @@ static void if6_seq_stop(struct seq_file
static int if6_seq_show(struct seq_file *seq, void *v)
{
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.17.7/net/netlink/af_netlink.c linux-2.6.17.7-vs2.1.1-rc27/net/netlink/af_netlink.c
+diff -NurpP --minimal linux-2.6.17.7/net/netlink/af_netlink.c linux-2.6.17.7-vs2.1.1-rc28/net/netlink/af_netlink.c
--- linux-2.6.17.7/net/netlink/af_netlink.c 2006-06-18 04:55:50 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/netlink/af_netlink.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/netlink/af_netlink.c 2006-07-09 17:07:14 +0200
@@ -57,6 +57,9 @@
#include <linux/types.h>
#include <linux/audit.h>
#include <net/sock.h>
#include <net/scm.h>
-diff -NurpP --minimal linux-2.6.17.7/net/socket.c linux-2.6.17.7-vs2.1.1-rc27/net/socket.c
+diff -NurpP --minimal linux-2.6.17.7/net/socket.c linux-2.6.17.7-vs2.1.1-rc28/net/socket.c
--- linux-2.6.17.7/net/socket.c 2006-06-18 04:55:52 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/socket.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/socket.c 2006-07-09 17:07:14 +0200
@@ -94,6 +94,7 @@
#include <net/sock.h>
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-2.6.17.7/net/sunrpc/auth.c linux-2.6.17.7-vs2.1.1-rc27/net/sunrpc/auth.c
+diff -NurpP --minimal linux-2.6.17.7/net/sunrpc/auth.c linux-2.6.17.7-vs2.1.1-rc28/net/sunrpc/auth.c
--- linux-2.6.17.7/net/sunrpc/auth.c 2006-06-18 04:55:52 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/sunrpc/auth.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/sunrpc/auth.c 2006-07-09 17:07:14 +0200
@@ -13,6 +13,7 @@
#include <linux/errno.h>
#include <linux/sunrpc/clnt.h>
.group_info = current->group_info,
};
struct rpc_cred *ret;
-diff -NurpP --minimal linux-2.6.17.7/net/sunrpc/auth_unix.c linux-2.6.17.7-vs2.1.1-rc27/net/sunrpc/auth_unix.c
+diff -NurpP --minimal linux-2.6.17.7/net/sunrpc/auth_unix.c linux-2.6.17.7-vs2.1.1-rc28/net/sunrpc/auth_unix.c
--- linux-2.6.17.7/net/sunrpc/auth_unix.c 2006-02-18 14:40:43 +0100
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/sunrpc/auth_unix.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/sunrpc/auth_unix.c 2006-07-09 17:07:14 +0200
@@ -11,12 +11,14 @@
#include <linux/module.h>
#include <linux/sunrpc/clnt.h>
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
*p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-2.6.17.7/net/sunrpc/clnt.c linux-2.6.17.7-vs2.1.1-rc27/net/sunrpc/clnt.c
+diff -NurpP --minimal linux-2.6.17.7/net/sunrpc/clnt.c linux-2.6.17.7-vs2.1.1-rc28/net/sunrpc/clnt.c
--- linux-2.6.17.7/net/sunrpc/clnt.c 2006-06-18 04:55:52 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/sunrpc/clnt.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/sunrpc/clnt.c 2006-07-09 17:07:14 +0200
@@ -29,6 +29,7 @@
#include <linux/slab.h>
#include <linux/utsname.h>
return clnt;
out_no_auth:
-diff -NurpP --minimal linux-2.6.17.7/net/unix/af_unix.c linux-2.6.17.7-vs2.1.1-rc27/net/unix/af_unix.c
+diff -NurpP --minimal linux-2.6.17.7/net/unix/af_unix.c linux-2.6.17.7-vs2.1.1-rc28/net/unix/af_unix.c
--- linux-2.6.17.7/net/unix/af_unix.c 2006-06-18 04:55:56 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/unix/af_unix.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/unix/af_unix.c 2006-07-09 17:07:14 +0200
@@ -117,6 +117,9 @@
#include <linux/mount.h>
#include <net/checksum.h>
if (err)
goto out_mknod_dput;
mutex_unlock(&nd.dentry->d_inode->i_mutex);
-diff -NurpP --minimal linux-2.6.17.7/net/x25/af_x25.c linux-2.6.17.7-vs2.1.1-rc27/net/x25/af_x25.c
+diff -NurpP --minimal linux-2.6.17.7/net/x25/af_x25.c linux-2.6.17.7-vs2.1.1-rc28/net/x25/af_x25.c
--- linux-2.6.17.7/net/x25/af_x25.c 2006-06-18 04:55:56 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/net/x25/af_x25.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/net/x25/af_x25.c 2006-07-09 17:07:14 +0200
@@ -502,7 +502,10 @@ static int x25_create(struct socket *soc
x25 = x25_sk(sk);
x25_init_timers(sk);
-diff -NurpP --minimal linux-2.6.17.7/security/commoncap.c linux-2.6.17.7-vs2.1.1-rc27/security/commoncap.c
+diff -NurpP --minimal linux-2.6.17.7/security/commoncap.c linux-2.6.17.7-vs2.1.1-rc28/security/commoncap.c
--- linux-2.6.17.7/security/commoncap.c 2006-06-18 04:55:57 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/security/commoncap.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/security/commoncap.c 2006-07-09 17:07:14 +0200
@@ -27,7 +27,7 @@
int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
return -EPERM;
return 0;
}
-diff -NurpP --minimal linux-2.6.17.7/security/dummy.c linux-2.6.17.7-vs2.1.1-rc27/security/dummy.c
+diff -NurpP --minimal linux-2.6.17.7/security/dummy.c linux-2.6.17.7-vs2.1.1-rc28/security/dummy.c
--- linux-2.6.17.7/security/dummy.c 2006-06-18 04:55:57 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/security/dummy.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/security/dummy.c 2006-07-09 17:07:14 +0200
@@ -85,7 +85,7 @@ static int dummy_sysctl (ctl_table * tab
return 0;
}
return 0;
}
-diff -NurpP --minimal linux-2.6.17.7/security/selinux/hooks.c linux-2.6.17.7-vs2.1.1-rc27/security/selinux/hooks.c
+diff -NurpP --minimal linux-2.6.17.7/security/selinux/hooks.c linux-2.6.17.7-vs2.1.1-rc28/security/selinux/hooks.c
--- linux-2.6.17.7/security/selinux/hooks.c 2006-06-18 04:55:58 +0200
-+++ linux-2.6.17.7-vs2.1.1-rc27/security/selinux/hooks.c 2006-07-09 17:07:14 +0200
++++ linux-2.6.17.7-vs2.1.1-rc28/security/selinux/hooks.c 2006-07-09 17:07:14 +0200
@@ -1379,9 +1379,10 @@ static int selinux_sysctl(ctl_table *tab
return error;
}
if (!sb)
return 0;
---- linux-2.6.17/kernel/timer.c.org 2006-07-31 10:46:10.000000000 +0000
-+++ linux-2.6.17/kernel/timer.c 2006-07-31 10:47:34.000000000 +0000
-@@ -35,6 +35,9 @@
- #include <linux/syscalls.h>
- #include <linux/delay.h>
- #include <linux/freezer.h>
-+#include <linux/vs_cvirt.h>
-+#include <linux/vs_pid.h>
-+#include <linux/vserver/sched.h>
-
- #include <asm/uaccess.h>
- #include <asm/unistd.h>
projects / packages / kernel.git / commitdiff