SOURCES (LINUX_2_6): linux-2.6-vs2.1.patch - vs2.1.1-rc31 for 2.6....

hawk hawk at pld-linux.org
Tue Aug 29 14:55:48 CEST 2006


Author: hawk                         Date: Tue Aug 29 12:55:48 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- vs2.1.1-rc31 for 2.6.17.11

---- Files affected:
SOURCES:
   linux-2.6-vs2.1.patch (1.1.2.31 -> 1.1.2.32) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.31 SOURCES/linux-2.6-vs2.1.patch:1.1.2.32
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.31	Tue Aug 29 14:00:22 2006
+++ SOURCES/linux-2.6-vs2.1.patch	Tue Aug 29 14:55:41 2006
@@ -1,6 +1,6 @@
-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-rc28/Documentation/vserver/debug.txt	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/Documentation/vserver/debug.txt linux-2.6.17.11-vs2.1.1-rc31/Documentation/vserver/debug.txt
+--- linux-2.6.17.11/Documentation/vserver/debug.txt	1970-01-01 01:00:00 +0100
++++ linux-2.6.17.11-vs2.1.1-rc31/Documentation/vserver/debug.txt	2006-07-09 17:06:47 +0200
 @@ -0,0 +1,108 @@
 +
 +debug_cvirt:
@@ -110,9 +110,9 @@
 + 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/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-rc28/arch/alpha/Kconfig	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/alpha/Kconfig linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/Kconfig
+--- linux-2.6.17.11/arch/alpha/Kconfig	2006-06-18 04:51:38 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/Kconfig	2006-07-09 17:06:47 +0200
 @@ -632,6 +632,8 @@ source "arch/alpha/oprofile/Kconfig"
  
  source "arch/alpha/Kconfig.debug"
@@ -122,9 +122,9 @@
  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-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-rc28/arch/alpha/kernel/asm-offsets.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/alpha/kernel/asm-offsets.c linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.17.11/arch/alpha/kernel/asm-offsets.c	2006-02-15 13:54:10 +0100
++++ linux-2.6.17.11-vs2.1.1-rc31/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);
@@ -133,9 +133,9 @@
  	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-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-rc28/arch/alpha/kernel/entry.S	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/alpha/kernel/entry.S linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/entry.S
+--- linux-2.6.17.11/arch/alpha/kernel/entry.S	2006-04-09 13:49:39 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/entry.S	2006-07-09 17:06:47 +0200
 @@ -645,7 +645,7 @@ kernel_thread:
  	stq	$2, 152($sp)		/* HAE */
  
@@ -177,9 +177,9 @@
  	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-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-rc28/arch/alpha/kernel/osf_sys.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/alpha/kernel/osf_sys.c linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.17.11/arch/alpha/kernel/osf_sys.c	2006-06-18 04:51:38 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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>
@@ -288,9 +288,9 @@
  		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-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-rc28/arch/alpha/kernel/ptrace.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/alpha/kernel/ptrace.c linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/ptrace.c
+--- linux-2.6.17.11/arch/alpha/kernel/ptrace.c	2006-04-09 13:49:39 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/ptrace.c	2006-08-06 06:00:35 +0200
 @@ -15,6 +15,7 @@
  #include <linux/slab.h>
  #include <linux/security.h>
@@ -303,7 +303,7 @@
  		goto out_notsk;
  	}
  
-+	if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT)) {
++	if (!vx_check(vx_task_xid(child), VX_WATCH_P|VX_IDENT)) {
 +		ret = -EPERM;
 +		goto out;
 +	}
@@ -311,9 +311,9 @@
  	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-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-rc28/arch/alpha/kernel/systbls.S	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/alpha/kernel/systbls.S linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/systbls.S
+--- linux-2.6.17.11/arch/alpha/kernel/systbls.S	2005-08-29 22:24:49 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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
@@ -323,9 +323,9 @@
  	.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-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-rc28/arch/alpha/kernel/traps.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/alpha/kernel/traps.c linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/traps.c
+--- linux-2.6.17.11/arch/alpha/kernel/traps.c	2005-10-28 20:49:08 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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());
@@ -336,9 +336,9 @@
  	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-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-rc28/arch/alpha/mm/init.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/alpha/mm/init.c linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/mm/init.c
+--- linux-2.6.17.11/arch/alpha/mm/init.c	2006-06-18 04:51:38 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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 */
@@ -347,9 +347,9 @@
  
  #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-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-rc28/arch/arm/Kconfig	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/arm/Kconfig linux-2.6.17.11-vs2.1.1-rc31/arch/arm/Kconfig
+--- linux-2.6.17.11/arch/arm/Kconfig	2006-06-18 04:51:38 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/arm/Kconfig	2006-07-09 17:06:47 +0200
 @@ -873,6 +873,8 @@ source "arch/arm/oprofile/Kconfig"
  
  source "arch/arm/Kconfig.debug"
@@ -359,9 +359,9 @@
  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-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-rc28/arch/arm/kernel/calls.S	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/arm/kernel/calls.S linux-2.6.17.11-vs2.1.1-rc31/arch/arm/kernel/calls.S
+--- linux-2.6.17.11/arch/arm/kernel/calls.S	2006-02-18 14:39:40 +0100
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/arm/kernel/calls.S	2006-07-09 17:06:47 +0200
 @@ -322,7 +322,7 @@
  /* 310 */	CALL(sys_request_key)
  		CALL(sys_keyctl)
@@ -371,9 +371,9 @@
  		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-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-rc28/arch/arm/kernel/process.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/arm/kernel/process.c linux-2.6.17.11-vs2.1.1-rc31/arch/arm/kernel/process.c
+--- linux-2.6.17.11/arch/arm/kernel/process.c	2006-06-18 04:51:42 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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)
  {
@@ -394,9 +394,9 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-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-rc28/arch/arm26/Kconfig	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/arm26/Kconfig linux-2.6.17.11-vs2.1.1-rc31/arch/arm26/Kconfig
+--- linux-2.6.17.11/arch/arm26/Kconfig	2006-06-18 04:51:48 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/arm26/Kconfig	2006-07-09 17:06:47 +0200
 @@ -234,6 +234,8 @@ source "drivers/usb/Kconfig"
  
  source "arch/arm26/Kconfig.debug"
@@ -406,9 +406,9 @@
  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-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-rc28/arch/arm26/kernel/calls.S	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/arm26/kernel/calls.S linux-2.6.17.11-vs2.1.1-rc31/arch/arm26/kernel/calls.S
+--- linux-2.6.17.11/arch/arm26/kernel/calls.S	2005-03-02 12:38:19 +0100
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/arm26/kernel/calls.S	2006-07-09 17:06:47 +0200
 @@ -257,6 +257,11 @@ __syscall_start:
  		.long	sys_lremovexattr
  		.long	sys_fremovexattr
@@ -421,9 +421,9 @@
  __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-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-rc28/arch/arm26/kernel/process.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/arm26/kernel/process.c linux-2.6.17.11-vs2.1.1-rc31/arch/arm26/kernel/process.c
+--- linux-2.6.17.11/arch/arm26/kernel/process.c	2006-01-18 06:07:51 +0100
++++ linux-2.6.17.11-vs2.1.1-rc31/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;
@@ -434,9 +434,9 @@
  }
  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-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-rc28/arch/arm26/kernel/traps.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/arm26/kernel/traps.c linux-2.6.17.11-vs2.1.1-rc31/arch/arm26/kernel/traps.c
+--- linux-2.6.17.11/arch/arm26/kernel/traps.c	2006-06-18 04:51:48 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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());
@@ -449,9 +449,9 @@
  
  	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-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-rc28/arch/cris/Kconfig	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/cris/Kconfig linux-2.6.17.11-vs2.1.1-rc31/arch/cris/Kconfig
+--- linux-2.6.17.11/arch/cris/Kconfig	2006-06-18 04:51:48 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/cris/Kconfig	2006-07-09 17:06:47 +0200
 @@ -181,6 +181,8 @@ source "drivers/usb/Kconfig"
  
  source "arch/cris/Kconfig.debug"
@@ -461,9 +461,9 @@
  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-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-rc28/arch/cris/arch-v10/kernel/process.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/cris/arch-v10/kernel/process.c linux-2.6.17.11-vs2.1.1-rc31/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.17.11/arch/cris/arch-v10/kernel/process.c	2006-01-18 06:07:51 +0100
++++ linux-2.6.17.11-vs2.1.1-rc31/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;
  
@@ -474,9 +474,9 @@
  }
  
  /* 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-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-rc28/arch/cris/arch-v32/kernel/process.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/cris/arch-v32/kernel/process.c linux-2.6.17.11-vs2.1.1-rc31/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.17.11/arch/cris/arch-v32/kernel/process.c	2006-01-18 06:07:51 +0100
++++ linux-2.6.17.11-vs2.1.1-rc31/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);
  
@@ -487,9 +487,9 @@
  }
  
  /*
-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-rc28/arch/frv/kernel/kernel_thread.S	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/frv/kernel/kernel_thread.S linux-2.6.17.11-vs2.1.1-rc31/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.17.11/arch/frv/kernel/kernel_thread.S	2005-03-02 12:38:20 +0100
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/frv/kernel/kernel_thread.S	2006-07-09 17:06:47 +0200
 @@ -13,6 +13,8 @@
  #include <asm/unistd.h>
  
@@ -508,9 +508,9 @@
  	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-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-rc28/arch/frv/mm/mmu-context.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/frv/mm/mmu-context.c linux-2.6.17.11-vs2.1.1-rc31/arch/frv/mm/mmu-context.c
+--- linux-2.6.17.11/arch/frv/mm/mmu-context.c	2006-06-18 04:51:49 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/frv/mm/mmu-context.c	2006-07-09 17:06:47 +0200
 @@ -11,6 +11,7 @@
  
  #include <linux/sched.h>
@@ -519,9 +519,9 @@
  #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-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-rc28/arch/h8300/Kconfig	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/h8300/Kconfig linux-2.6.17.11-vs2.1.1-rc31/arch/h8300/Kconfig
+--- linux-2.6.17.11/arch/h8300/Kconfig	2006-06-18 04:51:49 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/h8300/Kconfig	2006-07-09 17:06:47 +0200
 @@ -199,6 +199,8 @@ source "fs/Kconfig"
  
  source "arch/h8300/Kconfig.debug"
@@ -531,9 +531,9 @@
  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-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-rc28/arch/h8300/kernel/process.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/h8300/kernel/process.c linux-2.6.17.11-vs2.1.1-rc31/arch/h8300/kernel/process.c
+--- linux-2.6.17.11/arch/h8300/kernel/process.c	2006-06-18 04:51:49 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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();
@@ -543,9 +543,9 @@
  	__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-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-rc28/arch/i386/Kconfig	2006-07-26 21:36:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/i386/Kconfig linux-2.6.17.11-vs2.1.1-rc31/arch/i386/Kconfig
+--- linux-2.6.17.11/arch/i386/Kconfig	2006-08-25 00:25:37 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/i386/Kconfig	2006-07-26 21:36:47 +0200
 @@ -1088,6 +1088,8 @@ endmenu
  
  source "arch/i386/Kconfig.debug"
@@ -555,9 +555,9 @@
  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-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-rc28/arch/i386/kernel/process.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/i386/kernel/process.c linux-2.6.17.11-vs2.1.1-rc31/arch/i386/kernel/process.c
+--- linux-2.6.17.11/arch/i386/kernel/process.c	2006-06-18 04:51:53 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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;
  
@@ -581,9 +581,9 @@
  }
  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-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-rc28/arch/i386/kernel/sys_i386.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/i386/kernel/sys_i386.c linux-2.6.17.11-vs2.1.1-rc31/arch/i386/kernel/sys_i386.c
+--- linux-2.6.17.11/arch/i386/kernel/sys_i386.c	2006-06-18 04:51:53 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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>
@@ -631,9 +631,9 @@
  	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-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-rc28/arch/i386/kernel/syscall_table.S	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/i386/kernel/syscall_table.S linux-2.6.17.11-vs2.1.1-rc31/arch/i386/kernel/syscall_table.S
+--- linux-2.6.17.11/arch/i386/kernel/syscall_table.S	2006-06-18 04:51:53 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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
@@ -643,9 +643,9 @@
  	.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-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-rc28/arch/i386/kernel/traps.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/i386/kernel/traps.c linux-2.6.17.11-vs2.1.1-rc31/arch/i386/kernel/traps.c
+--- linux-2.6.17.11/arch/i386/kernel/traps.c	2006-06-18 04:51:53 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/i386/kernel/traps.c	2006-08-17 01:24:55 +0200
 @@ -53,6 +53,8 @@
  #include <asm/kdebug.h>
  
@@ -688,19 +688,9 @@
  			/* Executive summary in case the oops scrolled away */
  			esp = (unsigned long) (&regs->esp);
  			savesegment(ss, ss);
-@@ -400,8 +405,7 @@ void die(const char * str, struct pt_reg
- 			printk(KERN_EMERG "EIP: [<%08lx>] ", regs->eip);
- 			print_symbol("%s", regs->eip);
- 			printk(" SS:ESP %04x:%08lx\n", ss, esp);
--		}
--		else
-+		} else
- 			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-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-rc28/arch/ia64/Kconfig	2006-07-26 21:36:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/ia64/Kconfig linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/Kconfig
+--- linux-2.6.17.11/arch/ia64/Kconfig	2006-08-25 00:25:37 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/Kconfig	2006-07-26 21:36:47 +0200
 @@ -506,6 +506,8 @@ endmenu
  
  source "arch/ia64/Kconfig.debug"
@@ -710,9 +700,9 @@
  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-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-rc28/arch/ia64/ia32/binfmt_elf32.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/ia64/ia32/binfmt_elf32.c linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.17.11/arch/ia64/ia32/binfmt_elf32.c	2006-06-18 04:51:55 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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;
@@ -723,9 +713,9 @@
  	}
  
  	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-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-rc28/arch/ia64/ia32/ia32_entry.S	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/ia64/ia32/ia32_entry.S linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.17.11/arch/ia64/ia32/ia32_entry.S	2006-06-18 04:51:55 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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
@@ -735,9 +725,9 @@
    	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-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-rc28/arch/ia64/ia32/sys_ia32.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/ia64/ia32/sys_ia32.c linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/ia32/sys_ia32.c
+--- linux-2.6.17.11/arch/ia64/ia32/sys_ia32.c	2006-06-18 04:51:55 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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>
@@ -755,9 +745,9 @@
  		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-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-rc28/arch/ia64/kernel/asm-offsets.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/ia64/kernel/asm-offsets.c linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/asm-offsets.c
+--- linux-2.6.17.11/arch/ia64/kernel/asm-offsets.c	2005-10-28 20:49:10 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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);
@@ -766,9 +756,9 @@
  
  	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-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-rc28/arch/ia64/kernel/entry.S	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/ia64/kernel/entry.S linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/entry.S
+--- linux-2.6.17.11/arch/ia64/kernel/entry.S	2006-06-18 04:51:55 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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
@@ -778,9 +768,9 @@
  	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-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-rc28/arch/ia64/kernel/perfmon.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/ia64/kernel/perfmon.c linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/perfmon.c
+--- linux-2.6.17.11/arch/ia64/kernel/perfmon.c	2006-06-18 04:51:56 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/perfmon.c	2006-07-09 17:06:47 +0200
 @@ -41,6 +41,8 @@
  #include <linux/capability.h>
  #include <linux/rcupdate.h>
@@ -799,9 +789,9 @@
  	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-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-rc28/arch/ia64/kernel/process.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/ia64/kernel/process.c linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/process.c
+--- linux-2.6.17.11/arch/ia64/kernel/process.c	2006-06-18 04:51:56 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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;
  
@@ -822,9 +812,9 @@
  }
  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-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-rc28/arch/ia64/kernel/ptrace.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/ia64/kernel/ptrace.c linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/ptrace.c
+--- linux-2.6.17.11/arch/ia64/kernel/ptrace.c	2006-06-18 04:51:56 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/ptrace.c	2006-08-06 06:00:44 +0200
 @@ -18,6 +18,7 @@
  #include <linux/security.h>
  #include <linux/audit.h>
@@ -837,15 +827,15 @@
  	read_unlock(&tasklist_lock);
  	if (!child)
  		goto out;
-+	if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++	if (!vx_check(vx_task_xid(child), VX_WATCH_P|VX_IDENT))
 +		goto out_tsk;
 +
  	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-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-rc28/arch/ia64/kernel/signal.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/ia64/kernel/signal.c linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/signal.c
+--- linux-2.6.17.11/arch/ia64/kernel/signal.c	2006-06-18 04:51:56 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/signal.c	2006-07-09 17:06:47 +0200
 @@ -21,6 +21,7 @@
  #include <linux/binfmts.h>
  #include <linux/unistd.h>
@@ -854,9 +844,9 @@
  
  #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-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-rc28/arch/ia64/kernel/traps.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/ia64/kernel/traps.c linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/traps.c
+--- linux-2.6.17.11/arch/ia64/kernel/traps.c	2006-06-18 04:51:56 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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();
  
@@ -881,9 +871,9 @@
  	}
  
  	exception = fp_emulate(fp_fault, bundle, &regs->cr_ipsr, &regs->ar_fpsr, &isr, &regs->pr,
-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-rc28/arch/ia64/mm/fault.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/ia64/mm/fault.c linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/mm/fault.c
+--- linux-2.6.17.11/arch/ia64/mm/fault.c	2006-06-18 04:51:56 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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>
@@ -892,9 +882,9 @@
  
  #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-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-rc28/arch/ia64/sn/kernel/xpc_main.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/ia64/sn/kernel/xpc_main.c linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/sn/kernel/xpc_main.c
+--- linux-2.6.17.11/arch/ia64/sn/kernel/xpc_main.c	2006-06-18 04:51:57 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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,
@@ -919,9 +909,9 @@
  		&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-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-rc28/arch/m32r/kernel/process.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/m32r/kernel/process.c linux-2.6.17.11-vs2.1.1-rc31/arch/m32r/kernel/process.c
+--- linux-2.6.17.11/arch/m32r/kernel/process.c	2006-06-18 04:51:57 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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;
  
@@ -933,9 +923,9 @@
  }
  
  /*
-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-rc28/arch/m32r/kernel/sys_m32r.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/m32r/kernel/sys_m32r.c linux-2.6.17.11-vs2.1.1-rc31/arch/m32r/kernel/sys_m32r.c
+--- linux-2.6.17.11/arch/m32r/kernel/sys_m32r.c	2006-04-09 13:49:43 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/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>
@@ -953,9 +943,9 @@
  	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-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-rc28/arch/m32r/kernel/traps.c	2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.17.11/arch/m32r/kernel/traps.c linux-2.6.17.11-vs2.1.1-rc31/arch/m32r/kernel/traps.c
+--- linux-2.6.17.11/arch/m32r/kernel/traps.c	2005-10-28 20:49:11 +0200
++++ linux-2.6.17.11-vs2.1.1-rc31/arch/m32r/kernel/traps.c	2006-07-09 17:06:47 +0200
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.1.patch?r1=1.1.2.31&r2=1.1.2.32&f=u



More information about the pld-cvs-commit mailing list