packages (LINUX_2_6_32): kernel/kernel-vserver-2.3.patch - http://vserver.1...

hawk hawk at pld-linux.org
Fri Feb 10 11:09:08 CET 2012


Author: hawk                         Date: Fri Feb 10 10:09:08 2012 GMT
Module: packages                      Tag: LINUX_2_6_32
---- Log message:
- http://vserver.13thfloor.at/Experimental/patch-2.6.32.56-vs2.3.0.36.29.9.diff
  with extraversion killed

---- Files affected:
packages/kernel:
   kernel-vserver-2.3.patch (1.31.2.7 -> 1.31.2.8) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.31.2.7 packages/kernel/kernel-vserver-2.3.patch:1.31.2.8
--- packages/kernel/kernel-vserver-2.3.patch:1.31.2.7	Thu Jan 19 11:24:48 2012
+++ packages/kernel/kernel-vserver-2.3.patch	Fri Feb 10 11:08:57 2012
@@ -1,6 +1,6 @@
-diff -Nur kernel-2.6.32.54/Documentation/scheduler/sched-cfs-hard-limits.txt kernel-2.6.32.54.vs/Documentation/scheduler/sched-cfs-hard-limits.txt
---- kernel-2.6.32.54/Documentation/scheduler/sched-cfs-hard-limits.txt	1970-01-01 01:00:00.000000000 +0100
-+++ kernel-2.6.32.54.vs/Documentation/scheduler/sched-cfs-hard-limits.txt	2012-01-16 14:50:48.745524729 +0100
+diff -NurpP --minimal linux-2.6.32.56/Documentation/scheduler/sched-cfs-hard-limits.txt linux-2.6.32.56-vs2.3.0.36.29.9/Documentation/scheduler/sched-cfs-hard-limits.txt
+--- linux-2.6.32.56/Documentation/scheduler/sched-cfs-hard-limits.txt	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/Documentation/scheduler/sched-cfs-hard-limits.txt	2011-06-10 13:03:02.000000000 +0200
 @@ -0,0 +1,48 @@
 +CPU HARD LIMITS FOR CFS GROUPS
 +==============================
@@ -50,9 +50,9 @@
 +# cd 1/
 +# echo 250000 > cfs_runtime_us /* set a 250ms runtime or limit */
 +# echo 500000 > cfs_period_us /* set a 500ms period */
-diff -Nur kernel-2.6.32.54/Documentation/vserver/debug.txt kernel-2.6.32.54.vs/Documentation/vserver/debug.txt
---- kernel-2.6.32.54/Documentation/vserver/debug.txt	1970-01-01 01:00:00.000000000 +0100
-+++ kernel-2.6.32.54.vs/Documentation/vserver/debug.txt	2012-01-16 14:50:48.745524729 +0100
+diff -NurpP --minimal linux-2.6.32.56/Documentation/vserver/debug.txt linux-2.6.32.56-vs2.3.0.36.29.9/Documentation/vserver/debug.txt
+--- linux-2.6.32.56/Documentation/vserver/debug.txt	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/Documentation/vserver/debug.txt	2011-06-10 13:03:02.000000000 +0200
 @@ -0,0 +1,154 @@
 +
 +debug_cvirt:
@@ -208,10 +208,10 @@
 + 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 -Nur kernel-2.6.32.54/linux-2.6.32/arch/alpha/Kconfig kernel-2.6.32.54.vs/linux-2.6.32/arch/alpha/Kconfig
---- kernel-2.6.32.54/linux-2.6.32/arch/alpha/Kconfig	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/alpha/Kconfig	2012-01-16 14:51:21.689409499 +0100
-@@ -674,6 +674,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/alpha/Kconfig linux-2.6.32.56-vs2.3.0.36.29.9/arch/alpha/Kconfig
+--- linux-2.6.32.56/arch/alpha/Kconfig	2009-12-03 20:01:49.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/alpha/Kconfig	2011-06-10 13:03:02.000000000 +0200
+@@ -674,6 +674,8 @@ config DUMMY_CONSOLE
  	depends on VGA_HOSE
  	default y
  
@@ -220,10 +220,10 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/alpha/kernel/entry.S kernel-2.6.32.54.vs/linux-2.6.32/arch/alpha/kernel/entry.S
---- kernel-2.6.32.54/linux-2.6.32/arch/alpha/kernel/entry.S	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/alpha/kernel/entry.S	2012-01-16 14:51:21.689409499 +0100
-@@ -874,24 +874,15 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/alpha/kernel/entry.S linux-2.6.32.56-vs2.3.0.36.29.9/arch/alpha/kernel/entry.S
+--- linux-2.6.32.56/arch/alpha/kernel/entry.S	2009-06-11 17:11:46.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/alpha/kernel/entry.S	2011-06-10 13:03:02.000000000 +0200
+@@ -874,24 +874,15 @@ sys_getxgid:
  	.globl	sys_getxpid
  	.ent	sys_getxpid
  sys_getxpid:
@@ -255,10 +255,10 @@
  	ret
  .end sys_getxpid
  
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/alpha/kernel/osf_sys.c kernel-2.6.32.54.vs/linux-2.6.32/arch/alpha/kernel/osf_sys.c
---- kernel-2.6.32.54/linux-2.6.32/arch/alpha/kernel/osf_sys.c	2012-01-16 15:01:37.876554641 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/alpha/kernel/osf_sys.c	2012-01-16 14:51:21.689409499 +0100
-@@ -865,7 +865,7 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/alpha/kernel/osf_sys.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.32.56/arch/alpha/kernel/osf_sys.c	2012-02-09 10:22:13.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/alpha/kernel/osf_sys.c	2011-11-17 12:18:26.000000000 +0100
+@@ -865,7 +865,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
  {
  	if (tv) {
  		struct timeval ktv;
@@ -267,9 +267,9 @@
  		if (put_tv32(tv, &ktv))
  			return -EFAULT;
  	}
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/alpha/kernel/ptrace.c kernel-2.6.32.54.vs/linux-2.6.32/arch/alpha/kernel/ptrace.c
---- kernel-2.6.32.54/linux-2.6.32/arch/alpha/kernel/ptrace.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/alpha/kernel/ptrace.c	2012-01-16 14:51:21.693409485 +0100
+diff -NurpP --minimal linux-2.6.32.56/arch/alpha/kernel/ptrace.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/alpha/kernel/ptrace.c
+--- linux-2.6.32.56/arch/alpha/kernel/ptrace.c	2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/alpha/kernel/ptrace.c	2011-06-10 13:03:02.000000000 +0200
 @@ -14,6 +14,7 @@
  #include <linux/slab.h>
  #include <linux/security.h>
@@ -278,10 +278,10 @@
  
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/alpha/kernel/systbls.S kernel-2.6.32.54.vs/linux-2.6.32/arch/alpha/kernel/systbls.S
---- kernel-2.6.32.54/linux-2.6.32/arch/alpha/kernel/systbls.S	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/alpha/kernel/systbls.S	2012-01-16 14:51:21.693409485 +0100
-@@ -446,7 +446,7 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/alpha/kernel/systbls.S linux-2.6.32.56-vs2.3.0.36.29.9/arch/alpha/kernel/systbls.S
+--- linux-2.6.32.56/arch/alpha/kernel/systbls.S	2009-03-24 14:18:08.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/alpha/kernel/systbls.S	2011-06-10 13:03:02.000000000 +0200
+@@ -446,7 +446,7 @@ sys_call_table:
  	.quad sys_stat64			/* 425 */
  	.quad sys_lstat64
  	.quad sys_fstat64
@@ -290,10 +290,10 @@
  	.quad sys_ni_syscall			/* sys_mbind */
  	.quad sys_ni_syscall			/* sys_get_mempolicy */
  	.quad sys_ni_syscall			/* sys_set_mempolicy */
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/alpha/kernel/traps.c kernel-2.6.32.54.vs/linux-2.6.32/arch/alpha/kernel/traps.c
---- kernel-2.6.32.54/linux-2.6.32/arch/alpha/kernel/traps.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/alpha/kernel/traps.c	2012-01-16 14:51:21.693409485 +0100
-@@ -183,7 +183,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/alpha/kernel/traps.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/alpha/kernel/traps.c
+--- linux-2.6.32.56/arch/alpha/kernel/traps.c	2009-06-11 17:11:46.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/alpha/kernel/traps.c	2011-06-10 13:03:02.000000000 +0200
+@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
  #ifdef CONFIG_SMP
  	printk("CPU %d ", hard_smp_processor_id());
  #endif
@@ -303,10 +303,10 @@
  	dik_show_regs(regs, r9_15);
  	add_taint(TAINT_DIE);
  	dik_show_trace((unsigned long *)(regs+1));
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/alpha/mm/fault.c kernel-2.6.32.54.vs/linux-2.6.32/arch/alpha/mm/fault.c
---- kernel-2.6.32.54/linux-2.6.32/arch/alpha/mm/fault.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/alpha/mm/fault.c	2012-01-16 14:51:21.693409485 +0100
-@@ -193,8 +193,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/alpha/mm/fault.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/alpha/mm/fault.c
+--- linux-2.6.32.56/arch/alpha/mm/fault.c	2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/alpha/mm/fault.c	2011-06-10 13:03:02.000000000 +0200
+@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
  		down_read(&mm->mmap_sem);
  		goto survive;
  	}
@@ -317,21 +317,10 @@
  	if (!user_mode(regs))
  		goto no_context;
  	do_group_exit(SIGKILL);
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/arm/include/asm/tlb.h kernel-2.6.32.54.vs/linux-2.6.32/arch/arm/include/asm/tlb.h
---- kernel-2.6.32.54/linux-2.6.32/arch/arm/include/asm/tlb.h	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/arm/include/asm/tlb.h	2012-01-16 14:51:21.693409485 +0100
-@@ -27,6 +27,7 @@
- 
- #else /* !CONFIG_MMU */
- 
-+#include <linux/vs_memory.h>
- #include <asm/pgalloc.h>
- 
- /*
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/arm/Kconfig kernel-2.6.32.54.vs/linux-2.6.32/arch/arm/Kconfig
---- kernel-2.6.32.54/linux-2.6.32/arch/arm/Kconfig	2012-01-16 15:01:37.880556627 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/arm/Kconfig	2012-01-16 14:51:21.693409485 +0100
-@@ -1536,6 +1536,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/arm/Kconfig linux-2.6.32.56-vs2.3.0.36.29.9/arch/arm/Kconfig
+--- linux-2.6.32.56/arch/arm/Kconfig	2012-02-09 10:22:13.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/arm/Kconfig	2012-01-10 09:18:12.000000000 +0100
+@@ -1536,6 +1536,8 @@ source "fs/Kconfig"
  
  source "arch/arm/Kconfig.debug"
  
@@ -340,9 +329,20 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/arm/kernel/calls.S kernel-2.6.32.54.vs/linux-2.6.32/arch/arm/kernel/calls.S
---- kernel-2.6.32.54/linux-2.6.32/arch/arm/kernel/calls.S	2012-01-16 15:01:37.880556627 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/arm/kernel/calls.S	2012-01-16 14:51:21.693409485 +0100
+diff -NurpP --minimal linux-2.6.32.56/arch/arm/include/asm/tlb.h linux-2.6.32.56-vs2.3.0.36.29.9/arch/arm/include/asm/tlb.h
+--- linux-2.6.32.56/arch/arm/include/asm/tlb.h	2009-09-10 15:25:15.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/arm/include/asm/tlb.h	2011-06-10 13:03:02.000000000 +0200
+@@ -27,6 +27,7 @@
+ 
+ #else /* !CONFIG_MMU */
+ 
++#include <linux/vs_memory.h>
+ #include <asm/pgalloc.h>
+ 
+ /*
+diff -NurpP --minimal linux-2.6.32.56/arch/arm/kernel/calls.S linux-2.6.32.56-vs2.3.0.36.29.9/arch/arm/kernel/calls.S
+--- linux-2.6.32.56/arch/arm/kernel/calls.S	2012-02-09 10:22:13.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/arm/kernel/calls.S	2011-06-10 13:03:02.000000000 +0200
 @@ -322,7 +322,7 @@
  /* 310 */	CALL(sys_request_key)
  		CALL(sys_keyctl)
@@ -352,10 +352,10 @@
  		CALL(sys_ioprio_set)
  /* 315 */	CALL(sys_ioprio_get)
  		CALL(sys_inotify_init)
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/arm/kernel/process.c kernel-2.6.32.54.vs/linux-2.6.32/arch/arm/kernel/process.c
---- kernel-2.6.32.54/linux-2.6.32/arch/arm/kernel/process.c	2012-01-16 15:01:37.880556627 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/arm/kernel/process.c	2012-01-16 14:51:21.693409485 +0100
-@@ -272,7 +272,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/arm/kernel/process.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/arm/kernel/process.c
+--- linux-2.6.32.56/arch/arm/kernel/process.c	2012-02-09 10:22:13.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/arm/kernel/process.c	2012-01-10 09:18:12.000000000 +0100
+@@ -272,7 +272,8 @@ void __show_regs(struct pt_regs *regs)
  void show_regs(struct pt_regs * regs)
  {
  	printk("\n");
@@ -365,10 +365,10 @@
  	__show_regs(regs);
  	__backtrace();
  }
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/arm/kernel/traps.c kernel-2.6.32.54.vs/linux-2.6.32/arch/arm/kernel/traps.c
---- kernel-2.6.32.54/linux-2.6.32/arch/arm/kernel/traps.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/arm/kernel/traps.c	2012-01-16 14:51:21.693409485 +0100
-@@ -234,8 +234,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/arm/kernel/traps.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/arm/kernel/traps.c
+--- linux-2.6.32.56/arch/arm/kernel/traps.c	2009-12-03 20:01:50.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/arm/kernel/traps.c	2011-06-10 13:03:02.000000000 +0200
+@@ -234,8 +234,8 @@ static void __die(const char *str, int e
  	sysfs_printk_last_file();
  	print_modules();
  	__show_regs(regs);
@@ -379,10 +379,10 @@
  
  	if (!user_mode(regs) || in_interrupt()) {
  		dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/avr32/mm/fault.c kernel-2.6.32.54.vs/linux-2.6.32/arch/avr32/mm/fault.c
---- kernel-2.6.32.54/linux-2.6.32/arch/avr32/mm/fault.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/avr32/mm/fault.c	2012-01-16 14:51:21.693409485 +0100
-@@ -216,7 +216,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/avr32/mm/fault.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/avr32/mm/fault.c
+--- linux-2.6.32.56/arch/avr32/mm/fault.c	2009-09-10 15:25:20.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/avr32/mm/fault.c	2011-06-10 13:03:02.000000000 +0200
+@@ -216,7 +216,8 @@ out_of_memory:
  		down_read(&mm->mmap_sem);
  		goto survive;
  	}
@@ -392,10 +392,10 @@
  	if (user_mode(regs))
  		do_group_exit(SIGKILL);
  	goto no_context;
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/cris/Kconfig kernel-2.6.32.54.vs/linux-2.6.32/arch/cris/Kconfig
---- kernel-2.6.32.54/linux-2.6.32/arch/cris/Kconfig	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/cris/Kconfig	2012-01-16 14:51:21.701409457 +0100
-@@ -685,6 +685,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/cris/Kconfig linux-2.6.32.56-vs2.3.0.36.29.9/arch/cris/Kconfig
+--- linux-2.6.32.56/arch/cris/Kconfig	2009-06-11 17:11:56.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/cris/Kconfig	2011-06-10 13:03:02.000000000 +0200
+@@ -685,6 +685,8 @@ source "drivers/staging/Kconfig"
  
  source "arch/cris/Kconfig.debug"
  
@@ -404,10 +404,10 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/cris/mm/fault.c kernel-2.6.32.54.vs/linux-2.6.32/arch/cris/mm/fault.c
---- kernel-2.6.32.54/linux-2.6.32/arch/cris/mm/fault.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/cris/mm/fault.c	2012-01-16 14:51:21.701409457 +0100
-@@ -245,7 +245,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/cris/mm/fault.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/cris/mm/fault.c
+--- linux-2.6.32.56/arch/cris/mm/fault.c	2009-12-03 20:01:56.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/cris/mm/fault.c	2011-06-10 13:03:02.000000000 +0200
+@@ -245,7 +245,8 @@ do_page_fault(unsigned long address, str
  
   out_of_memory:
  	up_read(&mm->mmap_sem);
@@ -417,10 +417,10 @@
  	if (user_mode(regs))
  		do_exit(SIGKILL);
  	goto no_context;
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/frv/kernel/kernel_thread.S kernel-2.6.32.54.vs/linux-2.6.32/arch/frv/kernel/kernel_thread.S
---- kernel-2.6.32.54/linux-2.6.32/arch/frv/kernel/kernel_thread.S	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/frv/kernel/kernel_thread.S	2012-01-16 14:51:21.701409457 +0100
-@@ -37,7 +37,7 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/frv/kernel/kernel_thread.S linux-2.6.32.56-vs2.3.0.36.29.9/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.32.56/arch/frv/kernel/kernel_thread.S	2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/frv/kernel/kernel_thread.S	2011-06-10 13:03:02.000000000 +0200
+@@ -37,7 +37,7 @@ kernel_thread:
  
  	# start by forking the current process, but with shared VM
  	setlos.p	#__NR_clone,gr7		; syscall number
@@ -429,10 +429,10 @@
  	sethi.p		#0xe4e4,gr9		; second syscall arg	[newsp]
  	setlo		#0xe4e4,gr9
  	setlos.p	#0,gr10			; third syscall arg	[parent_tidptr]
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/frv/mm/fault.c kernel-2.6.32.54.vs/linux-2.6.32/arch/frv/mm/fault.c
---- kernel-2.6.32.54/linux-2.6.32/arch/frv/mm/fault.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/frv/mm/fault.c	2012-01-16 14:51:21.701409457 +0100
-@@ -257,7 +257,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/frv/mm/fault.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/frv/mm/fault.c
+--- linux-2.6.32.56/arch/frv/mm/fault.c	2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/frv/mm/fault.c	2011-06-10 13:03:02.000000000 +0200
+@@ -257,7 +257,8 @@ asmlinkage void do_page_fault(int datamm
   */
   out_of_memory:
  	up_read(&mm->mmap_sem);
@@ -442,10 +442,10 @@
  	if (user_mode(__frame))
  		do_group_exit(SIGKILL);
  	goto no_context;
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/h8300/Kconfig kernel-2.6.32.54.vs/linux-2.6.32/arch/h8300/Kconfig
---- kernel-2.6.32.54/linux-2.6.32/arch/h8300/Kconfig	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/h8300/Kconfig	2012-01-16 14:51:21.701409457 +0100
-@@ -226,6 +226,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/h8300/Kconfig linux-2.6.32.56-vs2.3.0.36.29.9/arch/h8300/Kconfig
+--- linux-2.6.32.56/arch/h8300/Kconfig	2009-03-24 14:18:24.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/h8300/Kconfig	2011-06-10 13:03:02.000000000 +0200
+@@ -226,6 +226,8 @@ source "fs/Kconfig"
  
  source "arch/h8300/Kconfig.debug"
  
@@ -454,10 +454,22 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/ia64/ia32/ia32_entry.S kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/ia32/ia32_entry.S
---- kernel-2.6.32.54/linux-2.6.32/arch/ia64/ia32/ia32_entry.S	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/ia32/ia32_entry.S	2012-01-16 14:51:21.705409443 +0100
-@@ -451,7 +451,7 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/ia64/Kconfig linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/Kconfig
+--- linux-2.6.32.56/arch/ia64/Kconfig	2009-12-03 20:01:56.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/Kconfig	2011-06-10 13:03:02.000000000 +0200
+@@ -685,6 +685,8 @@ source "fs/Kconfig"
+ 
+ source "arch/ia64/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-2.6.32.56/arch/ia64/ia32/ia32_entry.S linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.32.56/arch/ia64/ia32/ia32_entry.S	2009-06-11 17:11:57.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/ia32/ia32_entry.S	2011-06-10 13:03:02.000000000 +0200
+@@ -451,7 +451,7 @@ ia32_syscall_table:
   	data8 sys_tgkill	/* 270 */
   	data8 compat_sys_utimes
   	data8 sys32_fadvise64_64
@@ -466,9 +478,9 @@
    	data8 sys_ni_syscall
   	data8 sys_ni_syscall	/* 275 */
    	data8 sys_ni_syscall
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/ia64/include/asm/tlb.h kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/include/asm/tlb.h
---- kernel-2.6.32.54/linux-2.6.32/arch/ia64/include/asm/tlb.h	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/include/asm/tlb.h	2012-01-16 14:51:21.705409443 +0100
+diff -NurpP --minimal linux-2.6.32.56/arch/ia64/include/asm/tlb.h linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/include/asm/tlb.h
+--- linux-2.6.32.56/arch/ia64/include/asm/tlb.h	2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/include/asm/tlb.h	2011-06-10 13:03:02.000000000 +0200
 @@ -40,6 +40,7 @@
  #include <linux/mm.h>
  #include <linux/pagemap.h>
@@ -477,22 +489,10 @@
  
  #include <asm/pgalloc.h>
  #include <asm/processor.h>
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/ia64/Kconfig kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/Kconfig
---- kernel-2.6.32.54/linux-2.6.32/arch/ia64/Kconfig	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/Kconfig	2012-01-16 14:51:21.701409457 +0100
-@@ -685,6 +685,8 @@
- 
- source "arch/ia64/Kconfig.debug"
- 
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
- 
- source "crypto/Kconfig"
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/ia64/kernel/entry.S kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/kernel/entry.S
---- kernel-2.6.32.54/linux-2.6.32/arch/ia64/kernel/entry.S	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/kernel/entry.S	2012-01-16 14:51:21.705409443 +0100
-@@ -1753,7 +1753,7 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/ia64/kernel/entry.S linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/kernel/entry.S
+--- linux-2.6.32.56/arch/ia64/kernel/entry.S	2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/kernel/entry.S	2011-06-10 13:03:02.000000000 +0200
+@@ -1753,7 +1753,7 @@ sys_call_table:
  	data8 sys_mq_notify
  	data8 sys_mq_getsetattr
  	data8 sys_kexec_load
@@ -501,9 +501,9 @@
  	data8 sys_waitid			// 1270
  	data8 sys_add_key
  	data8 sys_request_key
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/ia64/kernel/perfmon.c kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/kernel/perfmon.c
---- kernel-2.6.32.54/linux-2.6.32/arch/ia64/kernel/perfmon.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/kernel/perfmon.c	2012-01-16 14:51:21.705409443 +0100
+diff -NurpP --minimal linux-2.6.32.56/arch/ia64/kernel/perfmon.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/kernel/perfmon.c
+--- linux-2.6.32.56/arch/ia64/kernel/perfmon.c	2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/kernel/perfmon.c	2011-06-10 13:03:02.000000000 +0200
 @@ -41,6 +41,7 @@
  #include <linux/rcupdate.h>
  #include <linux/completion.h>
@@ -512,7 +512,7 @@
  
  #include <asm/errno.h>
  #include <asm/intrinsics.h>
-@@ -2372,7 +2373,7 @@
+@@ -2372,7 +2373,7 @@ pfm_smpl_buffer_alloc(struct task_struct
  	 */
  	insert_vm_struct(mm, vma);
  
@@ -521,10 +521,10 @@
  	vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
  							vma_pages(vma));
  	up_write(&task->mm->mmap_sem);
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/ia64/kernel/process.c kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/kernel/process.c
---- kernel-2.6.32.54/linux-2.6.32/arch/ia64/kernel/process.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/kernel/process.c	2012-01-16 14:51:21.705409443 +0100
-@@ -110,8 +110,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/ia64/kernel/process.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/kernel/process.c
+--- linux-2.6.32.56/arch/ia64/kernel/process.c	2009-12-03 20:01:56.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/kernel/process.c	2011-06-10 13:03:02.000000000 +0200
+@@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs)
  	unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
  
  	print_modules();
@@ -535,9 +535,9 @@
  	printk("psr : %016lx ifs : %016lx ip  : [<%016lx>]    %s (%s)\n",
  	       regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
  	       init_utsname()->release);
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/ia64/kernel/ptrace.c kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/kernel/ptrace.c
---- kernel-2.6.32.54/linux-2.6.32/arch/ia64/kernel/ptrace.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/kernel/ptrace.c	2012-01-16 14:51:21.713409415 +0100
+diff -NurpP --minimal linux-2.6.32.56/arch/ia64/kernel/ptrace.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/kernel/ptrace.c
+--- linux-2.6.32.56/arch/ia64/kernel/ptrace.c	2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/kernel/ptrace.c	2011-06-10 13:03:02.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/regset.h>
  #include <linux/elf.h>
@@ -546,10 +546,10 @@
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/ia64/kernel/traps.c kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/kernel/traps.c
---- kernel-2.6.32.54/linux-2.6.32/arch/ia64/kernel/traps.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/kernel/traps.c	2012-01-16 14:51:21.713409415 +0100
-@@ -60,8 +60,9 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/ia64/kernel/traps.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/kernel/traps.c
+--- linux-2.6.32.56/arch/ia64/kernel/traps.c	2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/kernel/traps.c	2011-06-10 13:03:02.000000000 +0200
+@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
  	put_cpu();
  
  	if (++die.lock_owner_depth < 3) {
@@ -561,7 +561,7 @@
  		if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV)
  	            != NOTIFY_STOP)
  			show_regs(regs);
-@@ -324,8 +325,9 @@
+@@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_
  			if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
  				last.time = current_jiffies + 5 * HZ;
  				printk(KERN_WARNING
@@ -573,9 +573,9 @@
  			}
  		}
  	}
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/ia64/mm/fault.c kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/mm/fault.c
---- kernel-2.6.32.54/linux-2.6.32/arch/ia64/mm/fault.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/ia64/mm/fault.c	2012-01-16 14:51:21.713409415 +0100
+diff -NurpP --minimal linux-2.6.32.56/arch/ia64/mm/fault.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/mm/fault.c
+--- linux-2.6.32.56/arch/ia64/mm/fault.c	2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/ia64/mm/fault.c	2011-06-10 13:03:02.000000000 +0200
 @@ -10,6 +10,7 @@
  #include <linux/interrupt.h>
  #include <linux/kprobes.h>
@@ -584,7 +584,7 @@
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-@@ -281,7 +282,8 @@
+@@ -281,7 +282,8 @@ ia64_do_page_fault (unsigned long addres
  		down_read(&mm->mmap_sem);
  		goto survive;
  	}
@@ -594,10 +594,10 @@
  	if (user_mode(regs))
  		do_group_exit(SIGKILL);
  	goto no_context;
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/m32r/kernel/traps.c kernel-2.6.32.54.vs/linux-2.6.32/arch/m32r/kernel/traps.c
---- kernel-2.6.32.54/linux-2.6.32/arch/m32r/kernel/traps.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/m32r/kernel/traps.c	2012-01-16 14:51:21.713409415 +0100
-@@ -196,8 +196,9 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/m32r/kernel/traps.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/m32r/kernel/traps.c
+--- linux-2.6.32.56/arch/m32r/kernel/traps.c	2009-12-03 20:01:57.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/m32r/kernel/traps.c	2011-06-10 13:03:02.000000000 +0200
+@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
  	} else {
  		printk("SPI: %08lx\n", sp);
  	}
@@ -609,10 +609,10 @@
  
  	/*
  	 * When in-kernel, we also print out the stack and code at the
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/m32r/mm/fault.c kernel-2.6.32.54.vs/linux-2.6.32/arch/m32r/mm/fault.c
---- kernel-2.6.32.54/linux-2.6.32/arch/m32r/mm/fault.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/m32r/mm/fault.c	2012-01-16 14:51:21.713409415 +0100
-@@ -276,7 +276,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/m32r/mm/fault.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/m32r/mm/fault.c
+--- linux-2.6.32.56/arch/m32r/mm/fault.c	2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/m32r/mm/fault.c	2011-06-10 13:03:02.000000000 +0200
+@@ -276,7 +276,8 @@ out_of_memory:
  		down_read(&mm->mmap_sem);
  		goto survive;
  	}
@@ -622,10 +622,10 @@
  	if (error_code & ACE_USERMODE)
  		do_group_exit(SIGKILL);
  	goto no_context;
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/m68k/Kconfig kernel-2.6.32.54.vs/linux-2.6.32/arch/m68k/Kconfig
---- kernel-2.6.32.54/linux-2.6.32/arch/m68k/Kconfig	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/m68k/Kconfig	2012-01-16 14:51:21.713409415 +0100
-@@ -622,6 +622,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/m68k/Kconfig linux-2.6.32.56-vs2.3.0.36.29.9/arch/m68k/Kconfig
+--- linux-2.6.32.56/arch/m68k/Kconfig	2009-12-03 20:01:57.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/m68k/Kconfig	2011-06-10 13:03:02.000000000 +0200
+@@ -622,6 +622,8 @@ source "fs/Kconfig"
  
  source "arch/m68k/Kconfig.debug"
  
@@ -634,9 +634,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/m68k/kernel/ptrace.c kernel-2.6.32.54.vs/linux-2.6.32/arch/m68k/kernel/ptrace.c
---- kernel-2.6.32.54/linux-2.6.32/arch/m68k/kernel/ptrace.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/m68k/kernel/ptrace.c	2012-01-16 14:51:21.713409415 +0100
+diff -NurpP --minimal linux-2.6.32.56/arch/m68k/kernel/ptrace.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/m68k/kernel/ptrace.c
+--- linux-2.6.32.56/arch/m68k/kernel/ptrace.c	2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/m68k/kernel/ptrace.c	2011-06-10 13:03:02.000000000 +0200
 @@ -18,6 +18,7 @@
  #include <linux/ptrace.h>
  #include <linux/user.h>
@@ -645,7 +645,7 @@
  
  #include <asm/uaccess.h>
  #include <asm/page.h>
-@@ -269,6 +270,8 @@
+@@ -269,6 +270,8 @@ long arch_ptrace(struct task_struct *chi
  		ret = ptrace_request(child, request, addr, data);
  		break;
  	}
@@ -654,10 +654,10 @@
  
  	return ret;
  out_eio:
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/m68k/kernel/traps.c kernel-2.6.32.54.vs/linux-2.6.32/arch/m68k/kernel/traps.c
---- kernel-2.6.32.54/linux-2.6.32/arch/m68k/kernel/traps.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/m68k/kernel/traps.c	2012-01-16 14:51:21.713409415 +0100
-@@ -906,8 +906,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/m68k/kernel/traps.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/m68k/kernel/traps.c
+--- linux-2.6.32.56/arch/m68k/kernel/traps.c	2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/m68k/kernel/traps.c	2011-06-10 13:03:02.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);
  
@@ -668,10 +668,10 @@
  	addr = (unsigned long)&fp->un;
  	printk("Frame format=%X ", regs->format);
  	switch (regs->format) {
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/m68k/mm/fault.c kernel-2.6.32.54.vs/linux-2.6.32/arch/m68k/mm/fault.c
---- kernel-2.6.32.54/linux-2.6.32/arch/m68k/mm/fault.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/m68k/mm/fault.c	2012-01-16 14:51:21.713409415 +0100
-@@ -186,7 +186,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/m68k/mm/fault.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/m68k/mm/fault.c
+--- linux-2.6.32.56/arch/m68k/mm/fault.c	2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/m68k/mm/fault.c	2011-06-10 13:03:02.000000000 +0200
+@@ -186,7 +186,8 @@ out_of_memory:
  		goto survive;
  	}
  
@@ -681,10 +681,10 @@
  	if (user_mode(regs))
  		do_group_exit(SIGKILL);
  
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/m68knommu/Kconfig kernel-2.6.32.54.vs/linux-2.6.32/arch/m68knommu/Kconfig
---- kernel-2.6.32.54/linux-2.6.32/arch/m68knommu/Kconfig	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/m68knommu/Kconfig	2012-01-16 14:51:21.713409415 +0100
-@@ -727,6 +727,8 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/m68knommu/Kconfig linux-2.6.32.56-vs2.3.0.36.29.9/arch/m68knommu/Kconfig
+--- linux-2.6.32.56/arch/m68knommu/Kconfig	2009-12-03 20:01:57.000000000 +0100
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/m68knommu/Kconfig	2011-06-10 13:03:02.000000000 +0200
+@@ -727,6 +727,8 @@ source "fs/Kconfig"
  
  source "arch/m68knommu/Kconfig.debug"
  
@@ -693,10 +693,10 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/m68knommu/kernel/traps.c kernel-2.6.32.54.vs/linux-2.6.32/arch/m68knommu/kernel/traps.c
---- kernel-2.6.32.54/linux-2.6.32/arch/m68knommu/kernel/traps.c	2009-12-03 04:51:21.000000000 +0100
-+++ kernel-2.6.32.54.vs/linux-2.6.32/arch/m68knommu/kernel/traps.c	2012-01-16 14:51:21.713409415 +0100
-@@ -78,8 +78,9 @@
+diff -NurpP --minimal linux-2.6.32.56/arch/m68knommu/kernel/traps.c linux-2.6.32.56-vs2.3.0.36.29.9/arch/m68knommu/kernel/traps.c
+--- linux-2.6.32.56/arch/m68knommu/kernel/traps.c	2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.56-vs2.3.0.36.29.9/arch/m68knommu/kernel/traps.c	2011-06-10 13:03:02.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);
  
@@ -708,10 +708,10 @@
  	show_stack(NULL, (unsigned long *)(fp + 1));
  	add_taint(TAINT_DIE);
  	do_exit(SIGSEGV);
-diff -Nur kernel-2.6.32.54/linux-2.6.32/arch/microblaze/mm/fault.c kernel-2.6.32.54.vs/linux-2.6.32/arch/microblaze/mm/fault.c
---- kernel-2.6.32.54/linux-2.6.32/arch/microblaze/mm/fault.c	2009-12-03 04:51:21.000000000 +0100
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.31.2.7&r2=1.31.2.8&f=u



More information about the pld-cvs-commit mailing list