SOURCES (LINUX_2_6): linux-2.6-vs2.1.patch - up to vs2.1.1-rc16

baggins baggins at pld-linux.org
Wed Apr 12 21:59:06 CEST 2006


Author: baggins                      Date: Wed Apr 12 19:59:06 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- up to vs2.1.1-rc16

---- Files affected:
SOURCES:
   linux-2.6-vs2.1.patch (1.1.2.13 -> 1.1.2.14) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.13 SOURCES/linux-2.6-vs2.1.patch:1.1.2.14
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.13	Tue Apr 11 16:05:50 2006
+++ SOURCES/linux-2.6-vs2.1.patch	Wed Apr 12 21:59:00 2006
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.16/Documentation/vserver/debug.txt linux-2.6.16-vs2.1.1-rc15/Documentation/vserver/debug.txt
+diff -NurpP --minimal linux-2.6.16/Documentation/vserver/debug.txt linux-2.6.16-vs2.1.1-rc16/Documentation/vserver/debug.txt
 --- linux-2.6.16/Documentation/vserver/debug.txt	1970-01-01 01:00:00 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/Documentation/vserver/debug.txt	2006-03-20 18:09:05 +0100
++++ linux-2.6.16-vs2.1.1-rc16/Documentation/vserver/debug.txt	2006-03-20 18:09:05 +0100
 @@ -0,0 +1,108 @@
 +
 +debug_cvirt:
@@ -110,12 +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.16/Makefile linux-2.6.16-vs2.1.1-rc15/Makefile
---- linux-2.6.16/Makefile	2006-03-20 17:32:17 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/Makefile	2006-04-03 06:43:02 +0200
-diff -NurpP --minimal linux-2.6.16/arch/alpha/Kconfig linux-2.6.16-vs2.1.1-rc15/arch/alpha/Kconfig
---- linux-2.6.16/arch/alpha/Kconfig	2006-03-20 17:32:17 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/alpha/Kconfig	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/alpha/Kconfig linux-2.6.16-vs2.1.1-rc16/arch/alpha/Kconfig
+--- linux-2.6.16/arch/alpha/Kconfig	2006-04-09 13:49:39 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/alpha/Kconfig	2006-03-20 17:34:49 +0100
 @@ -619,6 +619,8 @@ source "arch/alpha/oprofile/Kconfig"
  
  source "arch/alpha/Kconfig.debug"
@@ -125,9 +122,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16/arch/alpha/kernel/asm-offsets.c linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.16/arch/alpha/kernel/asm-offsets.c	2006-03-20 17:32:17 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/asm-offsets.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/alpha/kernel/asm-offsets.c linux-2.6.16-vs2.1.1-rc16/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.16/arch/alpha/kernel/asm-offsets.c	2006-04-09 13:49:39 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/alpha/kernel/asm-offsets.c	2006-03-20 18:09:05 +0100
 @@ -36,6 +36,7 @@ void foo(void)
  	DEFINE(PT_PTRACED, PT_PTRACED);
  	DEFINE(CLONE_VM, CLONE_VM);
@@ -136,9 +133,9 @@
  	DEFINE(SIGCHLD, SIGCHLD);
  	BLANK();
  
-diff -NurpP --minimal linux-2.6.16/arch/alpha/kernel/entry.S linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/entry.S
---- linux-2.6.16/arch/alpha/kernel/entry.S	2006-03-20 17:32:17 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/entry.S	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/alpha/kernel/entry.S linux-2.6.16-vs2.1.1-rc16/arch/alpha/kernel/entry.S
+--- linux-2.6.16/arch/alpha/kernel/entry.S	2006-04-09 13:49:39 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/alpha/kernel/entry.S	2006-03-20 18:09:05 +0100
 @@ -645,7 +645,7 @@ kernel_thread:
  	stq	$2, 152($sp)		/* HAE */
  
@@ -180,9 +177,9 @@
  	ret
  .end sys_getxpid
  
-diff -NurpP --minimal linux-2.6.16/arch/alpha/kernel/ptrace.c linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/ptrace.c
---- linux-2.6.16/arch/alpha/kernel/ptrace.c	2006-03-20 17:32:17 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/ptrace.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/alpha/kernel/ptrace.c linux-2.6.16-vs2.1.1-rc16/arch/alpha/kernel/ptrace.c
+--- linux-2.6.16/arch/alpha/kernel/ptrace.c	2006-04-09 13:49:39 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/alpha/kernel/ptrace.c	2006-03-20 18:09:05 +0100
 @@ -15,6 +15,7 @@
  #include <linux/slab.h>
  #include <linux/security.h>
@@ -203,9 +200,9 @@
  	if (request == PTRACE_ATTACH) {
  		ret = ptrace_attach(child);
  		goto out;
-diff -NurpP --minimal linux-2.6.16/arch/alpha/kernel/systbls.S linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/systbls.S
---- linux-2.6.16/arch/alpha/kernel/systbls.S	2005-08-29 22:24:49 +0200
-+++ linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/systbls.S	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/alpha/kernel/systbls.S linux-2.6.16-vs2.1.1-rc16/arch/alpha/kernel/systbls.S
+--- linux-2.6.16/arch/alpha/kernel/systbls.S	2006-01-31 07:25:07 +0100
++++ linux-2.6.16-vs2.1.1-rc16/arch/alpha/kernel/systbls.S	2006-03-20 17:34:49 +0100
 @@ -447,7 +447,7 @@ sys_call_table:
  	.quad sys_stat64			/* 425 */
  	.quad sys_lstat64
@@ -215,9 +212,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.16/arch/alpha/kernel/traps.c linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/traps.c
---- linux-2.6.16/arch/alpha/kernel/traps.c	2005-10-28 20:49:08 +0200
-+++ linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/traps.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/alpha/kernel/traps.c linux-2.6.16-vs2.1.1-rc16/arch/alpha/kernel/traps.c
+--- linux-2.6.16/arch/alpha/kernel/traps.c	2006-01-31 07:25:07 +0100
++++ linux-2.6.16-vs2.1.1-rc16/arch/alpha/kernel/traps.c	2006-03-20 18:09:05 +0100
 @@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
  #ifdef CONFIG_SMP
  	printk("CPU %d ", hard_smp_processor_id());
@@ -228,9 +225,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.16/arch/alpha/mm/init.c linux-2.6.16-vs2.1.1-rc15/arch/alpha/mm/init.c
---- linux-2.6.16/arch/alpha/mm/init.c	2006-03-20 17:32:18 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/alpha/mm/init.c	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/alpha/mm/init.c linux-2.6.16-vs2.1.1-rc16/arch/alpha/mm/init.c
+--- linux-2.6.16/arch/alpha/mm/init.c	2006-04-09 13:49:39 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/alpha/mm/init.c	2006-03-20 17:34:49 +0100
 @@ -21,6 +21,7 @@
  #include <linux/init.h>
  #include <linux/bootmem.h> /* max_low_pfn */
@@ -239,9 +236,9 @@
  
  #include <asm/system.h>
  #include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.16/arch/arm/Kconfig linux-2.6.16-vs2.1.1-rc15/arch/arm/Kconfig
---- linux-2.6.16/arch/arm/Kconfig	2006-03-20 17:32:18 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/arm/Kconfig	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/arm/Kconfig linux-2.6.16-vs2.1.1-rc16/arch/arm/Kconfig
+--- linux-2.6.16/arch/arm/Kconfig	2006-04-09 13:49:39 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/arm/Kconfig	2006-03-20 17:34:49 +0100
 @@ -827,6 +827,8 @@ source "arch/arm/oprofile/Kconfig"
  
  source "arch/arm/Kconfig.debug"
@@ -251,9 +248,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16/arch/arm/kernel/calls.S linux-2.6.16-vs2.1.1-rc15/arch/arm/kernel/calls.S
---- linux-2.6.16/arch/arm/kernel/calls.S	2006-03-20 17:32:18 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/arm/kernel/calls.S	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/arm/kernel/calls.S linux-2.6.16-vs2.1.1-rc16/arch/arm/kernel/calls.S
+--- linux-2.6.16/arch/arm/kernel/calls.S	2006-04-09 13:49:40 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/arm/kernel/calls.S	2006-03-20 17:34:49 +0100
 @@ -322,7 +322,7 @@
  /* 310 */	CALL(sys_request_key)
  		CALL(sys_keyctl)
@@ -263,9 +260,9 @@
  		CALL(sys_ioprio_set)
  /* 315 */	CALL(sys_ioprio_get)
  		CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.16/arch/arm/kernel/process.c linux-2.6.16-vs2.1.1-rc15/arch/arm/kernel/process.c
---- linux-2.6.16/arch/arm/kernel/process.c	2006-03-20 17:32:18 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/arm/kernel/process.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/arm/kernel/process.c linux-2.6.16-vs2.1.1-rc16/arch/arm/kernel/process.c
+--- linux-2.6.16/arch/arm/kernel/process.c	2006-04-09 13:49:40 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/arm/kernel/process.c	2006-03-20 18:09:05 +0100
 @@ -227,7 +227,8 @@ void __show_regs(struct pt_regs *regs)
  void show_regs(struct pt_regs * regs)
  {
@@ -286,9 +283,9 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-diff -NurpP --minimal linux-2.6.16/arch/arm26/Kconfig linux-2.6.16-vs2.1.1-rc15/arch/arm26/Kconfig
---- linux-2.6.16/arch/arm26/Kconfig	2006-03-20 17:32:19 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/arm26/Kconfig	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/arm26/Kconfig linux-2.6.16-vs2.1.1-rc16/arch/arm26/Kconfig
+--- linux-2.6.16/arch/arm26/Kconfig	2006-04-09 13:49:41 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/arm26/Kconfig	2006-03-20 17:34:49 +0100
 @@ -230,6 +230,8 @@ source "drivers/usb/Kconfig"
  
  source "arch/arm26/Kconfig.debug"
@@ -298,9 +295,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16/arch/arm26/kernel/calls.S linux-2.6.16-vs2.1.1-rc15/arch/arm26/kernel/calls.S
---- linux-2.6.16/arch/arm26/kernel/calls.S	2005-03-02 12:38:19 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/arm26/kernel/calls.S	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/arm26/kernel/calls.S linux-2.6.16-vs2.1.1-rc16/arch/arm26/kernel/calls.S
+--- linux-2.6.16/arch/arm26/kernel/calls.S	2006-01-31 07:25:07 +0100
++++ linux-2.6.16-vs2.1.1-rc16/arch/arm26/kernel/calls.S	2006-03-20 17:34:49 +0100
 @@ -257,6 +257,11 @@ __syscall_start:
  		.long	sys_lremovexattr
  		.long	sys_fremovexattr
@@ -313,9 +310,9 @@
  __syscall_end:
  
  		.rept	NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.16/arch/arm26/kernel/process.c linux-2.6.16-vs2.1.1-rc15/arch/arm26/kernel/process.c
---- linux-2.6.16/arch/arm26/kernel/process.c	2006-03-20 17:32:19 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/arm26/kernel/process.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/arm26/kernel/process.c linux-2.6.16-vs2.1.1-rc16/arch/arm26/kernel/process.c
+--- linux-2.6.16/arch/arm26/kernel/process.c	2006-04-09 13:49:41 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/arm26/kernel/process.c	2006-03-20 18:09:05 +0100
 @@ -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;
@@ -326,9 +323,9 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-diff -NurpP --minimal linux-2.6.16/arch/arm26/kernel/traps.c linux-2.6.16-vs2.1.1-rc15/arch/arm26/kernel/traps.c
---- linux-2.6.16/arch/arm26/kernel/traps.c	2006-03-20 17:32:19 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/arm26/kernel/traps.c	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/arm26/kernel/traps.c linux-2.6.16-vs2.1.1-rc16/arch/arm26/kernel/traps.c
+--- linux-2.6.16/arch/arm26/kernel/traps.c	2006-04-09 13:49:41 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/arm26/kernel/traps.c	2006-03-20 17:34:49 +0100
 @@ -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());
@@ -341,9 +338,9 @@
  
  	if (!user_mode(regs) || in_interrupt()) {
  		__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.16/arch/cris/Kconfig linux-2.6.16-vs2.1.1-rc15/arch/cris/Kconfig
---- linux-2.6.16/arch/cris/Kconfig	2006-03-20 17:32:19 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/cris/Kconfig	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/cris/Kconfig linux-2.6.16-vs2.1.1-rc16/arch/cris/Kconfig
+--- linux-2.6.16/arch/cris/Kconfig	2006-04-09 13:49:41 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/cris/Kconfig	2006-03-20 17:34:49 +0100
 @@ -173,6 +173,8 @@ source "drivers/usb/Kconfig"
  
  source "arch/cris/Kconfig.debug"
@@ -353,9 +350,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16/arch/cris/arch-v10/kernel/process.c linux-2.6.16-vs2.1.1-rc15/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.16/arch/cris/arch-v10/kernel/process.c	2006-03-20 17:32:19 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/cris/arch-v10/kernel/process.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/cris/arch-v10/kernel/process.c linux-2.6.16-vs2.1.1-rc16/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.16/arch/cris/arch-v10/kernel/process.c	2006-04-09 13:49:41 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/cris/arch-v10/kernel/process.c	2006-03-20 18:09:05 +0100
 @@ -104,7 +104,8 @@ int kernel_thread(int (*fn)(void *), voi
  	regs.dccr = 1 << I_DCCR_BITNR;
  
@@ -366,9 +363,9 @@
  }
  
  /* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.16/arch/cris/arch-v32/kernel/process.c linux-2.6.16-vs2.1.1-rc15/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.16/arch/cris/arch-v32/kernel/process.c	2006-03-20 17:32:19 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/cris/arch-v32/kernel/process.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/cris/arch-v32/kernel/process.c linux-2.6.16-vs2.1.1-rc16/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.16/arch/cris/arch-v32/kernel/process.c	2006-04-09 13:49:41 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/cris/arch-v32/kernel/process.c	2006-03-20 18:09:05 +0100
 @@ -121,7 +121,8 @@ kernel_thread(int (*fn)(void *), void * 
  	regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
  
@@ -379,9 +376,9 @@
  }
  
  /*
-diff -NurpP --minimal linux-2.6.16/arch/frv/kernel/kernel_thread.S linux-2.6.16-vs2.1.1-rc15/arch/frv/kernel/kernel_thread.S
---- linux-2.6.16/arch/frv/kernel/kernel_thread.S	2005-03-02 12:38:20 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/frv/kernel/kernel_thread.S	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/frv/kernel/kernel_thread.S linux-2.6.16-vs2.1.1-rc16/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.16/arch/frv/kernel/kernel_thread.S	2006-01-31 07:25:07 +0100
++++ linux-2.6.16-vs2.1.1-rc16/arch/frv/kernel/kernel_thread.S	2006-03-20 18:09:05 +0100
 @@ -13,6 +13,8 @@
  #include <asm/unistd.h>
  
@@ -400,9 +397,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.16/arch/frv/mm/mmu-context.c linux-2.6.16-vs2.1.1-rc15/arch/frv/mm/mmu-context.c
---- linux-2.6.16/arch/frv/mm/mmu-context.c	2005-03-02 12:38:20 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/frv/mm/mmu-context.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/frv/mm/mmu-context.c linux-2.6.16-vs2.1.1-rc16/arch/frv/mm/mmu-context.c
+--- linux-2.6.16/arch/frv/mm/mmu-context.c	2006-01-31 07:25:07 +0100
++++ linux-2.6.16-vs2.1.1-rc16/arch/frv/mm/mmu-context.c	2006-03-20 18:09:05 +0100
 @@ -11,6 +11,7 @@
  
  #include <linux/sched.h>
@@ -411,9 +408,9 @@
  #include <asm/tlbflush.h>
  
  #define NR_CXN	4096
-diff -NurpP --minimal linux-2.6.16/arch/h8300/Kconfig linux-2.6.16-vs2.1.1-rc15/arch/h8300/Kconfig
---- linux-2.6.16/arch/h8300/Kconfig	2006-03-20 17:32:20 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/h8300/Kconfig	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/h8300/Kconfig linux-2.6.16-vs2.1.1-rc16/arch/h8300/Kconfig
+--- linux-2.6.16/arch/h8300/Kconfig	2006-04-09 13:49:41 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/h8300/Kconfig	2006-03-20 17:34:49 +0100
 @@ -191,6 +191,8 @@ source "fs/Kconfig"
  
  source "arch/h8300/Kconfig.debug"
@@ -423,9 +420,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16/arch/h8300/kernel/process.c linux-2.6.16-vs2.1.1-rc15/arch/h8300/kernel/process.c
---- linux-2.6.16/arch/h8300/kernel/process.c	2006-03-20 17:32:20 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/h8300/kernel/process.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/h8300/kernel/process.c linux-2.6.16-vs2.1.1-rc16/arch/h8300/kernel/process.c
+--- linux-2.6.16/arch/h8300/kernel/process.c	2006-04-09 13:49:41 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/h8300/kernel/process.c	2006-03-20 18:09:05 +0100
 @@ -135,7 +135,7 @@ int kernel_thread(int (*fn)(void *), voi
  
  	fs = get_fs();
@@ -435,9 +432,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.16/arch/i386/Kconfig linux-2.6.16-vs2.1.1-rc15/arch/i386/Kconfig
---- linux-2.6.16/arch/i386/Kconfig	2006-03-20 17:32:20 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/i386/Kconfig	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/i386/Kconfig linux-2.6.16-vs2.1.1-rc16/arch/i386/Kconfig
+--- linux-2.6.16/arch/i386/Kconfig	2006-04-09 13:49:41 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/i386/Kconfig	2006-03-20 17:34:49 +0100
 @@ -466,23 +466,43 @@ choice
  	  will also likely make your kernel incompatible with binary-only
  	  kernel modules.
@@ -499,9 +496,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16/arch/i386/boot/compressed/misc.c linux-2.6.16-vs2.1.1-rc15/arch/i386/boot/compressed/misc.c
---- linux-2.6.16/arch/i386/boot/compressed/misc.c	2006-03-20 17:32:20 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/i386/boot/compressed/misc.c	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/i386/boot/compressed/misc.c linux-2.6.16-vs2.1.1-rc16/arch/i386/boot/compressed/misc.c
+--- linux-2.6.16/arch/i386/boot/compressed/misc.c	2006-04-09 13:49:42 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/i386/boot/compressed/misc.c	2006-03-20 17:34:49 +0100
 @@ -309,7 +309,7 @@ static void setup_normal_output_buffer(v
  #else
  	if ((RM_ALT_MEM_K > RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) < 1024) error("Less than 2MB of memory");
@@ -522,9 +519,9 @@
  		mv->hcount = 0; /* say: we need not to move high_buffer */
  	}
  	else mv->hcount = -1;
-diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/process.c linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/process.c
---- linux-2.6.16/arch/i386/kernel/process.c	2006-03-20 17:32:20 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/process.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/process.c linux-2.6.16-vs2.1.1-rc16/arch/i386/kernel/process.c
+--- linux-2.6.16/arch/i386/kernel/process.c	2006-04-09 13:49:42 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/i386/kernel/process.c	2006-03-20 18:09:05 +0100
 @@ -291,8 +291,10 @@ void show_regs(struct pt_regs * regs)
  	unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
  
@@ -548,9 +545,9 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/setup.c linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/setup.c
---- linux-2.6.16/arch/i386/kernel/setup.c	2006-03-20 17:32:20 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/setup.c	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/setup.c linux-2.6.16-vs2.1.1-rc16/arch/i386/kernel/setup.c
+--- linux-2.6.16/arch/i386/kernel/setup.c	2006-04-09 13:49:42 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/i386/kernel/setup.c	2006-03-20 17:34:49 +0100
 @@ -1192,8 +1192,8 @@ void __init setup_bootmem_allocator(void
  	 * the (very unlikely) case of us accidentally initializing the
  	 * bootmem allocator with an invalid RAM area.
@@ -562,9 +559,9 @@
  
  	/*
  	 * reserve physical page 0 - it's a special BIOS page on many boxes,
-diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/sys_i386.c linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/sys_i386.c
---- linux-2.6.16/arch/i386/kernel/sys_i386.c	2004-08-14 12:56:23 +0200
-+++ linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/sys_i386.c	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/sys_i386.c linux-2.6.16-vs2.1.1-rc16/arch/i386/kernel/sys_i386.c
+--- linux-2.6.16/arch/i386/kernel/sys_i386.c	2006-01-31 07:25:07 +0100
++++ linux-2.6.16-vs2.1.1-rc16/arch/i386/kernel/sys_i386.c	2006-03-20 17:34:49 +0100
 @@ -19,6 +19,7 @@
  #include <linux/mman.h>
  #include <linux/file.h>
@@ -612,9 +609,9 @@
  	error |= __put_user(0,name->machine+__OLD_UTS_LEN);
  	
  	up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/syscall_table.S linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/syscall_table.S
---- linux-2.6.16/arch/i386/kernel/syscall_table.S	2006-03-20 17:32:20 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/syscall_table.S	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/syscall_table.S linux-2.6.16-vs2.1.1-rc16/arch/i386/kernel/syscall_table.S
+--- linux-2.6.16/arch/i386/kernel/syscall_table.S	2006-04-09 13:49:42 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/i386/kernel/syscall_table.S	2006-03-20 17:34:49 +0100
 @@ -272,7 +272,7 @@ ENTRY(sys_call_table)
  	.long sys_tgkill	/* 270 */
  	.long sys_utimes
@@ -624,18 +621,19 @@
  	.long sys_mbind
  	.long sys_get_mempolicy
  	.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/traps.c linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/traps.c
---- linux-2.6.16/arch/i386/kernel/traps.c	2006-03-20 17:32:20 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/traps.c	2006-03-20 17:34:49 +0100
-@@ -53,6 +53,7 @@
+diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/traps.c linux-2.6.16-vs2.1.1-rc16/arch/i386/kernel/traps.c
+--- linux-2.6.16/arch/i386/kernel/traps.c	2006-04-09 13:49:42 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/i386/kernel/traps.c	2006-04-05 04:34:50 +0200
+@@ -53,6 +53,8 @@
  #include <asm/kdebug.h>
  
  #include <linux/module.h>
 +#include <linux/vserver/debug.h>
++#include <linux/vserver/history.h>
  
  #include "mach_traps.h"
  
-@@ -252,8 +253,9 @@ void show_registers(struct pt_regs *regs
+@@ -252,8 +254,9 @@ void show_registers(struct pt_regs *regs
  		regs->esi, regs->edi, regs->ebp, esp);
  	printk(KERN_EMERG "ds: %04x   es: %04x   ss: %04x\n",
  		regs->xds & 0xffff, regs->xes & 0xffff, ss);
@@ -647,7 +645,7 @@
  	/*
  	 * When in-kernel, we also print out the stack and code at the
  	 * time of the fault..
-@@ -333,6 +335,8 @@ void die(const char * str, struct pt_reg
+@@ -333,6 +336,8 @@ void die(const char * str, struct pt_reg
  	static int die_counter;
  	unsigned long flags;
  
@@ -656,7 +654,7 @@
  	if (die.lock_owner != raw_smp_processor_id()) {
  		console_verbose();
  		spin_lock_irqsave(&die.lock, flags);
-@@ -365,8 +369,9 @@ void die(const char * str, struct pt_reg
+@@ -365,8 +370,9 @@ void die(const char * str, struct pt_reg
  #endif
  		if (nl)
  			printk("\n");
@@ -667,9 +665,9 @@
    	} else
  		printk(KERN_EMERG "Recursive die() failure, output suppressed\n");
  
-diff -NurpP --minimal linux-2.6.16/arch/ia64/Kconfig linux-2.6.16-vs2.1.1-rc15/arch/ia64/Kconfig
---- linux-2.6.16/arch/ia64/Kconfig	2006-03-20 17:32:21 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/ia64/Kconfig	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/ia64/Kconfig linux-2.6.16-vs2.1.1-rc16/arch/ia64/Kconfig
+--- linux-2.6.16/arch/ia64/Kconfig	2006-04-09 13:49:42 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/ia64/Kconfig	2006-03-20 17:34:49 +0100
 @@ -464,6 +464,8 @@ endmenu
  
  source "arch/ia64/Kconfig.debug"
@@ -679,9 +677,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16/arch/ia64/ia32/binfmt_elf32.c linux-2.6.16-vs2.1.1-rc15/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.16/arch/ia64/ia32/binfmt_elf32.c	2006-01-03 17:29:09 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/ia64/ia32/binfmt_elf32.c	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/ia64/ia32/binfmt_elf32.c linux-2.6.16-vs2.1.1-rc16/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.16/arch/ia64/ia32/binfmt_elf32.c	2006-01-31 07:25:07 +0100
++++ linux-2.6.16-vs2.1.1-rc16/arch/ia64/ia32/binfmt_elf32.c	2006-03-20 17:34:49 +0100
 @@ -236,7 +236,8 @@ ia32_setup_arg_pages (struct linux_binpr
  			kmem_cache_free(vm_area_cachep, mpnt);
  			return ret;
@@ -692,9 +690,9 @@
  	}
  
  	for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.16/arch/ia64/ia32/ia32_entry.S linux-2.6.16-vs2.1.1-rc15/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.16/arch/ia64/ia32/ia32_entry.S	2006-03-20 17:32:21 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/ia64/ia32/ia32_entry.S	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/ia64/ia32/ia32_entry.S linux-2.6.16-vs2.1.1-rc16/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.16/arch/ia64/ia32/ia32_entry.S	2006-04-09 13:49:42 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/ia64/ia32/ia32_entry.S	2006-03-20 17:34:49 +0100
 @@ -483,7 +483,7 @@ ia32_syscall_table:
   	data8 sys_tgkill	/* 270 */
   	data8 compat_sys_utimes
@@ -704,9 +702,9 @@
    	data8 sys_ni_syscall
   	data8 sys_ni_syscall	/* 275 */
    	data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.16/arch/ia64/ia32/sys_ia32.c linux-2.6.16-vs2.1.1-rc15/arch/ia64/ia32/sys_ia32.c
---- linux-2.6.16/arch/ia64/ia32/sys_ia32.c	2006-03-20 17:32:21 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/ia64/ia32/sys_ia32.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/ia64/ia32/sys_ia32.c linux-2.6.16-vs2.1.1-rc16/arch/ia64/ia32/sys_ia32.c
+--- linux-2.6.16/arch/ia64/ia32/sys_ia32.c	2006-04-09 13:49:42 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/ia64/ia32/sys_ia32.c	2006-03-20 18:09:05 +0100
 @@ -52,6 +52,7 @@
  #include <linux/compat.h>
  #include <linux/vfs.h>
@@ -715,9 +713,9 @@
  #include <linux/mutex.h>
  
  #include <asm/intrinsics.h>
-diff -NurpP --minimal linux-2.6.16/arch/ia64/kernel/asm-offsets.c linux-2.6.16-vs2.1.1-rc15/arch/ia64/kernel/asm-offsets.c
---- linux-2.6.16/arch/ia64/kernel/asm-offsets.c	2005-10-28 20:49:10 +0200
-+++ linux-2.6.16-vs2.1.1-rc15/arch/ia64/kernel/asm-offsets.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/ia64/kernel/asm-offsets.c linux-2.6.16-vs2.1.1-rc16/arch/ia64/kernel/asm-offsets.c
+--- linux-2.6.16/arch/ia64/kernel/asm-offsets.c	2006-01-31 07:25:07 +0100
++++ linux-2.6.16-vs2.1.1-rc16/arch/ia64/kernel/asm-offsets.c	2006-03-20 18:09:05 +0100
 @@ -192,6 +192,7 @@ void foo(void)
      /* for assembly files which can't include sched.h: */
  	DEFINE(IA64_CLONE_VFORK, CLONE_VFORK);
@@ -726,9 +724,9 @@
  
  	BLANK();
  	DEFINE(IA64_CPUINFO_NSEC_PER_CYC_OFFSET,
-diff -NurpP --minimal linux-2.6.16/arch/ia64/kernel/entry.S linux-2.6.16-vs2.1.1-rc15/arch/ia64/kernel/entry.S
---- linux-2.6.16/arch/ia64/kernel/entry.S	2006-03-20 17:32:21 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/ia64/kernel/entry.S	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/ia64/kernel/entry.S linux-2.6.16-vs2.1.1-rc16/arch/ia64/kernel/entry.S
+--- linux-2.6.16/arch/ia64/kernel/entry.S	2006-04-09 13:49:42 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/ia64/kernel/entry.S	2006-03-20 17:34:49 +0100
 @@ -1591,7 +1591,7 @@ sys_call_table:
  	data8 sys_mq_notify
  	data8 sys_mq_getsetattr
@@ -738,9 +736,9 @@
  	data8 sys_waitid			// 1270
  	data8 sys_add_key
  	data8 sys_request_key
-diff -NurpP --minimal linux-2.6.16/arch/ia64/kernel/perfmon.c linux-2.6.16-vs2.1.1-rc15/arch/ia64/kernel/perfmon.c
---- linux-2.6.16/arch/ia64/kernel/perfmon.c	2006-03-20 17:32:21 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/ia64/kernel/perfmon.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/ia64/kernel/perfmon.c linux-2.6.16-vs2.1.1-rc16/arch/ia64/kernel/perfmon.c
+--- linux-2.6.16/arch/ia64/kernel/perfmon.c	2006-04-09 13:49:42 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/ia64/kernel/perfmon.c	2006-03-20 18:09:05 +0100
 @@ -41,6 +41,8 @@
  #include <linux/capability.h>
  #include <linux/rcupdate.h>
@@ -759,9 +757,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.16/arch/ia64/kernel/process.c linux-2.6.16-vs2.1.1-rc15/arch/ia64/kernel/process.c
---- linux-2.6.16/arch/ia64/kernel/process.c	2006-03-20 17:32:21 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/ia64/kernel/process.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/ia64/kernel/process.c linux-2.6.16-vs2.1.1-rc16/arch/ia64/kernel/process.c
+--- linux-2.6.16/arch/ia64/kernel/process.c	2006-04-09 13:49:42 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/ia64/kernel/process.c	2006-03-20 18:09:05 +0100
 @@ -109,7 +109,8 @@ show_regs (struct pt_regs *regs)
  	unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
  
@@ -782,9 +780,9 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-diff -NurpP --minimal linux-2.6.16/arch/ia64/kernel/ptrace.c linux-2.6.16-vs2.1.1-rc15/arch/ia64/kernel/ptrace.c
---- linux-2.6.16/arch/ia64/kernel/ptrace.c	2006-03-20 17:32:21 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/ia64/kernel/ptrace.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/ia64/kernel/ptrace.c linux-2.6.16-vs2.1.1-rc16/arch/ia64/kernel/ptrace.c
+--- linux-2.6.16/arch/ia64/kernel/ptrace.c	2006-04-09 13:49:42 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/ia64/kernel/ptrace.c	2006-03-20 18:09:05 +0100
 @@ -18,6 +18,7 @@
  #include <linux/security.h>
  #include <linux/audit.h>
@@ -803,9 +801,9 @@
  	ret = -EPERM;
  	if (pid == 1)		/* no messing around with init! */
  		goto out_tsk;
-diff -NurpP --minimal linux-2.6.16/arch/ia64/kernel/signal.c linux-2.6.16-vs2.1.1-rc15/arch/ia64/kernel/signal.c
---- linux-2.6.16/arch/ia64/kernel/signal.c	2006-03-20 17:32:21 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/ia64/kernel/signal.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/ia64/kernel/signal.c linux-2.6.16-vs2.1.1-rc16/arch/ia64/kernel/signal.c
+--- linux-2.6.16/arch/ia64/kernel/signal.c	2006-04-09 13:49:42 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/ia64/kernel/signal.c	2006-03-20 18:09:05 +0100
 @@ -21,6 +21,7 @@
  #include <linux/binfmts.h>
  #include <linux/unistd.h>
@@ -814,9 +812,9 @@
  
  #include <asm/ia32.h>
  #include <asm/intrinsics.h>
-diff -NurpP --minimal linux-2.6.16/arch/ia64/kernel/traps.c linux-2.6.16-vs2.1.1-rc15/arch/ia64/kernel/traps.c
---- linux-2.6.16/arch/ia64/kernel/traps.c	2006-03-20 17:32:21 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/ia64/kernel/traps.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/ia64/kernel/traps.c linux-2.6.16-vs2.1.1-rc16/arch/ia64/kernel/traps.c
+--- linux-2.6.16/arch/ia64/kernel/traps.c	2006-04-09 13:49:42 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/ia64/kernel/traps.c	2006-03-20 18:09:05 +0100
 @@ -107,8 +107,9 @@ die (const char *str, struct pt_regs *re
  	put_cpu();
  
@@ -841,9 +839,9 @@
  	}
  
  	exception = fp_emulate(fp_fault, bundle, &regs->cr_ipsr, &regs->ar_fpsr, &isr, &regs->pr,
-diff -NurpP --minimal linux-2.6.16/arch/ia64/mm/fault.c linux-2.6.16-vs2.1.1-rc15/arch/ia64/mm/fault.c
---- linux-2.6.16/arch/ia64/mm/fault.c	2006-01-03 17:29:09 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/ia64/mm/fault.c	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/ia64/mm/fault.c linux-2.6.16-vs2.1.1-rc16/arch/ia64/mm/fault.c
+--- linux-2.6.16/arch/ia64/mm/fault.c	2006-01-31 07:25:07 +0100
++++ linux-2.6.16-vs2.1.1-rc16/arch/ia64/mm/fault.c	2006-03-20 17:34:49 +0100
 @@ -10,6 +10,7 @@
  #include <linux/smp_lock.h>
  #include <linux/interrupt.h>
@@ -852,9 +850,9 @@
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.16/arch/ia64/sn/kernel/xpc_main.c linux-2.6.16-vs2.1.1-rc15/arch/ia64/sn/kernel/xpc_main.c
---- linux-2.6.16/arch/ia64/sn/kernel/xpc_main.c	2006-03-20 17:32:22 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/ia64/sn/kernel/xpc_main.c	2006-03-20 17:34:49 +0100
+diff -NurpP --minimal linux-2.6.16/arch/ia64/sn/kernel/xpc_main.c linux-2.6.16-vs2.1.1-rc16/arch/ia64/sn/kernel/xpc_main.c
+--- linux-2.6.16/arch/ia64/sn/kernel/xpc_main.c	2006-04-09 13:49:43 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/ia64/sn/kernel/xpc_main.c	2006-03-20 17:34:49 +0100
 @@ -109,6 +109,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = 
  		0644,
  		NULL,
@@ -879,9 +877,9 @@
  		&sysctl_intvec,
  		NULL,
  		&xpc_disengage_request_min_timelimit,
-diff -NurpP --minimal linux-2.6.16/arch/m32r/kernel/process.c linux-2.6.16-vs2.1.1-rc15/arch/m32r/kernel/process.c
---- linux-2.6.16/arch/m32r/kernel/process.c	2006-03-20 17:32:22 +0100
-+++ linux-2.6.16-vs2.1.1-rc15/arch/m32r/kernel/process.c	2006-03-20 18:09:05 +0100
+diff -NurpP --minimal linux-2.6.16/arch/m32r/kernel/process.c linux-2.6.16-vs2.1.1-rc16/arch/m32r/kernel/process.c
+--- linux-2.6.16/arch/m32r/kernel/process.c	2006-04-09 13:49:43 +0200
++++ linux-2.6.16-vs2.1.1-rc16/arch/m32r/kernel/process.c	2006-03-20 18:09:05 +0100
 @@ -208,8 +208,8 @@ int kernel_thread(int (*fn)(void *), voi
  	regs.psw = M32R_PSW_BIE;
  
@@ -893,9 +891,9 @@
  }
  
  /*
<<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.13&r2=1.1.2.14&f=u



More information about the pld-cvs-commit mailing list