Author: baggins Date: Sun Jul 10 22:36:14 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to
http://vserver.13thfloor.at/Experimental/patch-3.0-rc5-vs2.3.1-pre3.diff
---- Files affected:
packages/kernel:
kernel-vserver-2.3.patch (1.65 -> 1.66) , kernel-vserver-fixes.patch (1.20
-> 1.21)
---- Diffs:
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.65
packages/kernel/kernel-vserver-2.3.patch:1.66
--- packages/kernel/kernel-vserver-2.3.patch:1.65 Sun May 15 16:07:23 2011
+++ packages/kernel/kernel-vserver-2.3.patch Mon Jul 11 00:36:08 2011
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.38.6/Documentation/vserver/debug.txt
linux-2.6.38.6-vs2.3.0.37-rc15/Documentation/vserver/debug.txt
---- linux-2.6.38.6/Documentation/vserver/debug.txt 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/Documentation/vserver/debug.txt
2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/Documentation/vserver/debug.txt
linux-3.0-rc5-vs2.3.1-pre3/Documentation/vserver/debug.txt
+--- linux-3.0-rc5/Documentation/vserver/debug.txt 1970-01-01
01:00:00.000000000 +0100
++++ linux-3.0-rc5-vs2.3.1-pre3/Documentation/vserver/debug.txt 2011-06-10
22:11:24.000000000 +0200
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,9 +156,9 @@
+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-2.6.38.6/arch/alpha/Kconfig
linux-2.6.38.6-vs2.3.0.37-rc15/arch/alpha/Kconfig
---- linux-2.6.38.6/arch/alpha/Kconfig 2011-03-15 18:06:23.000000000 +0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/alpha/Kconfig 2011-03-10
17:21:19.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/alpha/Kconfig
linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/Kconfig
+--- linux-3.0-rc5/arch/alpha/Kconfig 2011-07-01 11:13:32.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/Kconfig 2011-06-10
22:11:24.000000000 +0200
@@ -668,6 +668,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -168,9 +168,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38.6/arch/alpha/kernel/entry.S
linux-2.6.38.6-vs2.3.0.37-rc15/arch/alpha/kernel/entry.S
---- linux-2.6.38.6/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000
+0200
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/alpha/kernel/entry.S 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/alpha/kernel/entry.S
linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/entry.S
+--- linux-3.0-rc5/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000
+0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/entry.S 2011-06-10
22:11:24.000000000 +0200
@@ -860,24 +860,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -203,9 +203,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.38.6/arch/alpha/kernel/ptrace.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/alpha/kernel/ptrace.c
---- linux-2.6.38.6/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/alpha/kernel/ptrace.c 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/alpha/kernel/ptrace.c
linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/ptrace.c
+--- linux-3.0-rc5/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000
+0100
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/ptrace.c 2011-06-10
22:11:24.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/user.h>
#include <linux/security.h>
@@ -214,9 +214,9 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.38.6/arch/alpha/kernel/systbls.S
linux-2.6.38.6-vs2.3.0.37-rc15/arch/alpha/kernel/systbls.S
---- linux-2.6.38.6/arch/alpha/kernel/systbls.S 2010-10-21 13:06:46.000000000
+0200
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/alpha/kernel/systbls.S 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/alpha/kernel/systbls.S
linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/systbls.S
+--- linux-3.0-rc5/arch/alpha/kernel/systbls.S 2011-07-01 11:13:32.000000000
+0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/systbls.S 2011-06-10
22:11:24.000000000 +0200
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -226,9 +226,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.38.6/arch/alpha/kernel/traps.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/alpha/kernel/traps.c
---- linux-2.6.38.6/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000
+0200
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/alpha/kernel/traps.c 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/alpha/kernel/traps.c
linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/traps.c
+--- linux-3.0-rc5/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000
+0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/traps.c 2011-06-10
22:11:24.000000000 +0200
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -239,10 +239,10 @@
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.38.6/arch/arm/Kconfig
linux-2.6.38.6-vs2.3.0.37-rc15/arch/arm/Kconfig
---- linux-2.6.38.6/arch/arm/Kconfig 2011-03-15 18:06:23.000000000 +0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/arm/Kconfig 2011-03-07
16:53:25.000000000 +0100
-@@ -1934,6 +1934,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.0-rc5/arch/arm/Kconfig
linux-3.0-rc5-vs2.3.1-pre3/arch/arm/Kconfig
+--- linux-3.0-rc5/arch/arm/Kconfig 2011-07-01 11:13:32.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/arm/Kconfig 2011-06-10
22:11:24.000000000 +0200
+@@ -2035,6 +2035,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -251,9 +251,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38.6/arch/arm/kernel/calls.S
linux-2.6.38.6-vs2.3.0.37-rc15/arch/arm/kernel/calls.S
---- linux-2.6.38.6/arch/arm/kernel/calls.S 2010-10-21 13:06:46.000000000
+0200
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/arm/kernel/calls.S 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/arm/kernel/calls.S
linux-3.0-rc5-vs2.3.1-pre3/arch/arm/kernel/calls.S
+--- linux-3.0-rc5/arch/arm/kernel/calls.S 2011-07-01 11:13:32.000000000
+0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/arm/kernel/calls.S 2011-06-10
22:11:24.000000000 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -263,9 +263,9 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.38.6/arch/arm/kernel/process.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/arm/kernel/process.c
---- linux-2.6.38.6/arch/arm/kernel/process.c 2011-03-15 18:06:25.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/arm/kernel/process.c 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/arm/kernel/process.c
linux-3.0-rc5-vs2.3.1-pre3/arch/arm/kernel/process.c
+--- linux-3.0-rc5/arch/arm/kernel/process.c 2011-05-22 16:16:47.000000000
+0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/arm/kernel/process.c 2011-06-10
22:11:24.000000000 +0200
@@ -315,7 +315,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -276,10 +276,10 @@
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.38.6/arch/arm/kernel/traps.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/arm/kernel/traps.c
---- linux-2.6.38.6/arch/arm/kernel/traps.c 2011-03-15 18:06:25.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/arm/kernel/traps.c 2011-01-29
02:01:07.000000000 +0100
-@@ -243,8 +243,8 @@ static int __die(const char *str, int er
+diff -NurpP --minimal linux-3.0-rc5/arch/arm/kernel/traps.c
linux-3.0-rc5-vs2.3.1-pre3/arch/arm/kernel/traps.c
+--- linux-3.0-rc5/arch/arm/kernel/traps.c 2011-07-01 11:13:32.000000000
+0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/arm/kernel/traps.c 2011-06-22
12:39:12.000000000 +0200
+@@ -242,8 +242,8 @@ static int __die(const char *str, int er
print_modules();
__show_regs(regs);
@@ -290,10 +290,10 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.38.6/arch/cris/Kconfig
linux-2.6.38.6-vs2.3.0.37-rc15/arch/cris/Kconfig
---- linux-2.6.38.6/arch/cris/Kconfig 2011-03-15 18:06:38.000000000 +0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/cris/Kconfig 2011-01-29
02:01:07.000000000 +0100
-@@ -685,6 +685,8 @@ source "drivers/staging/Kconfig"
+diff -NurpP --minimal linux-3.0-rc5/arch/cris/Kconfig
linux-3.0-rc5-vs2.3.1-pre3/arch/cris/Kconfig
+--- linux-3.0-rc5/arch/cris/Kconfig 2011-07-01 11:13:37.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/cris/Kconfig 2011-06-10
22:11:24.000000000 +0200
+@@ -678,6 +678,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -302,9 +302,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38.6/arch/frv/kernel/kernel_thread.S
linux-2.6.38.6-vs2.3.0.37-rc15/arch/frv/kernel/kernel_thread.S
---- linux-2.6.38.6/arch/frv/kernel/kernel_thread.S 2008-12-25
00:26:37.000000000 +0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/frv/kernel/kernel_thread.S
2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/frv/kernel/kernel_thread.S
linux-3.0-rc5-vs2.3.1-pre3/arch/frv/kernel/kernel_thread.S
+--- linux-3.0-rc5/arch/frv/kernel/kernel_thread.S 2008-12-25
00:26:37.000000000 +0100
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/frv/kernel/kernel_thread.S 2011-06-10
22:11:24.000000000 +0200
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
@@ -314,10 +314,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.38.6/arch/h8300/Kconfig
linux-2.6.38.6-vs2.3.0.37-rc15/arch/h8300/Kconfig
---- linux-2.6.38.6/arch/h8300/Kconfig 2011-03-15 18:06:38.000000000 +0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/h8300/Kconfig 2011-01-29
02:01:07.000000000 +0100
-@@ -217,6 +217,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.0-rc5/arch/h8300/Kconfig
linux-3.0-rc5-vs2.3.1-pre3/arch/h8300/Kconfig
+--- linux-3.0-rc5/arch/h8300/Kconfig 2011-07-01 11:13:37.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/h8300/Kconfig 2011-06-10
22:11:24.000000000 +0200
+@@ -213,6 +213,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -326,10 +326,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38.6/arch/ia64/Kconfig
linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/Kconfig
---- linux-2.6.38.6/arch/ia64/Kconfig 2011-03-15 18:06:38.000000000 +0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/Kconfig 2011-01-29
02:01:07.000000000 +0100
-@@ -674,6 +674,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.0-rc5/arch/ia64/Kconfig
linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/Kconfig
+--- linux-3.0-rc5/arch/ia64/Kconfig 2011-07-01 11:13:37.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/Kconfig 2011-06-10
22:11:24.000000000 +0200
+@@ -671,6 +671,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -338,9 +338,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38.6/arch/ia64/include/asm/tlb.h
linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/include/asm/tlb.h
---- linux-2.6.38.6/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/include/asm/tlb.h 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/ia64/include/asm/tlb.h
linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/include/asm/tlb.h
+--- linux-3.0-rc5/arch/ia64/include/asm/tlb.h 2011-07-01 11:13:37.000000000
+0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/include/asm/tlb.h 2011-06-10
22:11:24.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -349,9 +349,9 @@
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.38.6/arch/ia64/kernel/entry.S
linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/kernel/entry.S
---- linux-2.6.38.6/arch/ia64/kernel/entry.S 2010-10-21 13:06:52.000000000
+0200
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/kernel/entry.S 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/ia64/kernel/entry.S
linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/entry.S
+--- linux-3.0-rc5/arch/ia64/kernel/entry.S 2011-07-01 11:13:38.000000000
+0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/entry.S 2011-06-10
22:11:24.000000000 +0200
@@ -1714,7 +1714,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -361,9 +361,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.38.6/arch/ia64/kernel/perfmon.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/kernel/perfmon.c
---- linux-2.6.38.6/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/kernel/perfmon.c 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/ia64/kernel/perfmon.c
linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/perfmon.c
+--- linux-3.0-rc5/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000
+0100
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/perfmon.c 2011-06-10
22:11:24.000000000 +0200
@@ -42,6 +42,7 @@
#include <linux/completion.h>
#include <linux/tracehook.h>
@@ -372,9 +372,9 @@
#include <asm/errno.h>
#include <asm/intrinsics.h>
-diff -NurpP --minimal linux-2.6.38.6/arch/ia64/kernel/process.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/kernel/process.c
---- linux-2.6.38.6/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/kernel/process.c 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/ia64/kernel/process.c
linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/process.c
+--- linux-3.0-rc5/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000
+0100
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/process.c 2011-06-10
22:11:24.000000000 +0200
@@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -386,9 +386,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.38.6/arch/ia64/kernel/ptrace.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/kernel/ptrace.c
---- linux-2.6.38.6/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/kernel/ptrace.c 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/ia64/kernel/ptrace.c
linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/ptrace.c
+--- linux-3.0-rc5/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000
+0100
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/ptrace.c 2011-06-10
22:11:24.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -397,9 +397,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.38.6/arch/ia64/kernel/traps.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/kernel/traps.c
---- linux-2.6.38.6/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000
+0200
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/kernel/traps.c 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/ia64/kernel/traps.c
linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/traps.c
+--- linux-3.0-rc5/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000
+0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/traps.c 2011-06-10
22:11:24.000000000 +0200
@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -424,20 +424,20 @@
}
}
}
-diff -NurpP --minimal linux-2.6.38.6/arch/ia64/mm/fault.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/mm/fault.c
---- linux-2.6.38.6/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000
+0200
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/ia64/mm/fault.c 2011-01-29
02:01:07.000000000 +0100
-@@ -10,6 +10,7 @@
- #include <linux/interrupt.h>
+diff -NurpP --minimal linux-3.0-rc5/arch/ia64/mm/fault.c
linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/mm/fault.c
+--- linux-3.0-rc5/arch/ia64/mm/fault.c 2011-07-01 11:13:38.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/mm/fault.c 2011-06-10
22:28:23.000000000 +0200
+@@ -11,6 +11,7 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
+ #include <linux/prefetch.h>
+#include <linux/vs_memory.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.38.6/arch/m32r/kernel/traps.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/m32r/kernel/traps.c
---- linux-2.6.38.6/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/m32r/kernel/traps.c 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/m32r/kernel/traps.c
linux-3.0-rc5-vs2.3.1-pre3/arch/m32r/kernel/traps.c
+--- linux-3.0-rc5/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000
+0100
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/m32r/kernel/traps.c 2011-06-10
22:11:24.000000000 +0200
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -450,10 +450,10 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.38.6/arch/m68k/Kconfig
linux-2.6.38.6-vs2.3.0.37-rc15/arch/m68k/Kconfig
---- linux-2.6.38.6/arch/m68k/Kconfig 2011-01-05 21:49:00.000000000 +0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/m68k/Kconfig 2011-01-29
02:01:07.000000000 +0100
-@@ -610,6 +610,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.0-rc5/arch/m68k/Kconfig
linux-3.0-rc5-vs2.3.1-pre3/arch/m68k/Kconfig
+--- linux-3.0-rc5/arch/m68k/Kconfig 2011-07-01 11:13:38.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/m68k/Kconfig 2011-06-10
22:11:24.000000000 +0200
+@@ -241,6 +241,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -462,71 +462,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38.6/arch/m68k/kernel/ptrace.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/m68k/kernel/ptrace.c
---- linux-2.6.38.6/arch/m68k/kernel/ptrace.c 2011-01-05 21:49:01.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/m68k/kernel/ptrace.c 2011-01-29
02:01:07.000000000 +0100
-@@ -18,6 +18,7 @@
- #include <linux/ptrace.h>
- #include <linux/user.h>
- #include <linux/signal.h>
-+#include <linux/vs_base.h>
-
- #include <asm/uaccess.h>
- #include <asm/page.h>
-@@ -255,6 +256,8 @@ long arch_ptrace(struct task_struct *chi
- ret = ptrace_request(child, request, addr, data);
- break;
- }
-+ if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
-+ goto out_tsk;
-
- return ret;
- out_eio:
-diff -NurpP --minimal linux-2.6.38.6/arch/m68k/kernel/traps.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/m68k/kernel/traps.c
---- linux-2.6.38.6/arch/m68k/kernel/traps.c 2010-08-02 16:52:04.000000000
+0200
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/m68k/kernel/traps.c 2011-01-29
02:01:07.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);
-
-- printk("Process %s (pid: %d, task=%p)\n",
-- current->comm, task_pid_nr(current), current);
-+ printk("Process %s (pid: %d[#%u], task=%p)\n",
-+ current->comm, task_pid_nr(current), current->xid, current);
- addr = (unsigned long)&fp->un;
- printk("Frame format=%X ", regs->format);
- switch (regs->format) {
-diff -NurpP --minimal linux-2.6.38.6/arch/m68knommu/Kconfig
linux-2.6.38.6-vs2.3.0.37-rc15/arch/m68knommu/Kconfig
---- linux-2.6.38.6/arch/m68knommu/Kconfig 2011-03-15 18:06:41.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/m68knommu/Kconfig 2011-01-29
02:01:07.000000000 +0100
-@@ -801,6 +801,8 @@ source "fs/Kconfig"
-
- source "arch/m68knommu/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38.6/arch/m68knommu/kernel/traps.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/m68knommu/kernel/traps.c
---- linux-2.6.38.6/arch/m68knommu/kernel/traps.c 2011-01-05
21:49:01.000000000 +0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/m68knommu/kernel/traps.c
2011-01-29 02:01:07.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);
-
-- printk(KERN_EMERG "Process %s (pid: %d, stackpage=%08lx)\n",
-- current->comm, current->pid, PAGE_SIZE+(unsigned long)current);
-+ printk(KERN_EMERG "Process %s (pid: %d[#%u], stackpage=%08lx)\n",
-+ current->comm, task_pid_nr(current), current->xid,
-+ PAGE_SIZE+(unsigned long)current);
- show_stack(NULL, (unsigned long *)(fp + 1));
- add_taint(TAINT_DIE);
- do_exit(SIGSEGV);
-diff -NurpP --minimal linux-2.6.38.6/arch/mips/Kconfig
linux-2.6.38.6-vs2.3.0.37-rc15/arch/mips/Kconfig
---- linux-2.6.38.6/arch/mips/Kconfig 2011-03-15 18:06:42.000000000 +0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/mips/Kconfig 2011-03-15
18:15:06.000000000 +0100
-@@ -2418,6 +2418,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.0-rc5/arch/mips/Kconfig
linux-3.0-rc5-vs2.3.1-pre3/arch/mips/Kconfig
+--- linux-3.0-rc5/arch/mips/Kconfig 2011-07-01 11:13:38.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/mips/Kconfig 2011-06-10
22:11:24.000000000 +0200
+@@ -2485,6 +2485,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -535,9 +474,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38.6/arch/mips/kernel/ptrace.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/mips/kernel/ptrace.c
---- linux-2.6.38.6/arch/mips/kernel/ptrace.c 2011-01-05 21:49:06.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/mips/kernel/ptrace.c 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/mips/kernel/ptrace.c
linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/ptrace.c
+--- linux-3.0-rc5/arch/mips/kernel/ptrace.c 2011-07-01 11:13:39.000000000
+0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/ptrace.c 2011-06-10
22:11:24.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -556,10 +495,10 @@
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.38.6/arch/mips/kernel/scall32-o32.S
linux-2.6.38.6-vs2.3.0.37-rc15/arch/mips/kernel/scall32-o32.S
---- linux-2.6.38.6/arch/mips/kernel/scall32-o32.S 2010-10-21
13:06:54.000000000 +0200
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/mips/kernel/scall32-o32.S
2011-01-29 02:01:07.000000000 +0100
-@@ -524,7 +524,7 @@ einval: li v0, -ENOSYS
+diff -NurpP --minimal linux-3.0-rc5/arch/mips/kernel/scall32-o32.S
linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall32-o32.S
+--- linux-3.0-rc5/arch/mips/kernel/scall32-o32.S 2011-07-01
11:13:39.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall32-o32.S 2011-06-10
22:11:24.000000000 +0200
+@@ -523,7 +523,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
sys sys_mq_getsetattr 3
@@ -568,10 +507,10 @@
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-2.6.38.6/arch/mips/kernel/scall64-64.S
linux-2.6.38.6-vs2.3.0.37-rc15/arch/mips/kernel/scall64-64.S
---- linux-2.6.38.6/arch/mips/kernel/scall64-64.S 2010-10-21
13:06:54.000000000 +0200
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/mips/kernel/scall64-64.S
2011-01-29 02:01:07.000000000 +0100
-@@ -363,7 +363,7 @@ sys_call_table:
+diff -NurpP --minimal linux-3.0-rc5/arch/mips/kernel/scall64-64.S
linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall64-64.S
+--- linux-3.0-rc5/arch/mips/kernel/scall64-64.S 2011-07-01
11:13:39.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall64-64.S 2011-06-10
22:11:24.000000000 +0200
+@@ -362,7 +362,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
PTR sys_mq_getsetattr /* 5235 */
@@ -580,10 +519,10 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.38.6/arch/mips/kernel/scall64-n32.S
linux-2.6.38.6-vs2.3.0.37-rc15/arch/mips/kernel/scall64-n32.S
---- linux-2.6.38.6/arch/mips/kernel/scall64-n32.S 2010-10-21
13:06:54.000000000 +0200
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/mips/kernel/scall64-n32.S
2011-01-29 02:01:07.000000000 +0100
-@@ -362,7 +362,7 @@ EXPORT(sysn32_call_table)
+diff -NurpP --minimal linux-3.0-rc5/arch/mips/kernel/scall64-n32.S
linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall64-n32.S
+--- linux-3.0-rc5/arch/mips/kernel/scall64-n32.S 2011-07-01
11:13:39.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall64-n32.S 2011-06-10
22:11:24.000000000 +0200
+@@ -361,7 +361,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
PTR compat_sys_mq_getsetattr
@@ -592,10 +531,10 @@
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.38.6/arch/mips/kernel/scall64-o32.S
linux-2.6.38.6-vs2.3.0.37-rc15/arch/mips/kernel/scall64-o32.S
---- linux-2.6.38.6/arch/mips/kernel/scall64-o32.S 2010-10-21
13:06:54.000000000 +0200
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/mips/kernel/scall64-o32.S
2011-01-29 02:01:07.000000000 +0100
-@@ -481,7 +481,7 @@ sys_call_table:
+diff -NurpP --minimal linux-3.0-rc5/arch/mips/kernel/scall64-o32.S
linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall64-o32.S
+--- linux-3.0-rc5/arch/mips/kernel/scall64-o32.S 2011-07-01
11:13:39.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall64-o32.S 2011-06-10
22:11:24.000000000 +0200
+@@ -480,7 +480,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
PTR compat_sys_mq_getsetattr
@@ -604,9 +543,9 @@
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.38.6/arch/mips/kernel/traps.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/mips/kernel/traps.c
---- linux-2.6.38.6/arch/mips/kernel/traps.c 2011-03-15 18:06:42.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/mips/kernel/traps.c 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/mips/kernel/traps.c
linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/traps.c
+--- linux-3.0-rc5/arch/mips/kernel/traps.c 2011-05-22 16:17:00.000000000
+0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/traps.c 2011-06-10
22:11:24.000000000 +0200
@@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
@@ -621,10 +560,10 @@
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-2.6.38.6/arch/parisc/Kconfig
linux-2.6.38.6-vs2.3.0.37-rc15/arch/parisc/Kconfig
---- linux-2.6.38.6/arch/parisc/Kconfig 2011-03-15 18:06:43.000000000 +0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/parisc/Kconfig 2011-01-29
02:01:07.000000000 +0100
-@@ -283,6 +283,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.0-rc5/arch/parisc/Kconfig
linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/Kconfig
+--- linux-3.0-rc5/arch/parisc/Kconfig 2011-07-01 11:13:42.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/Kconfig 2011-06-10
22:11:24.000000000 +0200
+@@ -279,6 +279,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -633,9 +572,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38.6/arch/parisc/kernel/syscall_table.S
linux-2.6.38.6-vs2.3.0.37-rc15/arch/parisc/kernel/syscall_table.S
---- linux-2.6.38.6/arch/parisc/kernel/syscall_table.S 2011-01-05
21:49:09.000000000 +0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/parisc/kernel/syscall_table.S
2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/parisc/kernel/syscall_table.S
linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/kernel/syscall_table.S
+--- linux-3.0-rc5/arch/parisc/kernel/syscall_table.S 2011-07-01
11:13:43.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/kernel/syscall_table.S
2011-06-10 22:11:24.000000000 +0200
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -645,9 +584,9 @@
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.38.6/arch/parisc/kernel/traps.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/parisc/kernel/traps.c
---- linux-2.6.38.6/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000
+0200
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/parisc/kernel/traps.c 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/parisc/kernel/traps.c
linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/kernel/traps.c
+--- linux-3.0-rc5/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000
+0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/kernel/traps.c 2011-06-10
22:11:24.000000000 +0200
@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
@@ -671,9 +610,9 @@
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-2.6.38.6/arch/parisc/mm/fault.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/parisc/mm/fault.c
---- linux-2.6.38.6/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000
+0200
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/parisc/mm/fault.c 2011-01-29
02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/parisc/mm/fault.c
linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/mm/fault.c
+--- linux-3.0-rc5/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000
+0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/mm/fault.c 2011-06-10
22:11:24.000000000 +0200
@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -686,10 +625,10 @@
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.38.6/arch/powerpc/Kconfig
linux-2.6.38.6-vs2.3.0.37-rc15/arch/powerpc/Kconfig
---- linux-2.6.38.6/arch/powerpc/Kconfig 2011-03-15 18:06:43.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/powerpc/Kconfig 2011-01-29
02:01:07.000000000 +0100
-@@ -964,6 +964,8 @@ source "lib/Kconfig"
+diff -NurpP --minimal linux-3.0-rc5/arch/powerpc/Kconfig
linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/Kconfig
+--- linux-3.0-rc5/arch/powerpc/Kconfig 2011-07-01 11:13:43.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/Kconfig 2011-06-10
22:11:24.000000000 +0200
+@@ -978,6 +978,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -698,9 +637,9 @@
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.38.6/arch/powerpc/include/asm/unistd.h
linux-2.6.38.6-vs2.3.0.37-rc15/arch/powerpc/include/asm/unistd.h
---- linux-2.6.38.6/arch/powerpc/include/asm/unistd.h 2011-01-05
21:49:10.000000000 +0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/powerpc/include/asm/unistd.h
2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-3.0-rc5/arch/powerpc/include/asm/unistd.h
linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/include/asm/unistd.h
+--- linux-3.0-rc5/arch/powerpc/include/asm/unistd.h 2011-07-01
11:13:44.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/include/asm/unistd.h
2011-06-10 22:11:24.000000000 +0200
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -710,10 +649,10 @@
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-2.6.38.6/arch/powerpc/kernel/process.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/powerpc/kernel/process.c
---- linux-2.6.38.6/arch/powerpc/kernel/process.c 2011-03-15
18:06:44.000000000 +0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/powerpc/kernel/process.c
2011-03-10 17:21:19.000000000 +0100
-@@ -635,8 +635,9 @@ void show_regs(struct pt_regs * regs)
+diff -NurpP --minimal linux-3.0-rc5/arch/powerpc/kernel/process.c
linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/kernel/process.c
+--- linux-3.0-rc5/arch/powerpc/kernel/process.c 2011-07-01
11:13:44.000000000 +0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/kernel/process.c 2011-06-10
22:11:24.000000000 +0200
+@@ -656,8 +656,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
#endif
@@ -725,10 +664,10 @@
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-2.6.38.6/arch/powerpc/kernel/traps.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/powerpc/kernel/traps.c
---- linux-2.6.38.6/arch/powerpc/kernel/traps.c 2011-03-15 18:06:44.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/powerpc/kernel/traps.c 2011-01-29
02:01:07.000000000 +0100
-@@ -1043,8 +1043,9 @@ void nonrecoverable_exception(struct pt_
+diff -NurpP --minimal linux-3.0-rc5/arch/powerpc/kernel/traps.c
linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/kernel/traps.c
+--- linux-3.0-rc5/arch/powerpc/kernel/traps.c 2011-07-01 11:13:44.000000000
+0200
++++ linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/kernel/traps.c 2011-06-10
22:11:24.000000000 +0200
+@@ -1075,8 +1075,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
{
@@ -740,9 +679,9 @@
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-2.6.38.6/arch/powerpc/kernel/vdso.c
linux-2.6.38.6-vs2.3.0.37-rc15/arch/powerpc/kernel/vdso.c
---- linux-2.6.38.6/arch/powerpc/kernel/vdso.c 2011-01-05 21:49:11.000000000
+0100
-+++ linux-2.6.38.6-vs2.3.0.37-rc15/arch/powerpc/kernel/vdso.c 2011-01-29
02:01:07.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.65&r2=1.66&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-fixes.patch?r1=1.20&r2=1.21&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
