packages: kernel/kernel.spec, kernel/kernel-vserver-2.3.patch - up to vserv...

arekm arekm at pld-linux.org
Mon Sep 6 17:22:02 CEST 2010


Author: arekm                        Date: Mon Sep  6 15:22:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to vserver patch-2.6.35.4-vs2.3.0.36.32.diff

---- Files affected:
packages/kernel:
   kernel.spec (1.814 -> 1.815) , kernel-vserver-2.3.patch (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.814 packages/kernel/kernel.spec:1.815
--- packages/kernel/kernel.spec:1.814	Thu Sep  2 20:28:52 2010
+++ packages/kernel/kernel.spec	Mon Sep  6 17:21:56 2010
@@ -264,7 +264,7 @@
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:	kernel-hostap.patch
 
-# based on http://vserver.13thfloor.at/Experimental/patch-2.6.35-vs2.3.0.36.31.diff
+# http://vserver.13thfloor.at/Experimental/patch-2.6.35.4-vs2.3.0.36.32.diff
 Patch100:	kernel-vserver-2.3.patch
 Patch101:	kernel-vserver-fixes.patch
 
@@ -1592,6 +1592,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.815  2010/09/06 15:21:56  arekm
+- up to vserver patch-2.6.35.4-vs2.3.0.36.32.diff
+
 Revision 1.814  2010/09/02 18:28:52  glen
 - fix arm zImage install (noted by pawelz on devel-en)
 

================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.43 packages/kernel/kernel-vserver-2.3.patch:1.44
--- packages/kernel/kernel-vserver-2.3.patch:1.43	Fri Aug 27 08:28:49 2010
+++ packages/kernel/kernel-vserver-2.3.patch	Mon Sep  6 17:21:56 2010
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.35.2/arch/alpha/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/Kconfig
---- linux-2.6.35.2/arch/alpha/Kconfig	2010-08-02 16:51:53.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/Kconfig	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/alpha/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/Kconfig
+--- linux-2.6.35.4/arch/alpha/Kconfig	2010-08-02 16:51:53.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/Kconfig	2010-08-02 17:05:05.000000000 +0200
 @@ -681,6 +681,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.35.2/arch/alpha/kernel/entry.S linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/entry.S
---- linux-2.6.35.2/arch/alpha/kernel/entry.S	2009-06-11 17:11:46.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/entry.S	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/alpha/kernel/entry.S linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/entry.S
+--- linux-2.6.35.4/arch/alpha/kernel/entry.S	2009-06-11 17:11:46.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/entry.S	2010-08-02 17:05:05.000000000 +0200
 @@ -874,24 +874,15 @@ sys_getxgid:
  	.globl	sys_getxpid
  	.ent	sys_getxpid
@@ -45,9 +45,9 @@
  	ret
  .end sys_getxpid
  
-diff -NurpP --minimal linux-2.6.35.2/arch/alpha/kernel/osf_sys.c linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/osf_sys.c
---- linux-2.6.35.2/arch/alpha/kernel/osf_sys.c	2010-07-07 18:30:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/osf_sys.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/alpha/kernel/osf_sys.c linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.35.4/arch/alpha/kernel/osf_sys.c	2010-07-07 18:30:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/osf_sys.c	2010-08-02 17:05:05.000000000 +0200
 @@ -866,7 +866,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
  {
  	if (tv) {
@@ -57,9 +57,9 @@
  		if (put_tv32(tv, &ktv))
  			return -EFAULT;
  	}
-diff -NurpP --minimal linux-2.6.35.2/arch/alpha/kernel/ptrace.c linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/ptrace.c
---- linux-2.6.35.2/arch/alpha/kernel/ptrace.c	2010-07-07 18:30:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/ptrace.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/alpha/kernel/ptrace.c linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/ptrace.c
+--- linux-2.6.35.4/arch/alpha/kernel/ptrace.c	2010-07-07 18:30:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/ptrace.c	2010-08-02 17:05:05.000000000 +0200
 @@ -13,6 +13,7 @@
  #include <linux/user.h>
  #include <linux/security.h>
@@ -68,9 +68,9 @@
  
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/alpha/kernel/systbls.S linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/systbls.S
---- linux-2.6.35.2/arch/alpha/kernel/systbls.S	2010-02-25 11:51:19.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/systbls.S	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/alpha/kernel/systbls.S linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/systbls.S
+--- linux-2.6.35.4/arch/alpha/kernel/systbls.S	2010-02-25 11:51:19.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/systbls.S	2010-08-02 17:05:05.000000000 +0200
 @@ -446,7 +446,7 @@ sys_call_table:
  	.quad sys_stat64			/* 425 */
  	.quad sys_lstat64
@@ -80,9 +80,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.35.2/arch/alpha/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/traps.c
---- linux-2.6.35.2/arch/alpha/kernel/traps.c	2010-07-07 18:30:51.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/alpha/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/alpha/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/traps.c
+--- linux-2.6.35.4/arch/alpha/kernel/traps.c	2010-07-07 18:30:51.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/alpha/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
 @@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs
  #ifdef CONFIG_SMP
  	printk("CPU %d ", hard_smp_processor_id());
@@ -93,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.35.2/arch/arm/include/asm/tlb.h linux-2.6.35.2-vs2.3.0.36.31/arch/arm/include/asm/tlb.h
---- linux-2.6.35.2/arch/arm/include/asm/tlb.h	2009-09-10 15:25:15.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/arm/include/asm/tlb.h	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/arm/include/asm/tlb.h linux-2.6.35.4-vs2.3.0.36.32/arch/arm/include/asm/tlb.h
+--- linux-2.6.35.4/arch/arm/include/asm/tlb.h	2009-09-10 15:25:15.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/arm/include/asm/tlb.h	2010-08-02 17:05:05.000000000 +0200
 @@ -27,6 +27,7 @@
  
  #else /* !CONFIG_MMU */
@@ -104,9 +104,9 @@
  #include <asm/pgalloc.h>
  
  /*
-diff -NurpP --minimal linux-2.6.35.2/arch/arm/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/arm/Kconfig
---- linux-2.6.35.2/arch/arm/Kconfig	2010-08-14 18:16:58.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/arm/Kconfig	2010-08-14 18:19:32.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/arm/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/arm/Kconfig
+--- linux-2.6.35.4/arch/arm/Kconfig	2010-09-05 01:41:56.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/arm/Kconfig	2010-08-14 18:19:32.000000000 +0200
 @@ -1685,6 +1685,8 @@ source "fs/Kconfig"
  
  source "arch/arm/Kconfig.debug"
@@ -116,9 +116,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/arm/kernel/calls.S linux-2.6.35.2-vs2.3.0.36.31/arch/arm/kernel/calls.S
---- linux-2.6.35.2/arch/arm/kernel/calls.S	2010-07-07 18:30:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/arm/kernel/calls.S	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/arm/kernel/calls.S linux-2.6.35.4-vs2.3.0.36.32/arch/arm/kernel/calls.S
+--- linux-2.6.35.4/arch/arm/kernel/calls.S	2010-07-07 18:30:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/arm/kernel/calls.S	2010-08-02 17:05:05.000000000 +0200
 @@ -322,7 +322,7 @@
  /* 310 */	CALL(sys_request_key)
  		CALL(sys_keyctl)
@@ -128,9 +128,9 @@
  		CALL(sys_ioprio_set)
  /* 315 */	CALL(sys_ioprio_get)
  		CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.35.2/arch/arm/kernel/process.c linux-2.6.35.2-vs2.3.0.36.31/arch/arm/kernel/process.c
---- linux-2.6.35.2/arch/arm/kernel/process.c	2010-08-02 16:51:55.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/arm/kernel/process.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/arm/kernel/process.c linux-2.6.35.4-vs2.3.0.36.32/arch/arm/kernel/process.c
+--- linux-2.6.35.4/arch/arm/kernel/process.c	2010-08-02 16:51:55.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/arm/kernel/process.c	2010-08-02 17:05:05.000000000 +0200
 @@ -269,7 +269,8 @@ void __show_regs(struct pt_regs *regs)
  void show_regs(struct pt_regs * regs)
  {
@@ -141,9 +141,9 @@
  	__show_regs(regs);
  	__backtrace();
  }
-diff -NurpP --minimal linux-2.6.35.2/arch/arm/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/arm/kernel/traps.c
---- linux-2.6.35.2/arch/arm/kernel/traps.c	2010-07-07 18:30:52.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/arm/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/arm/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/arm/kernel/traps.c
+--- linux-2.6.35.4/arch/arm/kernel/traps.c	2010-07-07 18:30:52.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/arm/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
 @@ -243,8 +243,8 @@ static int __die(const char *str, int er
  
  	print_modules();
@@ -155,9 +155,9 @@
  
  	if (!user_mode(regs) || in_interrupt()) {
  		dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.35.2/arch/avr32/mm/fault.c linux-2.6.35.2-vs2.3.0.36.31/arch/avr32/mm/fault.c
---- linux-2.6.35.2/arch/avr32/mm/fault.c	2009-09-10 15:25:20.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/avr32/mm/fault.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/avr32/mm/fault.c linux-2.6.35.4-vs2.3.0.36.32/arch/avr32/mm/fault.c
+--- linux-2.6.35.4/arch/avr32/mm/fault.c	2009-09-10 15:25:20.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/avr32/mm/fault.c	2010-08-02 17:05:05.000000000 +0200
 @@ -216,7 +216,8 @@ out_of_memory:
  		down_read(&mm->mmap_sem);
  		goto survive;
@@ -168,9 +168,9 @@
  	if (user_mode(regs))
  		do_group_exit(SIGKILL);
  	goto no_context;
-diff -NurpP --minimal linux-2.6.35.2/arch/cris/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/cris/Kconfig
---- linux-2.6.35.2/arch/cris/Kconfig	2010-08-02 16:52:03.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/cris/Kconfig	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/cris/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/cris/Kconfig
+--- linux-2.6.35.4/arch/cris/Kconfig	2010-08-02 16:52:03.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/cris/Kconfig	2010-08-02 17:05:05.000000000 +0200
 @@ -694,6 +694,8 @@ source "drivers/staging/Kconfig"
  
  source "arch/cris/Kconfig.debug"
@@ -180,9 +180,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/cris/mm/fault.c linux-2.6.35.2-vs2.3.0.36.31/arch/cris/mm/fault.c
---- linux-2.6.35.2/arch/cris/mm/fault.c	2010-02-25 11:51:26.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/cris/mm/fault.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/cris/mm/fault.c linux-2.6.35.4-vs2.3.0.36.32/arch/cris/mm/fault.c
+--- linux-2.6.35.4/arch/cris/mm/fault.c	2010-02-25 11:51:26.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/cris/mm/fault.c	2010-08-02 17:05:05.000000000 +0200
 @@ -245,7 +245,8 @@ do_page_fault(unsigned long address, str
  
   out_of_memory:
@@ -193,9 +193,9 @@
  	if (user_mode(regs))
  		do_exit(SIGKILL);
  	goto no_context;
-diff -NurpP --minimal linux-2.6.35.2/arch/frv/kernel/kernel_thread.S linux-2.6.35.2-vs2.3.0.36.31/arch/frv/kernel/kernel_thread.S
---- linux-2.6.35.2/arch/frv/kernel/kernel_thread.S	2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/frv/kernel/kernel_thread.S	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/frv/kernel/kernel_thread.S linux-2.6.35.4-vs2.3.0.36.32/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.35.4/arch/frv/kernel/kernel_thread.S	2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/frv/kernel/kernel_thread.S	2010-08-02 17:05:05.000000000 +0200
 @@ -37,7 +37,7 @@ kernel_thread:
  
  	# start by forking the current process, but with shared VM
@@ -205,9 +205,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.35.2/arch/h8300/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/h8300/Kconfig
---- linux-2.6.35.2/arch/h8300/Kconfig	2010-02-25 11:51:26.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/h8300/Kconfig	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/h8300/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/h8300/Kconfig
+--- linux-2.6.35.4/arch/h8300/Kconfig	2010-02-25 11:51:26.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/h8300/Kconfig	2010-08-02 17:05:05.000000000 +0200
 @@ -230,6 +230,8 @@ source "fs/Kconfig"
  
  source "arch/h8300/Kconfig.debug"
@@ -217,9 +217,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/include/asm/tlb.h linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/include/asm/tlb.h
---- linux-2.6.35.2/arch/ia64/include/asm/tlb.h	2010-02-25 11:51:26.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/include/asm/tlb.h	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/include/asm/tlb.h linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/include/asm/tlb.h
+--- linux-2.6.35.4/arch/ia64/include/asm/tlb.h	2010-02-25 11:51:26.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/include/asm/tlb.h	2010-08-02 17:05:05.000000000 +0200
 @@ -40,6 +40,7 @@
  #include <linux/mm.h>
  #include <linux/pagemap.h>
@@ -228,9 +228,9 @@
  
  #include <asm/pgalloc.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/Kconfig
---- linux-2.6.35.2/arch/ia64/Kconfig	2010-08-02 16:52:03.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/Kconfig	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/Kconfig
+--- linux-2.6.35.4/arch/ia64/Kconfig	2010-08-02 16:52:03.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/Kconfig	2010-08-02 17:05:05.000000000 +0200
 @@ -676,6 +676,8 @@ source "fs/Kconfig"
  
  source "arch/ia64/Kconfig.debug"
@@ -240,9 +240,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/kernel/entry.S linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/entry.S
---- linux-2.6.35.2/arch/ia64/kernel/entry.S	2010-07-07 18:31:01.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/entry.S	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/kernel/entry.S linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/entry.S
+--- linux-2.6.35.4/arch/ia64/kernel/entry.S	2010-07-07 18:31:01.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/entry.S	2010-08-02 17:05:05.000000000 +0200
 @@ -1714,7 +1714,7 @@ sys_call_table:
  	data8 sys_mq_notify
  	data8 sys_mq_getsetattr
@@ -252,9 +252,9 @@
  	data8 sys_waitid			// 1270
  	data8 sys_add_key
  	data8 sys_request_key
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/kernel/perfmon.c linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/perfmon.c
---- linux-2.6.35.2/arch/ia64/kernel/perfmon.c	2010-07-07 18:31:01.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/perfmon.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/kernel/perfmon.c linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/perfmon.c
+--- linux-2.6.35.4/arch/ia64/kernel/perfmon.c	2010-07-07 18:31:01.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/perfmon.c	2010-08-02 17:05:05.000000000 +0200
 @@ -42,6 +42,7 @@
  #include <linux/completion.h>
  #include <linux/tracehook.h>
@@ -263,9 +263,9 @@
  
  #include <asm/errno.h>
  #include <asm/intrinsics.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/kernel/process.c linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/process.c
---- linux-2.6.35.2/arch/ia64/kernel/process.c	2010-07-07 18:31:01.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/process.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/kernel/process.c linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/process.c
+--- linux-2.6.35.4/arch/ia64/kernel/process.c	2010-07-07 18:31:01.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/process.c	2010-08-02 17:05:05.000000000 +0200
 @@ -113,8 +113,8 @@ show_regs (struct pt_regs *regs)
  	unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
  
@@ -277,9 +277,9 @@
  	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.35.2/arch/ia64/kernel/ptrace.c linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/ptrace.c
---- linux-2.6.35.2/arch/ia64/kernel/ptrace.c	2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/ptrace.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/kernel/ptrace.c linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/ptrace.c
+--- linux-2.6.35.4/arch/ia64/kernel/ptrace.c	2010-08-02 16:52:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/ptrace.c	2010-08-02 17:05:05.000000000 +0200
 @@ -21,6 +21,7 @@
  #include <linux/regset.h>
  #include <linux/elf.h>
@@ -288,9 +288,9 @@
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/traps.c
---- linux-2.6.35.2/arch/ia64/kernel/traps.c	2010-07-07 18:31:01.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/traps.c
+--- linux-2.6.35.4/arch/ia64/kernel/traps.c	2010-07-07 18:31:01.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
 @@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
  	put_cpu();
  
@@ -315,9 +315,9 @@
  			}
  		}
  	}
-diff -NurpP --minimal linux-2.6.35.2/arch/ia64/mm/fault.c linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/mm/fault.c
---- linux-2.6.35.2/arch/ia64/mm/fault.c	2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/ia64/mm/fault.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/ia64/mm/fault.c linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/mm/fault.c
+--- linux-2.6.35.4/arch/ia64/mm/fault.c	2010-08-02 16:52:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/ia64/mm/fault.c	2010-08-02 17:05:05.000000000 +0200
 @@ -10,6 +10,7 @@
  #include <linux/interrupt.h>
  #include <linux/kprobes.h>
@@ -326,9 +326,9 @@
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.35.2/arch/m32r/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/m32r/kernel/traps.c
---- linux-2.6.35.2/arch/m32r/kernel/traps.c	2009-12-03 20:01:57.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/m32r/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/m32r/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/m32r/kernel/traps.c
+--- linux-2.6.35.4/arch/m32r/kernel/traps.c	2009-12-03 20:01:57.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/m32r/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
 @@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
  	} else {
  		printk("SPI: %08lx\n", sp);
@@ -341,9 +341,9 @@
  
  	/*
  	 * When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.35.2/arch/m68k/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/m68k/Kconfig
---- linux-2.6.35.2/arch/m68k/Kconfig	2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/m68k/Kconfig	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/m68k/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/m68k/Kconfig
+--- linux-2.6.35.4/arch/m68k/Kconfig	2010-08-02 16:52:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/m68k/Kconfig	2010-08-02 17:05:05.000000000 +0200
 @@ -619,6 +619,8 @@ source "fs/Kconfig"
  
  source "arch/m68k/Kconfig.debug"
@@ -353,9 +353,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/m68k/kernel/ptrace.c linux-2.6.35.2-vs2.3.0.36.31/arch/m68k/kernel/ptrace.c
---- linux-2.6.35.2/arch/m68k/kernel/ptrace.c	2010-07-07 18:31:02.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/m68k/kernel/ptrace.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/m68k/kernel/ptrace.c linux-2.6.35.4-vs2.3.0.36.32/arch/m68k/kernel/ptrace.c
+--- linux-2.6.35.4/arch/m68k/kernel/ptrace.c	2010-07-07 18:31:02.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/m68k/kernel/ptrace.c	2010-08-02 17:05:05.000000000 +0200
 @@ -18,6 +18,7 @@
  #include <linux/ptrace.h>
  #include <linux/user.h>
@@ -373,9 +373,9 @@
  
  	return ret;
  out_eio:
-diff -NurpP --minimal linux-2.6.35.2/arch/m68k/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/m68k/kernel/traps.c
---- linux-2.6.35.2/arch/m68k/kernel/traps.c	2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/m68k/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/m68k/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/m68k/kernel/traps.c
+--- linux-2.6.35.4/arch/m68k/kernel/traps.c	2010-08-02 16:52:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/m68k/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
 @@ -906,8 +906,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);
@@ -387,9 +387,9 @@
  	addr = (unsigned long)&fp->un;
  	printk("Frame format=%X ", regs->format);
  	switch (regs->format) {
-diff -NurpP --minimal linux-2.6.35.2/arch/m68knommu/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/m68knommu/Kconfig
---- linux-2.6.35.2/arch/m68knommu/Kconfig	2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/m68knommu/Kconfig	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/m68knommu/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/m68knommu/Kconfig
+--- linux-2.6.35.4/arch/m68knommu/Kconfig	2010-08-02 16:52:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/m68knommu/Kconfig	2010-08-02 17:05:05.000000000 +0200
 @@ -734,6 +734,8 @@ source "fs/Kconfig"
  
  source "arch/m68knommu/Kconfig.debug"
@@ -399,9 +399,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/m68knommu/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/m68knommu/kernel/traps.c
---- linux-2.6.35.2/arch/m68knommu/kernel/traps.c	2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/m68knommu/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/m68knommu/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/m68knommu/kernel/traps.c
+--- linux-2.6.35.4/arch/m68knommu/kernel/traps.c	2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/m68knommu/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
 @@ -78,8 +78,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);
@@ -414,9 +414,9 @@
  	show_stack(NULL, (unsigned long *)(fp + 1));
  	add_taint(TAINT_DIE);
  	do_exit(SIGSEGV);
-diff -NurpP --minimal linux-2.6.35.2/arch/mips/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/mips/Kconfig
---- linux-2.6.35.2/arch/mips/Kconfig	2010-08-02 16:52:05.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/mips/Kconfig	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/mips/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/mips/Kconfig
+--- linux-2.6.35.4/arch/mips/Kconfig	2010-08-02 16:52:05.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/mips/Kconfig	2010-08-02 17:05:05.000000000 +0200
 @@ -2253,6 +2253,8 @@ source "fs/Kconfig"
  
  source "arch/mips/Kconfig.debug"
@@ -426,9 +426,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/mips/kernel/ptrace.c linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/ptrace.c
---- linux-2.6.35.2/arch/mips/kernel/ptrace.c	2010-07-07 18:31:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/ptrace.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/mips/kernel/ptrace.c linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/ptrace.c
+--- linux-2.6.35.4/arch/mips/kernel/ptrace.c	2010-07-07 18:31:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/ptrace.c	2010-08-02 17:05:05.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <linux/security.h>
  #include <linux/audit.h>
@@ -447,9 +447,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.35.2/arch/mips/kernel/scall32-o32.S linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall32-o32.S
---- linux-2.6.35.2/arch/mips/kernel/scall32-o32.S	2010-02-25 11:51:28.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall32-o32.S	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/mips/kernel/scall32-o32.S linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.35.4/arch/mips/kernel/scall32-o32.S	2010-02-25 11:51:28.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall32-o32.S	2010-08-02 17:05:05.000000000 +0200
 @@ -525,7 +525,7 @@ einval:	li	v0, -ENOSYS
  	sys	sys_mq_timedreceive	5
  	sys	sys_mq_notify		2	/* 4275 */
@@ -459,9 +459,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.35.2/arch/mips/kernel/scall64-64.S linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall64-64.S
---- linux-2.6.35.2/arch/mips/kernel/scall64-64.S	2010-02-25 11:51:28.000000000 +0100
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall64-64.S	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/mips/kernel/scall64-64.S linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall64-64.S
+--- linux-2.6.35.4/arch/mips/kernel/scall64-64.S	2010-02-25 11:51:28.000000000 +0100
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall64-64.S	2010-08-02 17:05:05.000000000 +0200
 @@ -362,7 +362,7 @@ sys_call_table:
  	PTR	sys_mq_timedreceive
  	PTR	sys_mq_notify
@@ -471,9 +471,9 @@
  	PTR	sys_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key
-diff -NurpP --minimal linux-2.6.35.2/arch/mips/kernel/scall64-n32.S linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall64-n32.S
---- linux-2.6.35.2/arch/mips/kernel/scall64-n32.S	2010-08-02 16:52:05.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall64-n32.S	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/mips/kernel/scall64-n32.S linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.35.4/arch/mips/kernel/scall64-n32.S	2010-08-02 16:52:05.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall64-n32.S	2010-08-02 17:05:05.000000000 +0200
 @@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
  	PTR	compat_sys_mq_timedreceive
  	PTR	compat_sys_mq_notify
@@ -483,9 +483,9 @@
  	PTR	compat_sys_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key
-diff -NurpP --minimal linux-2.6.35.2/arch/mips/kernel/scall64-o32.S linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall64-o32.S
---- linux-2.6.35.2/arch/mips/kernel/scall64-o32.S	2010-07-07 18:31:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/scall64-o32.S	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/mips/kernel/scall64-o32.S linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.35.4/arch/mips/kernel/scall64-o32.S	2010-07-07 18:31:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/scall64-o32.S	2010-08-02 17:05:05.000000000 +0200
 @@ -480,7 +480,7 @@ sys_call_table:
  	PTR	compat_sys_mq_timedreceive
  	PTR	compat_sys_mq_notify		/* 4275 */
@@ -495,9 +495,9 @@
  	PTR	sys_32_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key			/* 4280 */
-diff -NurpP --minimal linux-2.6.35.2/arch/mips/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/traps.c
---- linux-2.6.35.2/arch/mips/kernel/traps.c	2010-08-02 16:52:05.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/mips/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/mips/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/traps.c
+--- linux-2.6.35.4/arch/mips/kernel/traps.c	2010-08-02 16:52:05.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/mips/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
 @@ -340,9 +340,10 @@ void show_registers(const struct pt_regs
  
  	__show_regs(regs);
@@ -512,9 +512,9 @@
  	if (cpu_has_userlocal) {
  		unsigned long tls;
  
-diff -NurpP --minimal linux-2.6.35.2/arch/parisc/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/Kconfig
---- linux-2.6.35.2/arch/parisc/Kconfig	2010-08-02 16:52:06.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/Kconfig	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/parisc/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/Kconfig
+--- linux-2.6.35.4/arch/parisc/Kconfig	2010-08-02 16:52:06.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/Kconfig	2010-08-02 17:05:05.000000000 +0200
 @@ -299,6 +299,8 @@ source "fs/Kconfig"
  
  source "arch/parisc/Kconfig.debug"
@@ -524,9 +524,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.35.2/arch/parisc/kernel/syscall_table.S linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/kernel/syscall_table.S
---- linux-2.6.35.2/arch/parisc/kernel/syscall_table.S	2010-07-07 18:31:04.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/kernel/syscall_table.S	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/parisc/kernel/syscall_table.S linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/kernel/syscall_table.S
+--- linux-2.6.35.4/arch/parisc/kernel/syscall_table.S	2010-07-07 18:31:04.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/kernel/syscall_table.S	2010-08-02 17:05:05.000000000 +0200
 @@ -361,7 +361,7 @@
  	ENTRY_COMP(mbind)		/* 260 */
  	ENTRY_COMP(get_mempolicy)
@@ -536,9 +536,9 @@
  	ENTRY_SAME(add_key)
  	ENTRY_SAME(request_key)		/* 265 */
  	ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.35.2/arch/parisc/kernel/traps.c linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/kernel/traps.c
---- linux-2.6.35.2/arch/parisc/kernel/traps.c	2009-09-10 15:25:40.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/parisc/kernel/traps.c linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/kernel/traps.c
+--- linux-2.6.35.4/arch/parisc/kernel/traps.c	2009-09-10 15:25:40.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/kernel/traps.c	2010-08-02 17:05:05.000000000 +0200
 @@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
  		if (err == 0)
  			return; /* STFU */
@@ -562,9 +562,9 @@
  
  	/* Wot's wrong wif bein' racy? */
  	if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-2.6.35.2/arch/parisc/mm/fault.c linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/mm/fault.c
---- linux-2.6.35.2/arch/parisc/mm/fault.c	2010-08-02 16:52:06.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/parisc/mm/fault.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/parisc/mm/fault.c linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/mm/fault.c
+--- linux-2.6.35.4/arch/parisc/mm/fault.c	2010-08-02 16:52:06.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/parisc/mm/fault.c	2010-08-02 17:05:05.000000000 +0200
 @@ -237,8 +237,9 @@ bad_area:
  
  #ifdef PRINT_USER_FAULTS
@@ -577,9 +577,9 @@
  		if (vma) {
  			printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
  					vma->vm_start, vma->vm_end);
-diff -NurpP --minimal linux-2.6.35.2/arch/powerpc/include/asm/unistd.h linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/include/asm/unistd.h
---- linux-2.6.35.2/arch/powerpc/include/asm/unistd.h	2010-07-07 18:31:05.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/include/asm/unistd.h	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/powerpc/include/asm/unistd.h linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/include/asm/unistd.h
+--- linux-2.6.35.4/arch/powerpc/include/asm/unistd.h	2010-07-07 18:31:05.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/include/asm/unistd.h	2010-08-02 17:05:05.000000000 +0200
 @@ -275,7 +275,7 @@
  #endif
  #define __NR_rtas		255
@@ -589,9 +589,9 @@
  #define __NR_migrate_pages	258
  #define __NR_mbind		259
  #define __NR_get_mempolicy	260
-diff -NurpP --minimal linux-2.6.35.2/arch/powerpc/Kconfig linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/Kconfig
---- linux-2.6.35.2/arch/powerpc/Kconfig	2010-08-02 16:52:06.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/Kconfig	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/powerpc/Kconfig linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/Kconfig
+--- linux-2.6.35.4/arch/powerpc/Kconfig	2010-08-02 16:52:06.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/Kconfig	2010-08-02 17:05:05.000000000 +0200
 @@ -990,6 +990,8 @@ source "lib/Kconfig"
  
  source "arch/powerpc/Kconfig.debug"
@@ -601,9 +601,9 @@
  source "security/Kconfig"
  
  config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.35.2/arch/powerpc/kernel/process.c linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/kernel/process.c
---- linux-2.6.35.2/arch/powerpc/kernel/process.c	2010-08-02 16:52:07.000000000 +0200
-+++ linux-2.6.35.2-vs2.3.0.36.31/arch/powerpc/kernel/process.c	2010-08-02 17:05:05.000000000 +0200
+diff -NurpP --minimal linux-2.6.35.4/arch/powerpc/kernel/process.c linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/kernel/process.c
+--- linux-2.6.35.4/arch/powerpc/kernel/process.c	2010-08-02 16:52:07.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/arch/powerpc/kernel/process.c	2010-08-02 17:05:05.000000000 +0200
 @@ -605,8 +605,9 @@ void show_regs(struct pt_regs * regs)
  #else
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.814&r2=1.815&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.43&r2=1.44&f=u



More information about the pld-cvs-commit mailing list