packages: kernel/kernel-vserver-2.3.patch, kernel/kernel.spec http://vserve...
arekm
arekm at pld-linux.org
Thu Jan 6 12:12:22 CET 2011
Author: arekm Date: Thu Jan 6 11:12:22 2011 GMT
Module: packages Tag: HEAD
---- Log message:
http://vserver.13thfloor.at/Experimental/patch-2.6.37-vs2.3.0.37-rc1.diff
---- Files affected:
packages/kernel:
kernel-vserver-2.3.patch (1.52 -> 1.53) , kernel.spec (1.867 -> 1.868)
---- Diffs:
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.52 packages/kernel/kernel-vserver-2.3.patch:1.53
--- packages/kernel/kernel-vserver-2.3.patch:1.52 Tue Dec 21 21:58:24 2010
+++ packages/kernel/kernel-vserver-2.3.patch Thu Jan 6 12:12:15 2011
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.36.2/arch/alpha/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/Kconfig
---- linux-2.6.36.2/arch/alpha/Kconfig 2010-10-21 13:06:45.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/Kconfig 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/alpha/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/Kconfig
+--- linux-2.6.37/arch/alpha/Kconfig 2011-01-05 21:48:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/Kconfig 2010-11-23 02:09:40.000000000 +0100
@@ -677,6 +677,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.36.2/arch/alpha/kernel/entry.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/entry.S
---- linux-2.6.36.2/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/entry.S 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/entry.S linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/entry.S
+--- linux-2.6.37/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/entry.S 2010-11-23 02:09:40.000000000 +0100
@@ -860,24 +860,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -45,9 +45,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.36.2/arch/alpha/kernel/ptrace.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/ptrace.c
---- linux-2.6.36.2/arch/alpha/kernel/ptrace.c 2010-07-07 18:30:51.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/ptrace.c
+--- linux-2.6.37/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/ptrace.c 2010-11-23 02:09:40.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/user.h>
#include <linux/security.h>
@@ -56,9 +56,9 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.36.2/arch/alpha/kernel/systbls.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/systbls.S
---- linux-2.6.36.2/arch/alpha/kernel/systbls.S 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/systbls.S 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/systbls.S linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/systbls.S
+--- linux-2.6.37/arch/alpha/kernel/systbls.S 2010-10-21 13:06:46.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/systbls.S 2010-11-23 02:09:40.000000000 +0100
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -68,9 +68,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.36.2/arch/alpha/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/traps.c
---- linux-2.6.36.2/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/traps.c
+--- linux-2.6.37/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -81,9 +81,9 @@
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.36.2/arch/arm/include/asm/tlb.h linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/include/asm/tlb.h
---- linux-2.6.36.2/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/arm/include/asm/tlb.h linux-2.6.37-vs2.3.0.37-rc1/arch/arm/include/asm/tlb.h
+--- linux-2.6.37/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/arm/include/asm/tlb.h 2010-11-23 02:09:40.000000000 +0100
@@ -27,6 +27,7 @@
#else /* !CONFIG_MMU */
@@ -92,10 +92,10 @@
#include <asm/pgalloc.h>
/*
-diff -NurpP --minimal linux-2.6.36.2/arch/arm/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/Kconfig
---- linux-2.6.36.2/arch/arm/Kconfig 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/Kconfig 2010-10-21 13:09:36.000000000 +0200
-@@ -1803,6 +1803,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.37/arch/arm/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/arm/Kconfig
+--- linux-2.6.37/arch/arm/Kconfig 2011-01-05 21:48:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/arm/Kconfig 2011-01-05 22:30:25.000000000 +0100
+@@ -1854,6 +1854,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -104,9 +104,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36.2/arch/arm/kernel/calls.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/kernel/calls.S
---- linux-2.6.36.2/arch/arm/kernel/calls.S 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/kernel/calls.S 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/arm/kernel/calls.S linux-2.6.37-vs2.3.0.37-rc1/arch/arm/kernel/calls.S
+--- linux-2.6.37/arch/arm/kernel/calls.S 2010-10-21 13:06:46.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/arm/kernel/calls.S 2010-11-23 02:09:40.000000000 +0100
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -116,10 +116,10 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.36.2/arch/arm/kernel/process.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/kernel/process.c
---- linux-2.6.36.2/arch/arm/kernel/process.c 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/kernel/process.c 2010-10-21 13:09:36.000000000 +0200
-@@ -295,7 +295,8 @@ void __show_regs(struct pt_regs *regs)
+diff -NurpP --minimal linux-2.6.37/arch/arm/kernel/process.c linux-2.6.37-vs2.3.0.37-rc1/arch/arm/kernel/process.c
+--- linux-2.6.37/arch/arm/kernel/process.c 2011-01-05 21:48:42.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/arm/kernel/process.c 2010-11-23 02:09:40.000000000 +0100
+@@ -315,7 +315,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
printk("\n");
@@ -129,10 +129,10 @@
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.36.2/arch/arm/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/kernel/traps.c
---- linux-2.6.36.2/arch/arm/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
-@@ -244,8 +244,8 @@ static int __die(const char *str, int er
+diff -NurpP --minimal linux-2.6.37/arch/arm/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/arm/kernel/traps.c
+--- linux-2.6.37/arch/arm/kernel/traps.c 2011-01-05 21:48:42.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/arm/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
+@@ -241,8 +241,8 @@ static int __die(const char *str, int er
print_modules();
__show_regs(regs);
@@ -143,10 +143,10 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.36.2/arch/cris/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/cris/Kconfig
---- linux-2.6.36.2/arch/cris/Kconfig 2010-10-21 13:06:51.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/cris/Kconfig 2010-10-21 13:09:36.000000000 +0200
-@@ -694,6 +694,8 @@ source "drivers/staging/Kconfig"
+diff -NurpP --minimal linux-2.6.37/arch/cris/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/cris/Kconfig
+--- linux-2.6.37/arch/cris/Kconfig 2011-01-05 21:48:58.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/cris/Kconfig 2010-11-23 02:09:40.000000000 +0100
+@@ -687,6 +687,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -155,9 +155,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36.2/arch/frv/kernel/kernel_thread.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/frv/kernel/kernel_thread.S
---- linux-2.6.36.2/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/frv/kernel/kernel_thread.S 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/frv/kernel/kernel_thread.S linux-2.6.37-vs2.3.0.37-rc1/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.37/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/frv/kernel/kernel_thread.S 2010-11-23 02:09:40.000000000 +0100
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
@@ -167,10 +167,10 @@
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.36.2/arch/h8300/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/h8300/Kconfig
---- linux-2.6.36.2/arch/h8300/Kconfig 2010-10-21 13:06:51.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/h8300/Kconfig 2010-10-21 13:09:36.000000000 +0200
-@@ -226,6 +226,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.37/arch/h8300/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/h8300/Kconfig
+--- linux-2.6.37/arch/h8300/Kconfig 2011-01-05 21:48:59.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/h8300/Kconfig 2010-11-23 02:09:40.000000000 +0100
+@@ -219,6 +219,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -179,9 +179,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36.2/arch/ia64/include/asm/tlb.h linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/include/asm/tlb.h
---- linux-2.6.36.2/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000 +0100
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/ia64/include/asm/tlb.h linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/include/asm/tlb.h
+--- linux-2.6.37/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/include/asm/tlb.h 2010-11-23 02:09:40.000000000 +0100
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -190,10 +190,10 @@
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.36.2/arch/ia64/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/Kconfig
---- linux-2.6.36.2/arch/ia64/Kconfig 2010-10-21 13:06:52.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/Kconfig 2010-10-21 13:09:36.000000000 +0200
-@@ -671,6 +671,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.37/arch/ia64/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/Kconfig
+--- linux-2.6.37/arch/ia64/Kconfig 2011-01-05 21:48:59.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/Kconfig 2010-11-23 02:09:40.000000000 +0100
+@@ -670,6 +670,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -202,9 +202,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36.2/arch/ia64/kernel/entry.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/entry.S
---- linux-2.6.36.2/arch/ia64/kernel/entry.S 2010-10-21 13:06:52.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/entry.S 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/entry.S linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/entry.S
+--- linux-2.6.37/arch/ia64/kernel/entry.S 2010-10-21 13:06:52.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/entry.S 2010-11-23 02:09:40.000000000 +0100
@@ -1714,7 +1714,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -214,9 +214,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.36.2/arch/ia64/kernel/perfmon.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/perfmon.c
---- linux-2.6.36.2/arch/ia64/kernel/perfmon.c 2010-10-21 13:06:52.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/perfmon.c 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/perfmon.c linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/perfmon.c
+--- linux-2.6.37/arch/ia64/kernel/perfmon.c 2011-01-05 21:48:59.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/perfmon.c 2010-11-23 02:09:40.000000000 +0100
@@ -42,6 +42,7 @@
#include <linux/completion.h>
#include <linux/tracehook.h>
@@ -225,9 +225,9 @@
#include <asm/errno.h>
#include <asm/intrinsics.h>
-diff -NurpP --minimal linux-2.6.36.2/arch/ia64/kernel/process.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/process.c
---- linux-2.6.36.2/arch/ia64/kernel/process.c 2010-10-21 13:06:52.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/process.c 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/process.c linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/process.c
+--- linux-2.6.37/arch/ia64/kernel/process.c 2010-10-21 13:06:52.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/process.c 2010-11-23 02:09:40.000000000 +0100
@@ -113,8 +113,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -239,9 +239,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.36.2/arch/ia64/kernel/ptrace.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/ptrace.c
---- linux-2.6.36.2/arch/ia64/kernel/ptrace.c 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/ptrace.c
+--- linux-2.6.37/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/ptrace.c 2010-11-23 02:09:40.000000000 +0100
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -250,9 +250,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.36.2/arch/ia64/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/traps.c
---- linux-2.6.36.2/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/traps.c
+--- linux-2.6.37/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -277,9 +277,9 @@
}
}
}
-diff -NurpP --minimal linux-2.6.36.2/arch/ia64/mm/fault.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/mm/fault.c
---- linux-2.6.36.2/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/mm/fault.c 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/ia64/mm/fault.c linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/mm/fault.c
+--- linux-2.6.37/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/mm/fault.c 2010-11-23 02:09:40.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
@@ -288,9 +288,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.36.2/arch/m32r/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/m32r/kernel/traps.c
---- linux-2.6.36.2/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/m32r/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/m32r/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/m32r/kernel/traps.c
+--- linux-2.6.37/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/m32r/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -303,10 +303,10 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.36.2/arch/m68k/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68k/Kconfig
---- linux-2.6.36.2/arch/m68k/Kconfig 2010-10-21 13:06:52.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68k/Kconfig 2010-10-21 13:09:36.000000000 +0200
-@@ -616,6 +616,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.37/arch/m68k/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/m68k/Kconfig
+--- linux-2.6.37/arch/m68k/Kconfig 2011-01-05 21:49:00.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/m68k/Kconfig 2010-11-23 02:09:40.000000000 +0100
+@@ -610,6 +610,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -315,9 +315,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36.2/arch/m68k/kernel/ptrace.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68k/kernel/ptrace.c
---- linux-2.6.36.2/arch/m68k/kernel/ptrace.c 2010-07-07 18:31:02.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68k/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/m68k/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc1/arch/m68k/kernel/ptrace.c
+--- linux-2.6.37/arch/m68k/kernel/ptrace.c 2011-01-05 21:49:01.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/m68k/kernel/ptrace.c 2010-11-23 02:09:40.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
@@ -326,7 +326,7 @@
#include <asm/uaccess.h>
#include <asm/page.h>
-@@ -254,6 +255,8 @@ long arch_ptrace(struct task_struct *chi
+@@ -255,6 +256,8 @@ long arch_ptrace(struct task_struct *chi
ret = ptrace_request(child, request, addr, data);
break;
}
@@ -335,9 +335,9 @@
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.36.2/arch/m68k/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68k/kernel/traps.c
---- linux-2.6.36.2/arch/m68k/kernel/traps.c 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68k/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/m68k/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/m68k/kernel/traps.c
+--- linux-2.6.37/arch/m68k/kernel/traps.c 2010-08-02 16:52:04.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/m68k/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
@@ -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);
@@ -349,10 +349,10 @@
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
-diff -NurpP --minimal linux-2.6.36.2/arch/m68knommu/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68knommu/Kconfig
---- linux-2.6.36.2/arch/m68knommu/Kconfig 2010-10-21 13:06:53.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68knommu/Kconfig 2010-10-21 13:09:36.000000000 +0200
-@@ -730,6 +730,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.37/arch/m68knommu/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/m68knommu/Kconfig
+--- linux-2.6.37/arch/m68knommu/Kconfig 2011-01-05 21:49:01.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/m68knommu/Kconfig 2010-11-23 02:09:40.000000000 +0100
+@@ -732,6 +732,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -361,9 +361,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36.2/arch/m68knommu/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68knommu/kernel/traps.c
---- linux-2.6.36.2/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68knommu/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/m68knommu/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/m68knommu/kernel/traps.c
+--- linux-2.6.37/arch/m68knommu/kernel/traps.c 2011-01-05 21:49:01.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/m68knommu/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
@@ -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);
@@ -376,10 +376,10 @@
show_stack(NULL, (unsigned long *)(fp + 1));
add_taint(TAINT_DIE);
do_exit(SIGSEGV);
-diff -NurpP --minimal linux-2.6.36.2/arch/mips/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/Kconfig
---- linux-2.6.36.2/arch/mips/Kconfig 2010-10-21 13:06:53.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/Kconfig 2010-10-21 13:09:36.000000000 +0200
-@@ -2298,6 +2298,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.37/arch/mips/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/mips/Kconfig
+--- linux-2.6.37/arch/mips/Kconfig 2011-01-05 21:49:03.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/mips/Kconfig 2011-01-05 22:30:26.000000000 +0100
+@@ -2396,6 +2396,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -388,9 +388,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36.2/arch/mips/kernel/ptrace.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/ptrace.c
---- linux-2.6.36.2/arch/mips/kernel/ptrace.c 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/ptrace.c
+--- linux-2.6.37/arch/mips/kernel/ptrace.c 2011-01-05 21:49:06.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/ptrace.c 2010-11-23 02:09:40.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -399,9 +399,9 @@
#include <asm/byteorder.h>
#include <asm/cpu.h>
-@@ -259,6 +260,9 @@ long arch_ptrace(struct task_struct *chi
- {
- int ret;
+@@ -263,6 +264,9 @@ long arch_ptrace(struct task_struct *chi
+ void __user *datavp = (void __user *) data;
+ unsigned long __user *datalp = (void __user *) data;
+ if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
+ goto out;
@@ -409,9 +409,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.36.2/arch/mips/kernel/scall32-o32.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall32-o32.S
---- linux-2.6.36.2/arch/mips/kernel/scall32-o32.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall32-o32.S 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/scall32-o32.S linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.37/arch/mips/kernel/scall32-o32.S 2010-10-21 13:06:54.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall32-o32.S 2010-11-23 02:09:40.000000000 +0100
@@ -524,7 +524,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -421,9 +421,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.36.2/arch/mips/kernel/scall64-64.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall64-64.S
---- linux-2.6.36.2/arch/mips/kernel/scall64-64.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall64-64.S 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/scall64-64.S linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall64-64.S
+--- linux-2.6.37/arch/mips/kernel/scall64-64.S 2010-10-21 13:06:54.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall64-64.S 2010-11-23 02:09:40.000000000 +0100
@@ -363,7 +363,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -433,9 +433,9 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.36.2/arch/mips/kernel/scall64-n32.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall64-n32.S
---- linux-2.6.36.2/arch/mips/kernel/scall64-n32.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall64-n32.S 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/scall64-n32.S linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.37/arch/mips/kernel/scall64-n32.S 2010-10-21 13:06:54.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall64-n32.S 2010-11-23 02:09:40.000000000 +0100
@@ -362,7 +362,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -445,9 +445,9 @@
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.36.2/arch/mips/kernel/scall64-o32.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall64-o32.S
---- linux-2.6.36.2/arch/mips/kernel/scall64-o32.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall64-o32.S 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/scall64-o32.S linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.37/arch/mips/kernel/scall64-o32.S 2010-10-21 13:06:54.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall64-o32.S 2010-11-23 02:09:40.000000000 +0100
@@ -481,7 +481,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -457,10 +457,10 @@
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.36.2/arch/mips/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/traps.c
---- linux-2.6.36.2/arch/mips/kernel/traps.c 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
-@@ -341,9 +341,10 @@ void show_registers(struct pt_regs *regs
+diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/traps.c
+--- linux-2.6.37/arch/mips/kernel/traps.c 2011-01-05 21:49:06.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/traps.c 2011-01-05 22:30:26.000000000 +0100
+@@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
print_modules();
@@ -474,10 +474,10 @@
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-2.6.36.2/arch/parisc/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/Kconfig
---- linux-2.6.36.2/arch/parisc/Kconfig 2010-10-21 13:06:55.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/Kconfig 2010-10-21 13:09:36.000000000 +0200
-@@ -295,6 +295,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.37/arch/parisc/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/Kconfig
+--- linux-2.6.37/arch/parisc/Kconfig 2011-01-05 21:49:08.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/Kconfig 2010-11-23 02:09:40.000000000 +0100
+@@ -293,6 +293,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -486,9 +486,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36.2/arch/parisc/kernel/syscall_table.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/kernel/syscall_table.S
---- linux-2.6.36.2/arch/parisc/kernel/syscall_table.S 2010-07-07 18:31:04.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/kernel/syscall_table.S 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/parisc/kernel/syscall_table.S linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/kernel/syscall_table.S
+--- linux-2.6.37/arch/parisc/kernel/syscall_table.S 2011-01-05 21:49:09.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/kernel/syscall_table.S 2010-11-23 02:09:40.000000000 +0100
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -498,9 +498,9 @@
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.36.2/arch/parisc/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/kernel/traps.c
---- linux-2.6.36.2/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/parisc/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/kernel/traps.c
+--- linux-2.6.37/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
@@ -524,9 +524,9 @@
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-2.6.36.2/arch/parisc/mm/fault.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/mm/fault.c
---- linux-2.6.36.2/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/mm/fault.c 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/parisc/mm/fault.c linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/mm/fault.c
+--- linux-2.6.37/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/mm/fault.c 2010-11-23 02:09:40.000000000 +0100
@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -539,9 +539,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.36.2/arch/powerpc/include/asm/unistd.h linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/include/asm/unistd.h
---- linux-2.6.36.2/arch/powerpc/include/asm/unistd.h 2010-10-21 13:06:56.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/include/asm/unistd.h 2010-10-21 13:09:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.37/arch/powerpc/include/asm/unistd.h linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/include/asm/unistd.h
+--- linux-2.6.37/arch/powerpc/include/asm/unistd.h 2011-01-05 21:49:10.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/include/asm/unistd.h 2010-11-23 02:09:40.000000000 +0100
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -551,10 +551,10 @@
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-2.6.36.2/arch/powerpc/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/Kconfig
---- linux-2.6.36.2/arch/powerpc/Kconfig 2010-10-21 13:06:55.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/Kconfig 2010-10-21 13:09:36.000000000 +0200
-@@ -974,6 +974,8 @@ source "lib/Kconfig"
+diff -NurpP --minimal linux-2.6.37/arch/powerpc/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/Kconfig
+--- linux-2.6.37/arch/powerpc/Kconfig 2011-01-05 21:49:09.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/Kconfig 2010-11-23 02:09:40.000000000 +0100
+@@ -976,6 +976,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -563,10 +563,10 @@
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.36.2/arch/powerpc/kernel/process.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/kernel/process.c
---- linux-2.6.36.2/arch/powerpc/kernel/process.c 2010-10-21 13:06:56.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/kernel/process.c 2010-10-21 13:09:36.000000000 +0200
-@@ -634,8 +634,9 @@ void show_regs(struct pt_regs * regs)
+diff -NurpP --minimal linux-2.6.37/arch/powerpc/kernel/process.c linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/kernel/process.c
+--- linux-2.6.37/arch/powerpc/kernel/process.c 2011-01-05 21:49:11.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/kernel/process.c 2010-11-23 02:09:40.000000000 +0100
+@@ -633,8 +633,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
#endif
@@ -578,10 +578,10 @@
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-2.6.36.2/arch/powerpc/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/kernel/traps.c
---- linux-2.6.36.2/arch/powerpc/kernel/traps.c 2010-10-21 13:06:57.000000000 +0200
-+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
-@@ -1048,8 +1048,9 @@ void nonrecoverable_exception(struct pt_
+diff -NurpP --minimal linux-2.6.37/arch/powerpc/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/kernel/traps.c
+--- linux-2.6.37/arch/powerpc/kernel/traps.c 2011-01-05 21:49:11.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
+@@ -1053,8 +1053,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
<<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.52&r2=1.53&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.867&r2=1.868&f=u
More information about the pld-cvs-commit
mailing list