SOURCES (LINUX_2_6): linux-2.6-vs2.1.patch - updated to vs2.1.1-rc2

baggins baggins at pld-linux.org
Mon Feb 13 18:33:07 CET 2006


Author: baggins                      Date: Mon Feb 13 17:33:07 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- updated to vs2.1.1-rc2

---- Files affected:
SOURCES:
   linux-2.6-vs2.1.patch (1.1.2.6 -> 1.1.2.7) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.6 SOURCES/linux-2.6-vs2.1.patch:1.1.2.7
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.6	Tue Jan 31 11:13:36 2006
+++ SOURCES/linux-2.6-vs2.1.patch	Mon Feb 13 18:33:01 2006
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.15.1/Documentation/vserver/debug.txt linux-2.6.15.1-vs2.1.0.5.1/Documentation/vserver/debug.txt
---- linux-2.6.15.1/Documentation/vserver/debug.txt	1970-01-01 01:00:00 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/Documentation/vserver/debug.txt	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/Documentation/vserver/debug.txt linux-2.6.15.4-vs2.1.1-rc2/Documentation/vserver/debug.txt
+--- linux-2.6.15.4/Documentation/vserver/debug.txt	1970-01-01 01:00:00 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/Documentation/vserver/debug.txt	2006-01-04 21:59:59 +0100
 @@ -0,0 +1,106 @@
 +
 +debug_cvirt:
@@ -108,9 +108,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.15.1/arch/alpha/Kconfig linux-2.6.15.1-vs2.1.0.5.1/arch/alpha/Kconfig
---- linux-2.6.15.1/arch/alpha/Kconfig	2005-10-28 20:49:08 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/alpha/Kconfig	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/alpha/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/Kconfig
+--- linux-2.6.15.4/arch/alpha/Kconfig	2005-10-28 20:49:08 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/Kconfig	2006-01-04 21:59:59 +0100
 @@ -609,6 +609,8 @@ source "arch/alpha/oprofile/Kconfig"
  
  source "arch/alpha/Kconfig.debug"
@@ -120,9 +120,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.1/arch/alpha/kernel/asm-offsets.c linux-2.6.15.1-vs2.1.0.5.1/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.15.1/arch/alpha/kernel/asm-offsets.c	2004-08-14 12:56:24 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/alpha/kernel/asm-offsets.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/asm-offsets.c linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.15.4/arch/alpha/kernel/asm-offsets.c	2004-08-14 12:56:24 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/asm-offsets.c	2006-01-04 21:59:59 +0100
 @@ -35,6 +35,7 @@ void foo(void)
  	DEFINE(PT_PTRACED, PT_PTRACED);
  	DEFINE(CLONE_VM, CLONE_VM);
@@ -131,9 +131,9 @@
  	DEFINE(SIGCHLD, SIGCHLD);
  	BLANK();
  
-diff -NurpP --minimal linux-2.6.15.1/arch/alpha/kernel/entry.S linux-2.6.15.1-vs2.1.0.5.1/arch/alpha/kernel/entry.S
---- linux-2.6.15.1/arch/alpha/kernel/entry.S	2005-10-28 20:49:08 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/alpha/kernel/entry.S	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/entry.S linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/entry.S
+--- linux-2.6.15.4/arch/alpha/kernel/entry.S	2005-10-28 20:49:08 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/entry.S	2006-01-04 21:59:59 +0100
 @@ -645,7 +645,7 @@ kernel_thread:
  	stq	$2, 152($sp)		/* HAE */
  
@@ -173,9 +173,9 @@
  	ret
  .end sys_getxpid
  
-diff -NurpP --minimal linux-2.6.15.1/arch/alpha/kernel/ptrace.c linux-2.6.15.1-vs2.1.0.5.1/arch/alpha/kernel/ptrace.c
---- linux-2.6.15.1/arch/alpha/kernel/ptrace.c	2005-06-22 02:37:51 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/alpha/kernel/ptrace.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/ptrace.c linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/ptrace.c
+--- linux-2.6.15.4/arch/alpha/kernel/ptrace.c	2005-06-22 02:37:51 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/ptrace.c	2006-01-04 21:59:59 +0100
 @@ -289,6 +289,8 @@ do_sys_ptrace(long request, long pid, lo
  	read_unlock(&tasklist_lock);
  	if (!child)
@@ -185,9 +185,9 @@
  
  	if (request == PTRACE_ATTACH) {
  		ret = ptrace_attach(child);
-diff -NurpP --minimal linux-2.6.15.1/arch/alpha/kernel/systbls.S linux-2.6.15.1-vs2.1.0.5.1/arch/alpha/kernel/systbls.S
---- linux-2.6.15.1/arch/alpha/kernel/systbls.S	2005-08-29 22:24:49 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/alpha/kernel/systbls.S	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/systbls.S linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/systbls.S
+--- linux-2.6.15.4/arch/alpha/kernel/systbls.S	2005-08-29 22:24:49 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/systbls.S	2006-01-04 21:59:59 +0100
 @@ -447,7 +447,7 @@ sys_call_table:
  	.quad sys_stat64			/* 425 */
  	.quad sys_lstat64
@@ -197,9 +197,22 @@
  	.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.15.1/arch/alpha/mm/init.c linux-2.6.15.1-vs2.1.0.5.1/arch/alpha/mm/init.c
---- linux-2.6.15.1/arch/alpha/mm/init.c	2005-03-02 12:38:18 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/alpha/mm/init.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/traps.c
+--- linux-2.6.15.4/arch/alpha/kernel/traps.c	2005-10-28 20:49:08 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/traps.c	2006-02-12 14:28:46 +0100
+@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
+ #ifdef CONFIG_SMP
+ 	printk("CPU %d ", hard_smp_processor_id());
+ #endif
+-	printk("%s(%d): %s %ld\n", current->comm, current->pid, str, err);
++	printk("%s(%d[#%u]): %s %ld\n", current->comm,
++		current->pid, current->xid, str, err);
+ 	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.15.4/arch/alpha/mm/init.c linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/mm/init.c
+--- linux-2.6.15.4/arch/alpha/mm/init.c	2005-03-02 12:38:18 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/mm/init.c	2006-01-04 21:59:59 +0100
 @@ -20,6 +20,7 @@
  #include <linux/init.h>
  #include <linux/bootmem.h> /* max_low_pfn */
@@ -208,9 +221,9 @@
  
  #include <asm/system.h>
  #include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.15.1/arch/arm/Kconfig linux-2.6.15.1-vs2.1.0.5.1/arch/arm/Kconfig
---- linux-2.6.15.1/arch/arm/Kconfig	2006-01-03 17:29:06 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/arm/Kconfig	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/arm/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/arm/Kconfig
+--- linux-2.6.15.4/arch/arm/Kconfig	2006-01-03 17:29:06 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/arm/Kconfig	2006-01-04 21:59:59 +0100
 @@ -756,6 +756,8 @@ source "arch/arm/oprofile/Kconfig"
  
  source "arch/arm/Kconfig.debug"
@@ -220,9 +233,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.1/arch/arm/kernel/calls.S linux-2.6.15.1-vs2.1.0.5.1/arch/arm/kernel/calls.S
---- linux-2.6.15.1/arch/arm/kernel/calls.S	2006-01-03 17:29:06 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/arm/kernel/calls.S	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/arm/kernel/calls.S linux-2.6.15.4-vs2.1.1-rc2/arch/arm/kernel/calls.S
+--- linux-2.6.15.4/arch/arm/kernel/calls.S	2006-01-03 17:29:06 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/arm/kernel/calls.S	2006-01-04 21:59:59 +0100
 @@ -327,7 +327,7 @@ __syscall_start:
  /* 310 */	.long	sys_request_key
  		.long	sys_keyctl
@@ -232,10 +245,20 @@
  		.long	sys_ioprio_set
  /* 315 */	.long	sys_ioprio_get
  		.long	sys_inotify_init
-diff -NurpP --minimal linux-2.6.15.1/arch/arm/kernel/process.c linux-2.6.15.1-vs2.1.0.5.1/arch/arm/kernel/process.c
---- linux-2.6.15.1/arch/arm/kernel/process.c	2006-01-03 17:29:06 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/arm/kernel/process.c	2006-01-28 03:57:52 +0100
-@@ -449,7 +449,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+diff -NurpP --minimal linux-2.6.15.4/arch/arm/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/arm/kernel/process.c
+--- linux-2.6.15.4/arch/arm/kernel/process.c	2006-01-03 17:29:06 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/arm/kernel/process.c	2006-02-12 14:28:46 +0100
+@@ -227,7 +227,8 @@ void __show_regs(struct pt_regs *regs)
+ void show_regs(struct pt_regs * regs)
+ {
+ 	printk("\n");
+-	printk("Pid: %d, comm: %20s\n", current->pid, current->comm);
++	printk("Pid: %d[#%u], comm: %20s\n",
++		current->pid, current->xid, current->comm);
+ 	__show_regs(regs);
+ 	__backtrace();
+ }
+@@ -449,7 +450,8 @@ pid_t kernel_thread(int (*fn)(void *), v
  	regs.ARM_pc = (unsigned long)kernel_thread_helper;
  	regs.ARM_cpsr = SVC_MODE;
  
@@ -245,9 +268,9 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-diff -NurpP --minimal linux-2.6.15.1/arch/arm26/Kconfig linux-2.6.15.1-vs2.1.0.5.1/arch/arm26/Kconfig
---- linux-2.6.15.1/arch/arm26/Kconfig	2005-10-28 20:49:09 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/arm26/Kconfig	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/arm26/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/Kconfig
+--- linux-2.6.15.4/arch/arm26/Kconfig	2005-10-28 20:49:09 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/Kconfig	2006-01-04 21:59:59 +0100
 @@ -232,6 +232,8 @@ source "drivers/usb/Kconfig"
  
  source "arch/arm26/Kconfig.debug"
@@ -257,9 +280,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.1/arch/arm26/kernel/calls.S linux-2.6.15.1-vs2.1.0.5.1/arch/arm26/kernel/calls.S
---- linux-2.6.15.1/arch/arm26/kernel/calls.S	2005-03-02 12:38:19 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/arm26/kernel/calls.S	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/arm26/kernel/calls.S linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/kernel/calls.S
+--- linux-2.6.15.4/arch/arm26/kernel/calls.S	2005-03-02 12:38:19 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/kernel/calls.S	2006-01-04 21:59:59 +0100
 @@ -257,6 +257,11 @@ __syscall_start:
  		.long	sys_lremovexattr
  		.long	sys_fremovexattr
@@ -272,9 +295,9 @@
  __syscall_end:
  
  		.rept	NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.15.1/arch/arm26/kernel/process.c linux-2.6.15.1-vs2.1.0.5.1/arch/arm26/kernel/process.c
---- linux-2.6.15.1/arch/arm26/kernel/process.c	2006-01-03 17:29:08 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/arm26/kernel/process.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/arm26/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/kernel/process.c
+--- linux-2.6.15.4/arch/arm26/kernel/process.c	2006-01-03 17:29:08 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/kernel/process.c	2006-01-04 21:59:59 +0100
 @@ -367,7 +367,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;
@@ -285,9 +308,24 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-diff -NurpP --minimal linux-2.6.15.1/arch/cris/Kconfig linux-2.6.15.1-vs2.1.0.5.1/arch/cris/Kconfig
---- linux-2.6.15.1/arch/cris/Kconfig	2005-08-29 22:24:51 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/cris/Kconfig	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/arm26/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/kernel/traps.c
+--- linux-2.6.15.4/arch/arm26/kernel/traps.c	2005-03-02 12:38:19 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/kernel/traps.c	2006-02-12 14:30:03 +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());
+ 	show_regs(regs);
+-	printk("Process %s (pid: %d, stack limit = 0x%p)\n",
+-		current->comm, current->pid, tsk->thread_info + 1);
++	printk("Process %s (pid: %d[#%u], stack limit = 0x%p)\n",
++		current->comm, current->pid,
++		current->xid, tsk->thread_info + 1);
+ 
+ 	if (!user_mode(regs) || in_interrupt()) {
+ 		__dump_stack(tsk, (unsigned long)(regs + 1));
+diff -NurpP --minimal linux-2.6.15.4/arch/cris/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/cris/Kconfig
+--- linux-2.6.15.4/arch/cris/Kconfig	2005-08-29 22:24:51 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/cris/Kconfig	2006-01-04 21:59:59 +0100
 @@ -177,6 +177,8 @@ source "drivers/usb/Kconfig"
  
  source "arch/cris/Kconfig.debug"
@@ -297,9 +335,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.1/arch/cris/arch-v10/kernel/process.c linux-2.6.15.1-vs2.1.0.5.1/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.15.1/arch/cris/arch-v10/kernel/process.c	2005-08-29 22:24:51 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/cris/arch-v10/kernel/process.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/cris/arch-v10/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.15.4/arch/cris/arch-v10/kernel/process.c	2005-08-29 22:24:51 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/cris/arch-v10/kernel/process.c	2006-01-04 21:59:59 +0100
 @@ -104,7 +104,8 @@ int kernel_thread(int (*fn)(void *), voi
  	regs.dccr = 1 << I_DCCR_BITNR;
  
@@ -310,9 +348,9 @@
  }
  
  /* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.15.1/arch/cris/arch-v32/kernel/process.c linux-2.6.15.1-vs2.1.0.5.1/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.15.1/arch/cris/arch-v32/kernel/process.c	2005-08-29 22:24:51 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/cris/arch-v32/kernel/process.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/cris/arch-v32/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.15.4/arch/cris/arch-v32/kernel/process.c	2005-08-29 22:24:51 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/cris/arch-v32/kernel/process.c	2006-01-04 21:59:59 +0100
 @@ -121,7 +121,8 @@ kernel_thread(int (*fn)(void *), void * 
  	regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
  
@@ -323,9 +361,9 @@
  }
  
  /*
-diff -NurpP --minimal linux-2.6.15.1/arch/frv/kernel/kernel_thread.S linux-2.6.15.1-vs2.1.0.5.1/arch/frv/kernel/kernel_thread.S
---- linux-2.6.15.1/arch/frv/kernel/kernel_thread.S	2005-03-02 12:38:20 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/frv/kernel/kernel_thread.S	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/frv/kernel/kernel_thread.S linux-2.6.15.4-vs2.1.1-rc2/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.15.4/arch/frv/kernel/kernel_thread.S	2005-03-02 12:38:20 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/frv/kernel/kernel_thread.S	2006-01-04 21:59:59 +0100
 @@ -13,6 +13,8 @@
  #include <asm/unistd.h>
  
@@ -344,9 +382,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.15.1/arch/h8300/Kconfig linux-2.6.15.1-vs2.1.0.5.1/arch/h8300/Kconfig
---- linux-2.6.15.1/arch/h8300/Kconfig	2005-08-29 22:24:52 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/h8300/Kconfig	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/h8300/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/h8300/Kconfig
+--- linux-2.6.15.4/arch/h8300/Kconfig	2005-08-29 22:24:52 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/h8300/Kconfig	2006-01-04 21:59:59 +0100
 @@ -191,6 +191,8 @@ source "fs/Kconfig"
  
  source "arch/h8300/Kconfig.debug"
@@ -356,9 +394,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.1/arch/h8300/kernel/process.c linux-2.6.15.1-vs2.1.0.5.1/arch/h8300/kernel/process.c
---- linux-2.6.15.1/arch/h8300/kernel/process.c	2006-01-03 17:29:08 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/h8300/kernel/process.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/h8300/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/h8300/kernel/process.c
+--- linux-2.6.15.4/arch/h8300/kernel/process.c	2006-01-03 17:29:08 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/h8300/kernel/process.c	2006-01-04 21:59:59 +0100
 @@ -132,7 +132,7 @@ int kernel_thread(int (*fn)(void *), voi
  
  	fs = get_fs();
@@ -368,9 +406,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.15.1/arch/i386/Kconfig linux-2.6.15.1-vs2.1.0.5.1/arch/i386/Kconfig
---- linux-2.6.15.1/arch/i386/Kconfig	2006-01-03 17:29:08 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/i386/Kconfig	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/i386/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/i386/Kconfig
+--- linux-2.6.15.4/arch/i386/Kconfig	2006-01-03 17:29:08 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/i386/Kconfig	2006-01-04 21:59:59 +0100
 @@ -448,6 +448,46 @@ config HIGHMEM64G
  
  endchoice
@@ -427,9 +465,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.1/arch/i386/boot/compressed/misc.c linux-2.6.15.1-vs2.1.0.5.1/arch/i386/boot/compressed/misc.c
---- linux-2.6.15.1/arch/i386/boot/compressed/misc.c	2005-08-29 22:24:52 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/i386/boot/compressed/misc.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/i386/boot/compressed/misc.c linux-2.6.15.4-vs2.1.1-rc2/arch/i386/boot/compressed/misc.c
+--- linux-2.6.15.4/arch/i386/boot/compressed/misc.c	2005-08-29 22:24:52 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/i386/boot/compressed/misc.c	2006-01-04 21:59:59 +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");
@@ -450,10 +488,23 @@
  		mv->hcount = 0; /* say: we need not to move high_buffer */
  	}
  	else mv->hcount = -1;
-diff -NurpP --minimal linux-2.6.15.1/arch/i386/kernel/process.c linux-2.6.15.1-vs2.1.0.5.1/arch/i386/kernel/process.c
---- linux-2.6.15.1/arch/i386/kernel/process.c	2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/i386/kernel/process.c	2006-01-28 03:57:52 +0100
-@@ -351,7 +351,8 @@ int kernel_thread(int (*fn)(void *), voi
+diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/process.c
+--- linux-2.6.15.4/arch/i386/kernel/process.c	2006-01-03 17:29:09 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/process.c	2006-02-12 14:28:46 +0100
+@@ -290,8 +290,10 @@ void show_regs(struct pt_regs * regs)
+ 	unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
+ 
+ 	printk("\n");
+-	printk("Pid: %d, comm: %20s\n", current->pid, current->comm);
+-	printk("EIP: %04x:[<%08lx>] CPU: %d\n",0xffff & regs->xcs,regs->eip, smp_processor_id());
++	printk("Pid: %d[#%u], comm: %20s\n",
++		current->pid, current->xid, current->comm);
++	printk("EIP: %04x:[<%08lx>] CPU: %d\n",
++		0xffff & regs->xcs,regs->eip, smp_processor_id());
+ 	print_symbol("EIP is at %s\n", regs->eip);
+ 
+ 	if (user_mode(regs))
+@@ -351,7 +353,8 @@ int kernel_thread(int (*fn)(void *), voi
  	regs.eflags = X86_EFLAGS_IF | X86_EFLAGS_SF | X86_EFLAGS_PF | 0x2;
  
  	/* Ok, create the new process.. */
@@ -463,9 +514,9 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-diff -NurpP --minimal linux-2.6.15.1/arch/i386/kernel/setup.c linux-2.6.15.1-vs2.1.0.5.1/arch/i386/kernel/setup.c
---- linux-2.6.15.1/arch/i386/kernel/setup.c	2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/i386/kernel/setup.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/setup.c linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/setup.c
+--- linux-2.6.15.4/arch/i386/kernel/setup.c	2006-01-03 17:29:09 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/setup.c	2006-01-04 21:59:59 +0100
 @@ -1184,8 +1184,8 @@ void __init setup_bootmem_allocator(void
  	 * the (very unlikely) case of us accidentally initializing the
  	 * bootmem allocator with an invalid RAM area.
@@ -477,9 +528,9 @@
  
  	/*
  	 * reserve physical page 0 - it's a special BIOS page on many boxes,
-diff -NurpP --minimal linux-2.6.15.1/arch/i386/kernel/sys_i386.c linux-2.6.15.1-vs2.1.0.5.1/arch/i386/kernel/sys_i386.c
---- linux-2.6.15.1/arch/i386/kernel/sys_i386.c	2004-08-14 12:56:23 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/i386/kernel/sys_i386.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/sys_i386.c linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/sys_i386.c
+--- linux-2.6.15.4/arch/i386/kernel/sys_i386.c	2004-08-14 12:56:23 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/sys_i386.c	2006-01-04 21:59:59 +0100
 @@ -19,6 +19,7 @@
  #include <linux/mman.h>
  #include <linux/file.h>
@@ -527,9 +578,9 @@
  	error |= __put_user(0,name->machine+__OLD_UTS_LEN);
  	
  	up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.15.1/arch/i386/kernel/syscall_table.S linux-2.6.15.1-vs2.1.0.5.1/arch/i386/kernel/syscall_table.S
---- linux-2.6.15.1/arch/i386/kernel/syscall_table.S	2005-08-29 22:24:52 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/i386/kernel/syscall_table.S	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/syscall_table.S linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/syscall_table.S
+--- linux-2.6.15.4/arch/i386/kernel/syscall_table.S	2005-08-29 22:24:52 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/syscall_table.S	2006-01-04 21:59:59 +0100
 @@ -273,7 +273,7 @@ ENTRY(sys_call_table)
  	.long sys_tgkill	/* 270 */
  	.long sys_utimes
@@ -539,9 +590,9 @@
  	.long sys_mbind
  	.long sys_get_mempolicy
  	.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.15.1/arch/i386/kernel/traps.c linux-2.6.15.1-vs2.1.0.5.1/arch/i386/kernel/traps.c
---- linux-2.6.15.1/arch/i386/kernel/traps.c	2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/i386/kernel/traps.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/traps.c
+--- linux-2.6.15.4/arch/i386/kernel/traps.c	2006-01-03 17:29:09 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/traps.c	2006-02-12 14:31:40 +0100
 @@ -53,6 +53,7 @@
  #include <asm/kdebug.h>
  
@@ -550,7 +601,19 @@
  
  #include "mach_traps.h"
  
-@@ -307,6 +308,8 @@ void die(const char * str, struct pt_reg
+@@ -227,8 +228,9 @@ void show_registers(struct pt_regs *regs
+ 		regs->esi, regs->edi, regs->ebp, esp);
+ 	printk("ds: %04x   es: %04x   ss: %04x\n",
+ 		regs->xds & 0xffff, regs->xes & 0xffff, ss);
+-	printk("Process %s (pid: %d, threadinfo=%p task=%p)",
+-		current->comm, current->pid, current_thread_info(), current);
++	printk("Process %s (pid: %d[#%u], threadinfo=%p task=%p)",
++		current->comm, current->pid, current->xid,
++		current_thread_info(), current);
+ 	/*
+ 	 * When in-kernel, we also print out the stack and code at the
+ 	 * time of the fault..
+@@ -307,6 +309,8 @@ void die(const char * str, struct pt_reg
  	};
  	static int die_counter;
  
@@ -559,7 +622,7 @@
  	if (die.lock_owner != raw_smp_processor_id()) {
  		console_verbose();
  		spin_lock_irq(&die.lock);
-@@ -333,8 +336,9 @@ void die(const char * str, struct pt_reg
+@@ -333,8 +337,9 @@ void die(const char * str, struct pt_reg
  #endif
  		if (nl)
  			printk("\n");
@@ -570,9 +633,9 @@
    	} else
  		printk(KERN_ERR "Recursive die() failure, output suppressed\n");
  
-diff -NurpP --minimal linux-2.6.15.1/arch/ia64/Kconfig linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/Kconfig
---- linux-2.6.15.1/arch/ia64/Kconfig	2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/Kconfig	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/Kconfig
+--- linux-2.6.15.4/arch/ia64/Kconfig	2006-01-03 17:29:09 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/Kconfig	2006-01-04 21:59:59 +0100
 @@ -461,6 +461,8 @@ endmenu
  
  source "arch/ia64/Kconfig.debug"
@@ -582,9 +645,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.1/arch/ia64/ia32/binfmt_elf32.c linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.15.1/arch/ia64/ia32/binfmt_elf32.c	2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/ia32/binfmt_elf32.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/ia32/binfmt_elf32.c linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.15.4/arch/ia64/ia32/binfmt_elf32.c	2006-01-03 17:29:09 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/ia32/binfmt_elf32.c	2006-01-04 21:59:59 +0100
 @@ -199,7 +199,7 @@ ia64_elf32_init (struct pt_regs *regs)
  int
  ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
@@ -604,9 +667,9 @@
  	}
  
  	for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.15.1/arch/ia64/ia32/ia32_entry.S linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.15.1/arch/ia64/ia32/ia32_entry.S	2005-10-28 20:49:10 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/ia32/ia32_entry.S	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/ia32/ia32_entry.S linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.15.4/arch/ia64/ia32/ia32_entry.S	2005-10-28 20:49:10 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/ia32/ia32_entry.S	2006-01-04 21:59:59 +0100
 @@ -483,7 +483,7 @@ ia32_syscall_table:
   	data8 sys_tgkill	/* 270 */
   	data8 compat_sys_utimes
@@ -616,9 +679,9 @@
    	data8 sys_ni_syscall
   	data8 sys_ni_syscall	/* 275 */
    	data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.15.1/arch/ia64/kernel/asm-offsets.c linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/kernel/asm-offsets.c
---- linux-2.6.15.1/arch/ia64/kernel/asm-offsets.c	2005-10-28 20:49:10 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/kernel/asm-offsets.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/asm-offsets.c linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/asm-offsets.c
+--- linux-2.6.15.4/arch/ia64/kernel/asm-offsets.c	2005-10-28 20:49:10 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/asm-offsets.c	2006-01-04 21:59:59 +0100
 @@ -192,6 +192,7 @@ void foo(void)
      /* for assembly files which can't include sched.h: */
  	DEFINE(IA64_CLONE_VFORK, CLONE_VFORK);
@@ -627,9 +690,9 @@
  
  	BLANK();
  	DEFINE(IA64_CPUINFO_NSEC_PER_CYC_OFFSET,
-diff -NurpP --minimal linux-2.6.15.1/arch/ia64/kernel/entry.S linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/kernel/entry.S
---- linux-2.6.15.1/arch/ia64/kernel/entry.S	2005-10-28 20:49:10 +0200
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/kernel/entry.S	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/entry.S linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/entry.S
+--- linux-2.6.15.4/arch/ia64/kernel/entry.S	2005-10-28 20:49:10 +0200
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/entry.S	2006-01-04 21:59:59 +0100
 @@ -1589,7 +1589,7 @@ sys_call_table:
  	data8 sys_mq_notify
  	data8 sys_mq_getsetattr
@@ -639,9 +702,9 @@
  	data8 sys_waitid			// 1270
  	data8 sys_add_key
  	data8 sys_request_key
-diff -NurpP --minimal linux-2.6.15.1/arch/ia64/kernel/perfmon.c linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/kernel/perfmon.c
---- linux-2.6.15.1/arch/ia64/kernel/perfmon.c	2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/kernel/perfmon.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/perfmon.c linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/perfmon.c
+--- linux-2.6.15.4/arch/ia64/kernel/perfmon.c	2006-01-03 17:29:09 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/perfmon.c	2006-01-04 21:59:59 +0100
 @@ -39,6 +39,8 @@
  #include <linux/mount.h>
  #include <linux/bitops.h>
@@ -660,10 +723,20 @@
  	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.15.1/arch/ia64/kernel/process.c linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/kernel/process.c
---- linux-2.6.15.1/arch/ia64/kernel/process.c	2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/kernel/process.c	2006-01-28 03:57:52 +0100
-@@ -692,7 +692,8 @@ kernel_thread (int (*fn)(void *), void *
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/process.c
+--- linux-2.6.15.4/arch/ia64/kernel/process.c	2006-01-03 17:29:09 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/process.c	2006-02-12 14:28:46 +0100
+@@ -109,7 +109,8 @@ show_regs (struct pt_regs *regs)
+ 	unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
+ 
+ 	print_modules();
+-	printk("\nPid: %d, CPU %d, comm: %20s\n", current->pid, smp_processor_id(), current->comm);
++	printk("\nPid: %d[#%u], CPU %d, comm: %20s\n",
++		current->pid, current->xid, smp_processor_id(), current->comm);
+ 	printk("psr : %016lx ifs : %016lx ip  : [<%016lx>]    %s\n",
+ 	       regs->cr_ipsr, regs->cr_ifs, ip, print_tainted());
+ 	print_symbol("ip is at %s\n", ip);
+@@ -692,7 +693,8 @@ kernel_thread (int (*fn)(void *), void *
  	regs.sw.ar_fpsr = regs.pt.ar_fpsr = ia64_getreg(_IA64_REG_AR_FPSR);
  	regs.sw.ar_bspstore = (unsigned long) current + IA64_RBS_OFFSET;
  	regs.sw.pr = (1 << PRED_KERNEL_STACK);
@@ -673,9 +746,9 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-diff -NurpP --minimal linux-2.6.15.1/arch/ia64/kernel/ptrace.c linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/kernel/ptrace.c
---- linux-2.6.15.1/arch/ia64/kernel/ptrace.c	2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/kernel/ptrace.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/ptrace.c linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/ptrace.c
+--- linux-2.6.15.4/arch/ia64/kernel/ptrace.c	2006-01-03 17:29:09 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/ptrace.c	2006-01-04 21:59:59 +0100
 @@ -1450,6 +1450,9 @@ sys_ptrace (long request, pid_t pid, uns
  	read_unlock(&tasklist_lock);
  	if (!child)
@@ -686,9 +759,36 @@
  	ret = -EPERM;
  	if (pid == 1)		/* no messing around with init! */
  		goto out_tsk;
-diff -NurpP --minimal linux-2.6.15.1/arch/ia64/mm/fault.c linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/mm/fault.c
---- linux-2.6.15.1/arch/ia64/mm/fault.c	2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/ia64/mm/fault.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/traps.c
+--- linux-2.6.15.4/arch/ia64/kernel/traps.c	2006-01-03 17:29:09 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/traps.c	2006-02-12 14:28:46 +0100
+@@ -106,8 +106,9 @@ die (const char *str, struct pt_regs *re
+ 	put_cpu();
+ 
+ 	if (++die.lock_owner_depth < 3) {
+-		printk("%s[%d]: %s %ld [%d]\n",
+-			current->comm, current->pid, str, err, ++die_counter);
++		printk("%s[%d[#%u]]: %s %ld [%d]\n",
++			current->comm, current->pid, current->xid,
++			str, err, ++die_counter);
+ 		(void) notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV);
+ 		show_regs(regs);
+   	} else
+@@ -327,8 +328,9 @@ handle_fpu_swa (int fp_fault, struct pt_
+ 		last_time = jiffies;
+ 		++fpu_swa_count;
+ 		printk(KERN_WARNING
+-		       "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
+-		       current->comm, current->pid, regs->cr_iip + ia64_psr(regs)->ri, isr);
++		       "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n",
++		       current->comm, current->pid, current->xid,
++		       regs->cr_iip + ia64_psr(regs)->ri, isr);
+ 	}
+ 
+ 	exception = fp_emulate(fp_fault, bundle, &regs->cr_ipsr, &regs->ar_fpsr, &isr, &regs->pr,
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/mm/fault.c linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/mm/fault.c
+--- linux-2.6.15.4/arch/ia64/mm/fault.c	2006-01-03 17:29:09 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/mm/fault.c	2006-01-04 21:59:59 +0100
 @@ -10,6 +10,7 @@
  #include <linux/smp_lock.h>
  #include <linux/interrupt.h>
@@ -697,9 +797,9 @@
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.15.1/arch/m32r/kernel/process.c linux-2.6.15.1-vs2.1.0.5.1/arch/m32r/kernel/process.c
---- linux-2.6.15.1/arch/m32r/kernel/process.c	2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.1-vs2.1.0.5.1/arch/m32r/kernel/process.c	2006-01-28 03:57:52 +0100
+diff -NurpP --minimal linux-2.6.15.4/arch/m32r/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/m32r/kernel/process.c
+--- linux-2.6.15.4/arch/m32r/kernel/process.c	2006-01-03 17:29:09 +0100
++++ linux-2.6.15.4-vs2.1.1-rc2/arch/m32r/kernel/process.c	2006-01-04 21:59:59 +0100
 @@ -204,8 +204,8 @@ int kernel_thread(int (*fn)(void *), voi
  	regs.psw = M32R_PSW_BIE;
  
@@ -711,9 +811,24 @@
  }
  
<<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.6&r2=1.1.2.7&f=u



More information about the pld-cvs-commit mailing list