SOURCES (Titanium): linux-2.6-vs2.3.patch - http://vserver.13thfloor.at/Exp...

hawk hawk at pld-linux.org
Fri Aug 29 13:59:50 CEST 2008


Author: hawk                         Date: Fri Aug 29 11:59:50 2008 GMT
Module: SOURCES                       Tag: Titanium
---- Log message:
- http://vserver.13thfloor.at/Experimental/patch-2.6.26.3-vs2.3.0.35.diff
  with extraversion killed

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.1.2.17.2.16 -> 1.1.2.17.2.17) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.1.2.17.2.16 SOURCES/linux-2.6-vs2.3.patch:1.1.2.17.2.17
--- SOURCES/linux-2.6-vs2.3.patch:1.1.2.17.2.16	Tue Jul 29 00:23:25 2008
+++ SOURCES/linux-2.6-vs2.3.patch	Fri Aug 29 13:59:44 2008
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.25.11/arch/alpha/Kconfig linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/Kconfig
---- linux-2.6.25.11/arch/alpha/Kconfig	2008-04-17 12:05:26.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/Kconfig	2008-04-19 15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/alpha/Kconfig linux-2.6.26.3-vs2.3.0.35/arch/alpha/Kconfig
+--- linux-2.6.26.3/arch/alpha/Kconfig	2008-04-17 12:05:26.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/alpha/Kconfig	2008-07-16 22:41:36.000000000 -0400
 @@ -671,6 +671,8 @@ config DUMMY_CONSOLE
  	depends on VGA_HOSE
  	default y
@@ -10,9 +10,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.11/arch/alpha/kernel/entry.S linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/kernel/entry.S
---- linux-2.6.25.11/arch/alpha/kernel/entry.S	2008-04-17 11:31:21.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/kernel/entry.S	2008-04-21 11:09:01.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/alpha/kernel/entry.S linux-2.6.26.3-vs2.3.0.35/arch/alpha/kernel/entry.S
+--- linux-2.6.26.3/arch/alpha/kernel/entry.S	2008-04-17 11:31:21.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/alpha/kernel/entry.S	2008-07-16 22:41:36.000000000 -0400
 @@ -872,24 +872,15 @@ sys_getxgid:
  	.globl	sys_getxpid
  	.ent	sys_getxpid
@@ -45,9 +45,9 @@
  	ret
  .end sys_getxpid
  
-diff -NurpP --minimal linux-2.6.25.11/arch/alpha/kernel/osf_sys.c linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/kernel/osf_sys.c
---- linux-2.6.25.11/arch/alpha/kernel/osf_sys.c	2008-07-15 22:05:16.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/kernel/osf_sys.c	2008-05-21 14:30:40.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/alpha/kernel/osf_sys.c linux-2.6.26.3-vs2.3.0.35/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.26.3/arch/alpha/kernel/osf_sys.c	2008-07-14 17:22:23.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/alpha/kernel/osf_sys.c	2008-07-16 22:41:36.000000000 -0400
 @@ -883,7 +883,7 @@ osf_gettimeofday(struct timeval32 __user
  {
  	if (tv) {
@@ -57,9 +57,9 @@
  		if (put_tv32(tv, &ktv))
  			return -EFAULT;
  	}
-diff -NurpP --minimal linux-2.6.25.11/arch/alpha/kernel/ptrace.c linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/kernel/ptrace.c
---- linux-2.6.25.11/arch/alpha/kernel/ptrace.c	2008-04-17 11:31:21.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/kernel/ptrace.c	2008-04-19 15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/alpha/kernel/ptrace.c linux-2.6.26.3-vs2.3.0.35/arch/alpha/kernel/ptrace.c
+--- linux-2.6.26.3/arch/alpha/kernel/ptrace.c	2008-04-17 11:31:21.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/alpha/kernel/ptrace.c	2008-07-16 22:41:36.000000000 -0400
 @@ -15,6 +15,7 @@
  #include <linux/slab.h>
  #include <linux/security.h>
@@ -68,45 +68,9 @@
  
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.25.11/arch/alpha/kernel/semaphore.c linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/kernel/semaphore.c
---- linux-2.6.25.11/arch/alpha/kernel/semaphore.c	2008-04-17 11:31:21.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/kernel/semaphore.c	2008-04-19 15:14:51.000000000 -0400
-@@ -68,8 +68,8 @@ __down_failed(struct semaphore *sem)
- 	DECLARE_WAITQUEUE(wait, tsk);
- 
- #ifdef CONFIG_DEBUG_SEMAPHORE
--	printk("%s(%d): down failed(%p)\n",
--	       tsk->comm, task_pid_nr(tsk), sem);
-+	printk("%s(%d:#%u): down failed(%p)\n",
-+	       tsk->comm, task_pid_nr(tsk), tsk->xid, sem);
- #endif
- 
- 	tsk->state = TASK_UNINTERRUPTIBLE;
-@@ -97,8 +97,8 @@ __down_failed(struct semaphore *sem)
- 	wake_up(&sem->wait);
- 
- #ifdef CONFIG_DEBUG_SEMAPHORE
--	printk("%s(%d): down acquired(%p)\n",
--	       tsk->comm, task_pid_nr(tsk), sem);
-+	printk("%s(%d:#%u): down acquired(%p)\n",
-+	       tsk->comm, task_pid_nr(tsk), tsk->xid, sem);
- #endif
- }
- 
-@@ -110,8 +110,8 @@ __down_failed_interruptible(struct semap
- 	long ret = 0;
- 
- #ifdef CONFIG_DEBUG_SEMAPHORE
--	printk("%s(%d): down failed(%p)\n",
--	       tsk->comm, task_pid_nr(tsk), sem);
-+	printk("%s(%d:#%u): down failed(%p)\n",
-+	       tsk->comm, task_pid_nr(tsk), tsk->xid, sem);
- #endif
- 
- 	tsk->state = TASK_INTERRUPTIBLE;
-diff -NurpP --minimal linux-2.6.25.11/arch/alpha/kernel/systbls.S linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/kernel/systbls.S
---- linux-2.6.25.11/arch/alpha/kernel/systbls.S	2008-04-17 12:05:26.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/kernel/systbls.S	2008-04-19 15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/alpha/kernel/systbls.S linux-2.6.26.3-vs2.3.0.35/arch/alpha/kernel/systbls.S
+--- linux-2.6.26.3/arch/alpha/kernel/systbls.S	2008-04-17 12:05:26.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/alpha/kernel/systbls.S	2008-07-16 22:41:36.000000000 -0400
 @@ -446,7 +446,7 @@ sys_call_table:
  	.quad sys_stat64			/* 425 */
  	.quad sys_lstat64
@@ -116,10 +80,10 @@
  	.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.25.11/arch/alpha/kernel/traps.c linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/kernel/traps.c
---- linux-2.6.25.11/arch/alpha/kernel/traps.c	2008-04-17 11:31:21.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/kernel/traps.c	2008-04-19 15:14:51.000000000 -0400
-@@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
+diff -NurpP --minimal linux-2.6.26.3/arch/alpha/kernel/traps.c linux-2.6.26.3-vs2.3.0.35/arch/alpha/kernel/traps.c
+--- linux-2.6.26.3/arch/alpha/kernel/traps.c	2008-07-14 17:22:23.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/alpha/kernel/traps.c	2008-07-16 22:41:36.000000000 -0400
+@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
  #ifdef CONFIG_SMP
  	printk("CPU %d ", hard_smp_processor_id());
  #endif
@@ -129,9 +93,9 @@
  	dik_show_regs(regs, r9_15);
  	add_taint(TAINT_DIE);
  	dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.25.11/arch/alpha/mm/fault.c linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/mm/fault.c
---- linux-2.6.25.11/arch/alpha/mm/fault.c	2008-04-17 11:31:21.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/alpha/mm/fault.c	2008-04-19 15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/alpha/mm/fault.c linux-2.6.26.3-vs2.3.0.35/arch/alpha/mm/fault.c
+--- linux-2.6.26.3/arch/alpha/mm/fault.c	2008-04-17 11:31:21.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/alpha/mm/fault.c	2008-07-16 22:41:36.000000000 -0400
 @@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
  		down_read(&mm->mmap_sem);
  		goto survive;
@@ -143,10 +107,10 @@
  	if (!user_mode(regs))
  		goto no_context;
  	do_group_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.25.11/arch/arm/Kconfig linux-2.6.25.11-vs2.3.0.34.14/arch/arm/Kconfig
---- linux-2.6.25.11/arch/arm/Kconfig	2008-04-17 12:05:26.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/arm/Kconfig	2008-04-19 15:14:51.000000000 -0400
-@@ -1180,6 +1180,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.26.3/arch/arm/Kconfig linux-2.6.26.3-vs2.3.0.35/arch/arm/Kconfig
+--- linux-2.6.26.3/arch/arm/Kconfig	2008-07-14 17:22:23.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/arm/Kconfig	2008-07-16 22:41:36.000000000 -0400
+@@ -1187,6 +1187,8 @@ source "fs/Kconfig"
  
  source "arch/arm/Kconfig.debug"
  
@@ -155,9 +119,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.11/arch/arm/kernel/calls.S linux-2.6.25.11-vs2.3.0.34.14/arch/arm/kernel/calls.S
---- linux-2.6.25.11/arch/arm/kernel/calls.S	2008-04-17 12:05:26.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/arm/kernel/calls.S	2008-04-19 15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/arm/kernel/calls.S linux-2.6.26.3-vs2.3.0.35/arch/arm/kernel/calls.S
+--- linux-2.6.26.3/arch/arm/kernel/calls.S	2008-07-14 17:22:23.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/arm/kernel/calls.S	2008-07-16 22:41:36.000000000 -0400
 @@ -322,7 +322,7 @@
  /* 310 */	CALL(sys_request_key)
  		CALL(sys_keyctl)
@@ -167,9 +131,9 @@
  		CALL(sys_ioprio_set)
  /* 315 */	CALL(sys_ioprio_get)
  		CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.25.11/arch/arm/kernel/process.c linux-2.6.25.11-vs2.3.0.34.14/arch/arm/kernel/process.c
---- linux-2.6.25.11/arch/arm/kernel/process.c	2008-04-17 12:05:26.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/arm/kernel/process.c	2008-04-21 11:09:01.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/arm/kernel/process.c linux-2.6.26.3-vs2.3.0.35/arch/arm/kernel/process.c
+--- linux-2.6.26.3/arch/arm/kernel/process.c	2008-04-17 12:05:26.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/arm/kernel/process.c	2008-07-16 22:41:36.000000000 -0400
 @@ -264,7 +264,8 @@ void __show_regs(struct pt_regs *regs)
  void show_regs(struct pt_regs * regs)
  {
@@ -180,9 +144,9 @@
  	__show_regs(regs);
  	__backtrace();
  }
-diff -NurpP --minimal linux-2.6.25.11/arch/arm/kernel/traps.c linux-2.6.25.11-vs2.3.0.34.14/arch/arm/kernel/traps.c
---- linux-2.6.25.11/arch/arm/kernel/traps.c	2008-04-17 12:05:26.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/arm/kernel/traps.c	2008-04-19 15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/arm/kernel/traps.c linux-2.6.26.3-vs2.3.0.35/arch/arm/kernel/traps.c
+--- linux-2.6.26.3/arch/arm/kernel/traps.c	2008-04-17 12:05:26.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/arm/kernel/traps.c	2008-07-16 22:41:36.000000000 -0400
 @@ -214,8 +214,8 @@ static void __die(const char *str, int e
  	       str, err, ++die_counter);
  	print_modules();
@@ -194,9 +158,9 @@
  
  	if (!user_mode(regs) || in_interrupt()) {
  		dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.25.11/arch/arm/mm/fault.c linux-2.6.25.11-vs2.3.0.34.14/arch/arm/mm/fault.c
---- linux-2.6.25.11/arch/arm/mm/fault.c	2008-04-17 12:05:27.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/arm/mm/fault.c	2008-04-19 15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/arm/mm/fault.c linux-2.6.26.3-vs2.3.0.35/arch/arm/mm/fault.c
+--- linux-2.6.26.3/arch/arm/mm/fault.c	2008-04-17 12:05:27.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/arm/mm/fault.c	2008-07-16 22:41:36.000000000 -0400
 @@ -292,7 +292,8 @@ do_page_fault(unsigned long addr, unsign
  		 * happened to us that made us unable to handle
  		 * the page fault gracefully.
@@ -207,9 +171,9 @@
  		do_group_exit(SIGKILL);
  		return 0;
  	}
-diff -NurpP --minimal linux-2.6.25.11/arch/cris/Kconfig linux-2.6.25.11-vs2.3.0.34.14/arch/cris/Kconfig
---- linux-2.6.25.11/arch/cris/Kconfig	2008-04-17 12:05:27.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/cris/Kconfig	2008-04-19 15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/cris/Kconfig linux-2.6.26.3-vs2.3.0.35/arch/cris/Kconfig
+--- linux-2.6.26.3/arch/cris/Kconfig	2008-04-17 12:05:27.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/cris/Kconfig	2008-07-16 22:41:36.000000000 -0400
 @@ -679,6 +679,8 @@ source "drivers/usb/Kconfig"
  
  source "arch/cris/Kconfig.debug"
@@ -219,9 +183,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.11/arch/frv/kernel/kernel_thread.S linux-2.6.25.11-vs2.3.0.34.14/arch/frv/kernel/kernel_thread.S
---- linux-2.6.25.11/arch/frv/kernel/kernel_thread.S	2007-02-04 13:44:54.000000000 -0500
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/frv/kernel/kernel_thread.S	2008-04-21 11:09:01.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/frv/kernel/kernel_thread.S linux-2.6.26.3-vs2.3.0.35/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.26.3/arch/frv/kernel/kernel_thread.S	2007-02-04 13:44:54.000000000 -0500
++++ linux-2.6.26.3-vs2.3.0.35/arch/frv/kernel/kernel_thread.S	2008-07-16 22:41:36.000000000 -0400
 @@ -37,7 +37,7 @@ kernel_thread:
  
  	# start by forking the current process, but with shared VM
@@ -231,9 +195,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.25.11/arch/h8300/Kconfig linux-2.6.25.11-vs2.3.0.34.14/arch/h8300/Kconfig
---- linux-2.6.25.11/arch/h8300/Kconfig	2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/h8300/Kconfig	2008-04-19 15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/h8300/Kconfig linux-2.6.26.3-vs2.3.0.35/arch/h8300/Kconfig
+--- linux-2.6.26.3/arch/h8300/Kconfig	2008-04-17 12:05:28.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/h8300/Kconfig	2008-07-16 22:41:36.000000000 -0400
 @@ -233,6 +233,8 @@ source "fs/Kconfig"
  
  source "arch/h8300/Kconfig.debug"
@@ -243,9 +207,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.11/arch/ia64/ia32/ia32_entry.S linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.25.11/arch/ia64/ia32/ia32_entry.S	2008-04-17 10:37:14.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/ia32/ia32_entry.S	2008-04-19 15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/ia32/ia32_entry.S linux-2.6.26.3-vs2.3.0.35/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.26.3/arch/ia64/ia32/ia32_entry.S	2008-04-17 10:37:14.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/ia64/ia32/ia32_entry.S	2008-07-16 22:41:36.000000000 -0400
 @@ -446,7 +446,7 @@ ia32_syscall_table:
   	data8 sys_tgkill	/* 270 */
   	data8 compat_sys_utimes
@@ -255,10 +219,10 @@
    	data8 sys_ni_syscall
   	data8 sys_ni_syscall	/* 275 */
    	data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.25.11/arch/ia64/ia32/sys_ia32.c linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/ia32/sys_ia32.c
---- linux-2.6.25.11/arch/ia64/ia32/sys_ia32.c	2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/ia32/sys_ia32.c	2008-04-19 15:14:51.000000000 -0400
-@@ -1177,7 +1177,7 @@ sys32_gettimeofday (struct compat_timeva
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/ia32/sys_ia32.c linux-2.6.26.3-vs2.3.0.35/arch/ia64/ia32/sys_ia32.c
+--- linux-2.6.26.3/arch/ia64/ia32/sys_ia32.c	2008-07-14 17:22:26.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/ia64/ia32/sys_ia32.c	2008-07-16 22:41:36.000000000 -0400
+@@ -1178,7 +1178,7 @@ sys32_gettimeofday (struct compat_timeva
  {
  	if (tv) {
  		struct timeval ktv;
@@ -267,10 +231,10 @@
  		if (put_tv32(tv, &ktv))
  			return -EFAULT;
  	}
-diff -NurpP --minimal linux-2.6.25.11/arch/ia64/Kconfig linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/Kconfig
---- linux-2.6.25.11/arch/ia64/Kconfig	2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/Kconfig	2008-04-19 15:14:51.000000000 -0400
-@@ -615,6 +615,8 @@ source "arch/ia64/hp/sim/Kconfig"
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/Kconfig linux-2.6.26.3-vs2.3.0.35/arch/ia64/Kconfig
+--- linux-2.6.26.3/arch/ia64/Kconfig	2008-07-14 17:22:26.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/ia64/Kconfig	2008-07-16 22:41:36.000000000 -0400
+@@ -638,6 +638,8 @@ source "arch/ia64/hp/sim/Kconfig"
  
  source "arch/ia64/Kconfig.debug"
  
@@ -279,10 +243,10 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.11/arch/ia64/kernel/entry.S linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/kernel/entry.S
---- linux-2.6.25.11/arch/ia64/kernel/entry.S	2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/kernel/entry.S	2008-04-19 15:14:51.000000000 -0400
-@@ -1547,7 +1547,7 @@ sys_call_table:
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/kernel/entry.S linux-2.6.26.3-vs2.3.0.35/arch/ia64/kernel/entry.S
+--- linux-2.6.26.3/arch/ia64/kernel/entry.S	2008-07-14 17:22:26.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/ia64/kernel/entry.S	2008-07-16 22:41:36.000000000 -0400
+@@ -1619,7 +1619,7 @@ sys_call_table:
  	data8 sys_mq_notify
  	data8 sys_mq_getsetattr
  	data8 sys_kexec_load
@@ -291,9 +255,9 @@
  	data8 sys_waitid			// 1270
  	data8 sys_add_key
  	data8 sys_request_key
-diff -NurpP --minimal linux-2.6.25.11/arch/ia64/kernel/perfmon.c linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/kernel/perfmon.c
---- linux-2.6.25.11/arch/ia64/kernel/perfmon.c	2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/kernel/perfmon.c	2008-04-19 15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/kernel/perfmon.c linux-2.6.26.3-vs2.3.0.35/arch/ia64/kernel/perfmon.c
+--- linux-2.6.26.3/arch/ia64/kernel/perfmon.c	2008-07-14 17:22:27.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/ia64/kernel/perfmon.c	2008-07-16 22:41:36.000000000 -0400
 @@ -40,6 +40,7 @@
  #include <linux/capability.h>
  #include <linux/rcupdate.h>
@@ -302,7 +266,7 @@
  
  #include <asm/errno.h>
  #include <asm/intrinsics.h>
-@@ -2374,7 +2375,7 @@ pfm_smpl_buffer_alloc(struct task_struct
+@@ -2376,7 +2377,7 @@ pfm_smpl_buffer_alloc(struct task_struct
  	 */
  	insert_vm_struct(mm, vma);
  
@@ -311,9 +275,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.25.11/arch/ia64/kernel/process.c linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/kernel/process.c
---- linux-2.6.25.11/arch/ia64/kernel/process.c	2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/kernel/process.c	2008-04-21 11:09:01.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/kernel/process.c linux-2.6.26.3-vs2.3.0.35/arch/ia64/kernel/process.c
+--- linux-2.6.26.3/arch/ia64/kernel/process.c	2008-07-14 17:22:27.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/ia64/kernel/process.c	2008-07-16 22:41:36.000000000 -0400
 @@ -105,8 +105,8 @@ show_regs (struct pt_regs *regs)
  	unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
  
@@ -325,20 +289,20 @@
  	printk("psr : %016lx ifs : %016lx ip  : [<%016lx>]    %s (%s)\n",
  	       regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
  	       init_utsname()->release);
-diff -NurpP --minimal linux-2.6.25.11/arch/ia64/kernel/ptrace.c linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/kernel/ptrace.c
---- linux-2.6.25.11/arch/ia64/kernel/ptrace.c	2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/kernel/ptrace.c	2008-04-19 15:14:51.000000000 -0400
-@@ -17,6 +17,7 @@
- #include <linux/security.h>
- #include <linux/audit.h>
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/kernel/ptrace.c linux-2.6.26.3-vs2.3.0.35/arch/ia64/kernel/ptrace.c
+--- linux-2.6.26.3/arch/ia64/kernel/ptrace.c	2008-07-14 17:22:27.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/ia64/kernel/ptrace.c	2008-07-17 21:01:48.000000000 -0400
+@@ -22,6 +22,7 @@
  #include <linux/signal.h>
+ #include <linux/regset.h>
+ #include <linux/elf.h>
 +#include <linux/vs_base.h>
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.25.11/arch/ia64/kernel/traps.c linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/kernel/traps.c
---- linux-2.6.25.11/arch/ia64/kernel/traps.c	2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/kernel/traps.c	2008-04-21 10:33:04.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/kernel/traps.c linux-2.6.26.3-vs2.3.0.35/arch/ia64/kernel/traps.c
+--- linux-2.6.26.3/arch/ia64/kernel/traps.c	2008-04-17 12:05:28.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/ia64/kernel/traps.c	2008-07-16 22:41:36.000000000 -0400
 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
  	put_cpu();
  
@@ -363,9 +327,9 @@
  			}
  		}
  	}
-diff -NurpP --minimal linux-2.6.25.11/arch/ia64/mm/fault.c linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/mm/fault.c
---- linux-2.6.25.11/arch/ia64/mm/fault.c	2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/ia64/mm/fault.c	2008-04-19 15:14:52.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/mm/fault.c linux-2.6.26.3-vs2.3.0.35/arch/ia64/mm/fault.c
+--- linux-2.6.26.3/arch/ia64/mm/fault.c	2008-04-17 12:05:28.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/ia64/mm/fault.c	2008-07-16 22:41:36.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/interrupt.h>
  #include <linux/kprobes.h>
@@ -374,9 +338,9 @@
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.25.11/arch/m32r/kernel/traps.c linux-2.6.25.11-vs2.3.0.34.14/arch/m32r/kernel/traps.c
---- linux-2.6.25.11/arch/m32r/kernel/traps.c	2008-04-17 11:31:23.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/m32r/kernel/traps.c	2008-04-19 15:14:52.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/m32r/kernel/traps.c linux-2.6.26.3-vs2.3.0.35/arch/m32r/kernel/traps.c
+--- linux-2.6.26.3/arch/m32r/kernel/traps.c	2008-04-17 11:31:23.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/m32r/kernel/traps.c	2008-07-16 22:41:36.000000000 -0400
 @@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
  	} else {
  		printk("SPI: %08lx\n", sp);
@@ -389,10 +353,10 @@
  
  	/*
  	 * When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.25.11/arch/m68k/Kconfig linux-2.6.25.11-vs2.3.0.34.14/arch/m68k/Kconfig
---- linux-2.6.25.11/arch/m68k/Kconfig	2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/m68k/Kconfig	2008-04-19 15:14:52.000000000 -0400
-@@ -674,6 +674,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.26.3/arch/m68k/Kconfig linux-2.6.26.3-vs2.3.0.35/arch/m68k/Kconfig
+--- linux-2.6.26.3/arch/m68k/Kconfig	2008-07-14 17:22:27.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/m68k/Kconfig	2008-07-16 22:41:36.000000000 -0400
+@@ -667,6 +667,8 @@ source "fs/Kconfig"
  
  source "arch/m68k/Kconfig.debug"
  
@@ -401,9 +365,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.11/arch/m68k/kernel/ptrace.c linux-2.6.25.11-vs2.3.0.34.14/arch/m68k/kernel/ptrace.c
---- linux-2.6.25.11/arch/m68k/kernel/ptrace.c	2008-04-17 11:31:23.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/m68k/kernel/ptrace.c	2008-04-19 15:14:52.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/m68k/kernel/ptrace.c linux-2.6.26.3-vs2.3.0.35/arch/m68k/kernel/ptrace.c
+--- linux-2.6.26.3/arch/m68k/kernel/ptrace.c	2008-04-17 11:31:23.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/m68k/kernel/ptrace.c	2008-07-16 22:41:36.000000000 -0400
 @@ -18,6 +18,7 @@
  #include <linux/ptrace.h>
  #include <linux/user.h>
@@ -421,10 +385,10 @@
  
  	return ret;
  out_eio:
-diff -NurpP --minimal linux-2.6.25.11/arch/m68k/kernel/traps.c linux-2.6.25.11-vs2.3.0.34.14/arch/m68k/kernel/traps.c
---- linux-2.6.25.11/arch/m68k/kernel/traps.c	2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/m68k/kernel/traps.c	2008-04-19 15:14:52.000000000 -0400
-@@ -898,8 +898,8 @@ void show_registers(struct pt_regs *regs
+diff -NurpP --minimal linux-2.6.26.3/arch/m68k/kernel/traps.c linux-2.6.26.3-vs2.3.0.35/arch/m68k/kernel/traps.c
+--- linux-2.6.26.3/arch/m68k/kernel/traps.c	2008-07-14 17:22:27.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/m68k/kernel/traps.c	2008-07-16 22:41:36.000000000 -0400
+@@ -909,8 +909,8 @@ void show_registers(struct pt_regs *regs
  	printk("d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",
  	       regs->d4, regs->d5, regs->a0, regs->a1);
  
@@ -435,10 +399,10 @@
  	addr = (unsigned long)&fp->un;
  	printk("Frame format=%X ", regs->format);
  	switch (regs->format) {
-diff -NurpP --minimal linux-2.6.25.11/arch/m68knommu/Kconfig linux-2.6.25.11-vs2.3.0.34.14/arch/m68knommu/Kconfig
---- linux-2.6.25.11/arch/m68knommu/Kconfig	2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/m68knommu/Kconfig	2008-04-19 15:14:52.000000000 -0400
-@@ -722,6 +722,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.26.3/arch/m68knommu/Kconfig linux-2.6.26.3-vs2.3.0.35/arch/m68knommu/Kconfig
+--- linux-2.6.26.3/arch/m68knommu/Kconfig	2008-07-14 17:22:27.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/m68knommu/Kconfig	2008-07-16 22:41:36.000000000 -0400
+@@ -725,6 +725,8 @@ source "fs/Kconfig"
  
  source "arch/m68knommu/Kconfig.debug"
  
@@ -447,10 +411,10 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.11/arch/m68knommu/kernel/traps.c linux-2.6.25.11-vs2.3.0.34.14/arch/m68knommu/kernel/traps.c
---- linux-2.6.25.11/arch/m68knommu/kernel/traps.c	2008-04-17 10:37:14.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/m68knommu/kernel/traps.c	2008-04-19 15:14:52.000000000 -0400
-@@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_
+diff -NurpP --minimal linux-2.6.26.3/arch/m68knommu/kernel/traps.c linux-2.6.26.3-vs2.3.0.35/arch/m68knommu/kernel/traps.c
+--- linux-2.6.26.3/arch/m68knommu/kernel/traps.c	2008-07-14 17:22:27.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/m68knommu/kernel/traps.c	2008-07-16 22:41:36.000000000 -0400
+@@ -79,8 +79,9 @@ void die_if_kernel(char *str, struct pt_
  	printk(KERN_EMERG "d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",
  	       fp->d4, fp->d5, fp->a0, fp->a1);
  
@@ -462,10 +426,10 @@
  	show_stack(NULL, (unsigned long *)(fp + 1));
  	add_taint(TAINT_DIE);
  	do_exit(SIGSEGV);
-diff -NurpP --minimal linux-2.6.25.11/arch/mips/Kconfig linux-2.6.25.11-vs2.3.0.34.14/arch/mips/Kconfig
---- linux-2.6.25.11/arch/mips/Kconfig	2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/mips/Kconfig	2008-04-19 15:14:52.000000000 -0400
-@@ -2099,6 +2099,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.26.3/arch/mips/Kconfig linux-2.6.26.3-vs2.3.0.35/arch/mips/Kconfig
+--- linux-2.6.26.3/arch/mips/Kconfig	2008-07-14 17:22:27.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/mips/Kconfig	2008-07-16 22:41:36.000000000 -0400
+@@ -2131,6 +2131,8 @@ source "fs/Kconfig"
  
  source "arch/mips/Kconfig.debug"
  
@@ -474,9 +438,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.11/arch/mips/kernel/linux32.c linux-2.6.25.11-vs2.3.0.34.14/arch/mips/kernel/linux32.c
---- linux-2.6.25.11/arch/mips/kernel/linux32.c	2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/mips/kernel/linux32.c	2008-04-19 15:14:52.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/mips/kernel/linux32.c linux-2.6.26.3-vs2.3.0.35/arch/mips/kernel/linux32.c
+--- linux-2.6.26.3/arch/mips/kernel/linux32.c	2008-04-17 12:05:29.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/mips/kernel/linux32.c	2008-07-16 22:41:36.000000000 -0400
 @@ -209,7 +209,7 @@ sys32_gettimeofday(struct compat_timeval
  {
  	if (tv) {
@@ -486,9 +450,9 @@
  		if (put_tv32(tv, &ktv))
  			return -EFAULT;
  	}
-diff -NurpP --minimal linux-2.6.25.11/arch/mips/kernel/ptrace.c linux-2.6.25.11-vs2.3.0.34.14/arch/mips/kernel/ptrace.c
---- linux-2.6.25.11/arch/mips/kernel/ptrace.c	2008-04-17 11:31:23.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/mips/kernel/ptrace.c	2008-04-19 15:14:52.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/mips/kernel/ptrace.c linux-2.6.26.3-vs2.3.0.35/arch/mips/kernel/ptrace.c
+--- linux-2.6.26.3/arch/mips/kernel/ptrace.c	2008-04-17 11:31:23.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/mips/kernel/ptrace.c	2008-07-16 22:41:36.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <linux/security.h>
  #include <linux/audit.h>
@@ -507,9 +471,9 @@
  	switch (request) {
  	/* when I and D space are separate, these will need to be fixed. */
  	case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-2.6.25.11/arch/mips/kernel/scall32-o32.S linux-2.6.25.11-vs2.3.0.34.14/arch/mips/kernel/scall32-o32.S
---- linux-2.6.25.11/arch/mips/kernel/scall32-o32.S	2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/mips/kernel/scall32-o32.S	2008-04-19 15:14:52.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/mips/kernel/scall32-o32.S linux-2.6.26.3-vs2.3.0.35/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.26.3/arch/mips/kernel/scall32-o32.S	2008-04-17 12:05:29.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/mips/kernel/scall32-o32.S	2008-07-16 22:41:36.000000000 -0400
 @@ -619,7 +619,7 @@ einval:	li	v0, -EINVAL
  	sys	sys_mq_timedreceive	5
  	sys	sys_mq_notify		2	/* 4275 */
@@ -519,9 +483,9 @@
  	sys	sys_waitid		5
  	sys	sys_ni_syscall		0	/* available, was setaltroot */
  	sys	sys_add_key		5	/* 4280 */
-diff -NurpP --minimal linux-2.6.25.11/arch/mips/kernel/scall64-64.S linux-2.6.25.11-vs2.3.0.34.14/arch/mips/kernel/scall64-64.S
---- linux-2.6.25.11/arch/mips/kernel/scall64-64.S	2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/mips/kernel/scall64-64.S	2008-04-19 15:14:52.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/mips/kernel/scall64-64.S linux-2.6.26.3-vs2.3.0.35/arch/mips/kernel/scall64-64.S
+--- linux-2.6.26.3/arch/mips/kernel/scall64-64.S	2008-04-17 12:05:29.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/mips/kernel/scall64-64.S	2008-07-16 22:41:36.000000000 -0400
 @@ -434,7 +434,7 @@ sys_call_table:
  	PTR	sys_mq_timedreceive
  	PTR	sys_mq_notify
@@ -531,9 +495,9 @@
  	PTR	sys_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key
-diff -NurpP --minimal linux-2.6.25.11/arch/mips/kernel/scall64-n32.S linux-2.6.25.11-vs2.3.0.34.14/arch/mips/kernel/scall64-n32.S
---- linux-2.6.25.11/arch/mips/kernel/scall64-n32.S	2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/mips/kernel/scall64-n32.S	2008-04-19 15:14:52.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/mips/kernel/scall64-n32.S linux-2.6.26.3-vs2.3.0.35/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.26.3/arch/mips/kernel/scall64-n32.S	2008-04-17 12:05:29.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/mips/kernel/scall64-n32.S	2008-07-16 22:41:36.000000000 -0400
 @@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
  	PTR	compat_sys_mq_timedreceive
  	PTR	compat_sys_mq_notify
@@ -543,9 +507,9 @@
  	PTR	compat_sys_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key
-diff -NurpP --minimal linux-2.6.25.11/arch/mips/kernel/scall64-o32.S linux-2.6.25.11-vs2.3.0.34.14/arch/mips/kernel/scall64-o32.S
---- linux-2.6.25.11/arch/mips/kernel/scall64-o32.S	2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/mips/kernel/scall64-o32.S	2008-04-19 15:14:52.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/mips/kernel/scall64-o32.S linux-2.6.26.3-vs2.3.0.35/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.26.3/arch/mips/kernel/scall64-o32.S	2008-04-17 12:05:29.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/mips/kernel/scall64-o32.S	2008-07-16 22:41:36.000000000 -0400
 @@ -482,7 +482,7 @@ sys_call_table:
  	PTR	compat_sys_mq_timedreceive
  	PTR	compat_sys_mq_notify		/* 4275 */
@@ -555,24 +519,26 @@
  	PTR	sys32_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key			/* 4280 */
-diff -NurpP --minimal linux-2.6.25.11/arch/mips/kernel/traps.c linux-2.6.25.11-vs2.3.0.34.14/arch/mips/kernel/traps.c
---- linux-2.6.25.11/arch/mips/kernel/traps.c	2008-04-17 12:05:29.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/mips/kernel/traps.c	2008-04-19 15:14:52.000000000 -0400
-@@ -313,8 +313,9 @@ void show_registers(const struct pt_regs
- {
+diff -NurpP --minimal linux-2.6.26.3/arch/mips/kernel/traps.c linux-2.6.26.3-vs2.3.0.35/arch/mips/kernel/traps.c
+--- linux-2.6.26.3/arch/mips/kernel/traps.c	2008-07-14 17:22:27.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/mips/kernel/traps.c	2008-07-17 21:08:35.000000000 -0400
+@@ -324,9 +324,10 @@ void show_registers(const struct pt_regs
+ 
  	__show_regs(regs);
  	print_modules();
--	printk("Process %s (pid: %d, threadinfo=%p, task=%p)\n",
--	        current->comm, task_pid_nr(current), current_thread_info(), current);
-+	printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p)\n",
+-	printk("Process %s (pid: %d, threadinfo=%p, task=%p, tls=%0*lx)\n",
+-	       current->comm, current->pid, current_thread_info(), current,
+-	      field, current_thread_info()->tp_value);
++	printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p, tls=%0*lx)\n",
 +		current->comm, task_pid_nr(current), current->xid,
-+		current_thread_info(), current);
- 	show_stacktrace(current, regs);
- 	show_code((unsigned int __user *) regs->cp0_epc);
- 	printk("\n");
-diff -NurpP --minimal linux-2.6.25.11/arch/mips/mm/fault.c linux-2.6.25.11-vs2.3.0.34.14/arch/mips/mm/fault.c
---- linux-2.6.25.11/arch/mips/mm/fault.c	2008-04-17 11:31:24.000000000 -0400
-+++ linux-2.6.25.11-vs2.3.0.34.14/arch/mips/mm/fault.c	2008-04-19 15:14:52.000000000 -0400
++		current_thread_info(), current,
++		field, current_thread_info()->tp_value);
+ 	if (cpu_has_userlocal) {
+ 		unsigned long tls;
+ 
+diff -NurpP --minimal linux-2.6.26.3/arch/mips/mm/fault.c linux-2.6.26.3-vs2.3.0.35/arch/mips/mm/fault.c
+--- linux-2.6.26.3/arch/mips/mm/fault.c	2008-04-17 11:31:24.000000000 -0400
++++ linux-2.6.26.3-vs2.3.0.35/arch/mips/mm/fault.c	2008-07-16 22:41:36.000000000 -0400
 @@ -178,7 +178,8 @@ out_of_memory:
  		down_read(&mm->mmap_sem);
  		goto survive;
@@ -583,9 +549,9 @@
  	if (user_mode(regs))
  		do_group_exit(SIGKILL);
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-vs2.3.patch?r1=1.1.2.17.2.16&r2=1.1.2.17.2.17&f=u



More information about the pld-cvs-commit mailing list