packages: kernel/kernel-vserver-2.3.patch, kernel/kernel.spec - new vserver...
arekm
arekm at pld-linux.org
Thu Sep 10 22:20:02 CEST 2009
Author: arekm Date: Thu Sep 10 20:20:02 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- new vserver patch
---- Files affected:
packages/kernel:
kernel-vserver-2.3.patch (1.16 -> 1.17) , kernel.spec (1.700 -> 1.701)
---- Diffs:
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.16 packages/kernel/kernel-vserver-2.3.patch:1.17
--- packages/kernel/kernel-vserver-2.3.patch:1.16 Sat Aug 22 19:26:06 2009
+++ packages/kernel/kernel-vserver-2.3.patch Thu Sep 10 22:19:56 2009
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.30.5/arch/alpha/Kconfig linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/alpha/Kconfig
---- linux-2.6.30.5/arch/alpha/Kconfig 2009-03-24 14:18:07.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/alpha/Kconfig 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/alpha/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/Kconfig
+--- linux-2.6.31/arch/alpha/Kconfig 2009-03-24 14:18:07.000000000 +0100
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/Kconfig 2009-09-10 16:11:43.000000000 +0200
@@ -666,6 +666,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.30.5/arch/alpha/kernel/entry.S linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/alpha/kernel/entry.S
---- linux-2.6.30.5/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/alpha/kernel/entry.S 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/alpha/kernel/entry.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/entry.S
+--- linux-2.6.31/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/entry.S 2009-09-10 16:11:43.000000000 +0200
@@ -874,24 +874,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -45,10 +45,10 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.30.5/arch/alpha/kernel/osf_sys.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/alpha/kernel/osf_sys.c
---- linux-2.6.30.5/arch/alpha/kernel/osf_sys.c 2009-06-11 17:11:46.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/alpha/kernel/osf_sys.c 2009-07-04 01:11:38.000000000 +0200
-@@ -875,7 +875,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
+diff -NurpP --minimal linux-2.6.31/arch/alpha/kernel/osf_sys.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.31/arch/alpha/kernel/osf_sys.c 2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/osf_sys.c 2009-09-10 16:11:43.000000000 +0200
+@@ -872,7 +872,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
{
if (tv) {
struct timeval ktv;
@@ -57,10 +57,10 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.30.5/arch/alpha/kernel/ptrace.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/alpha/kernel/ptrace.c
---- linux-2.6.30.5/arch/alpha/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/alpha/kernel/ptrace.c 2009-07-04 01:11:38.000000000 +0200
-@@ -15,6 +15,7 @@
+diff -NurpP --minimal linux-2.6.31/arch/alpha/kernel/ptrace.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/ptrace.c
+--- linux-2.6.31/arch/alpha/kernel/ptrace.c 2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/ptrace.c 2009-09-10 16:11:43.000000000 +0200
+@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/security.h>
#include <linux/signal.h>
@@ -68,9 +68,9 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.30.5/arch/alpha/kernel/systbls.S linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/alpha/kernel/systbls.S
---- linux-2.6.30.5/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/alpha/kernel/systbls.S 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/alpha/kernel/systbls.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/systbls.S
+--- linux-2.6.31/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/systbls.S 2009-09-10 16:11:43.000000000 +0200
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -80,9 +80,9 @@
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.30.5/arch/alpha/kernel/traps.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/alpha/kernel/traps.c
---- linux-2.6.30.5/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/alpha/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/alpha/kernel/traps.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/traps.c
+--- linux-2.6.31/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -93,9 +93,9 @@
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.30.5/arch/alpha/mm/fault.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/alpha/mm/fault.c
---- linux-2.6.30.5/arch/alpha/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/alpha/mm/fault.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/alpha/mm/fault.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/mm/fault.c
+--- linux-2.6.31/arch/alpha/mm/fault.c 2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/mm/fault.c 2009-09-10 16:11:43.000000000 +0200
@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
@@ -107,10 +107,10 @@
if (!user_mode(regs))
goto no_context;
do_group_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.30.5/arch/arm/Kconfig linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/arm/Kconfig
---- linux-2.6.30.5/arch/arm/Kconfig 2009-06-11 17:11:46.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/arm/Kconfig 2009-07-04 01:11:38.000000000 +0200
-@@ -1429,6 +1429,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.31/arch/arm/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/Kconfig
+--- linux-2.6.31/arch/arm/Kconfig 2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/Kconfig 2009-09-10 16:11:43.000000000 +0200
+@@ -1483,6 +1483,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -119,9 +119,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.30.5/arch/arm/kernel/calls.S linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/arm/kernel/calls.S
---- linux-2.6.30.5/arch/arm/kernel/calls.S 2009-06-11 17:11:48.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/arm/kernel/calls.S 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/arm/kernel/calls.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/kernel/calls.S
+--- linux-2.6.31/arch/arm/kernel/calls.S 2009-09-10 15:25:15.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/kernel/calls.S 2009-09-10 16:11:43.000000000 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -131,10 +131,10 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.30.5/arch/arm/kernel/process.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/arm/kernel/process.c
---- linux-2.6.30.5/arch/arm/kernel/process.c 2009-06-11 17:11:49.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/arm/kernel/process.c 2009-07-04 01:11:38.000000000 +0200
-@@ -263,7 +263,8 @@ void __show_regs(struct pt_regs *regs)
+diff -NurpP --minimal linux-2.6.31/arch/arm/kernel/process.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/kernel/process.c
+--- linux-2.6.31/arch/arm/kernel/process.c 2009-09-10 15:25:15.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/kernel/process.c 2009-09-10 16:11:43.000000000 +0200
+@@ -269,7 +269,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
printk("\n");
@@ -144,9 +144,9 @@
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.30.5/arch/arm/kernel/traps.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/arm/kernel/traps.c
---- linux-2.6.30.5/arch/arm/kernel/traps.c 2009-06-11 17:11:49.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/arm/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/arm/kernel/traps.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/kernel/traps.c
+--- linux-2.6.31/arch/arm/kernel/traps.c 2009-06-11 17:11:49.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
@@ -228,8 +228,8 @@ static void __die(const char *str, int e
str, err, ++die_counter);
print_modules();
@@ -158,9 +158,9 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.30.5/arch/arm/mm/fault.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/arm/mm/fault.c
---- linux-2.6.30.5/arch/arm/mm/fault.c 2009-03-24 14:18:17.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/arm/mm/fault.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/arm/mm/fault.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/mm/fault.c
+--- linux-2.6.31/arch/arm/mm/fault.c 2009-09-10 15:25:18.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/mm/fault.c 2009-09-10 16:11:43.000000000 +0200
@@ -294,7 +294,8 @@ do_page_fault(unsigned long addr, unsign
* happened to us that made us unable to handle
* the page fault gracefully.
@@ -171,9 +171,9 @@
do_group_exit(SIGKILL);
return 0;
}
-diff -NurpP --minimal linux-2.6.30.5/arch/cris/Kconfig linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/cris/Kconfig
---- linux-2.6.30.5/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/cris/Kconfig 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/cris/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/cris/Kconfig
+--- linux-2.6.31/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/cris/Kconfig 2009-09-10 16:11:43.000000000 +0200
@@ -685,6 +685,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -183,9 +183,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.30.5/arch/frv/kernel/kernel_thread.S linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/frv/kernel/kernel_thread.S
---- linux-2.6.30.5/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/frv/kernel/kernel_thread.S 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/frv/kernel/kernel_thread.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.31/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/frv/kernel/kernel_thread.S 2009-09-10 16:11:43.000000000 +0200
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
@@ -195,9 +195,9 @@
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-2.6.30.5/arch/h8300/Kconfig linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/h8300/Kconfig
---- linux-2.6.30.5/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/h8300/Kconfig 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/h8300/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/h8300/Kconfig
+--- linux-2.6.31/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/h8300/Kconfig 2009-09-10 16:11:43.000000000 +0200
@@ -226,6 +226,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -207,9 +207,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.30.5/arch/ia64/ia32/ia32_entry.S linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.30.5/arch/ia64/ia32/ia32_entry.S 2009-06-11 17:11:57.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/ia32/ia32_entry.S 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/ia64/ia32/ia32_entry.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.31/arch/ia64/ia32/ia32_entry.S 2009-06-11 17:11:57.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/ia32/ia32_entry.S 2009-09-10 16:11:43.000000000 +0200
@@ -451,7 +451,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -219,10 +219,10 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.30.5/arch/ia64/Kconfig linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/Kconfig
---- linux-2.6.30.5/arch/ia64/Kconfig 2009-06-11 17:11:57.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/Kconfig 2009-07-04 01:11:38.000000000 +0200
-@@ -675,6 +675,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.31/arch/ia64/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/Kconfig
+--- linux-2.6.31/arch/ia64/Kconfig 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/Kconfig 2009-09-10 16:11:43.000000000 +0200
+@@ -676,6 +676,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -231,9 +231,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.30.5/arch/ia64/kernel/entry.S linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/kernel/entry.S
---- linux-2.6.30.5/arch/ia64/kernel/entry.S 2009-06-11 17:11:57.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/kernel/entry.S 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/ia64/kernel/entry.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/entry.S
+--- linux-2.6.31/arch/ia64/kernel/entry.S 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/entry.S 2009-09-10 16:11:43.000000000 +0200
@@ -1753,7 +1753,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -243,9 +243,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.30.5/arch/ia64/kernel/perfmon.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/kernel/perfmon.c
---- linux-2.6.30.5/arch/ia64/kernel/perfmon.c 2009-06-11 17:11:57.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/kernel/perfmon.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/ia64/kernel/perfmon.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/perfmon.c
+--- linux-2.6.31/arch/ia64/kernel/perfmon.c 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/perfmon.c 2009-09-10 16:11:43.000000000 +0200
@@ -41,6 +41,7 @@
#include <linux/rcupdate.h>
#include <linux/completion.h>
@@ -263,9 +263,9 @@
vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
vma_pages(vma));
up_write(&task->mm->mmap_sem);
-diff -NurpP --minimal linux-2.6.30.5/arch/ia64/kernel/process.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/kernel/process.c
---- linux-2.6.30.5/arch/ia64/kernel/process.c 2009-06-11 17:11:57.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/kernel/process.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/ia64/kernel/process.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/process.c
+--- linux-2.6.31/arch/ia64/kernel/process.c 2009-06-11 17:11:57.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/process.c 2009-09-10 16:11:43.000000000 +0200
@@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -277,10 +277,10 @@
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.30.5/arch/ia64/kernel/ptrace.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/kernel/ptrace.c
---- linux-2.6.30.5/arch/ia64/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/kernel/ptrace.c 2009-07-04 01:11:38.000000000 +0200
-@@ -23,6 +23,7 @@
+diff -NurpP --minimal linux-2.6.31/arch/ia64/kernel/ptrace.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/ptrace.c
+--- linux-2.6.31/arch/ia64/kernel/ptrace.c 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/ptrace.c 2009-09-10 16:11:43.000000000 +0200
+@@ -22,6 +22,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
#include <linux/tracehook.h>
@@ -288,9 +288,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.30.5/arch/ia64/kernel/traps.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/kernel/traps.c
---- linux-2.6.30.5/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/ia64/kernel/traps.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/traps.c
+--- linux-2.6.31/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -315,9 +315,9 @@
}
}
}
-diff -NurpP --minimal linux-2.6.30.5/arch/ia64/mm/fault.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/mm/fault.c
---- linux-2.6.30.5/arch/ia64/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/ia64/mm/fault.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/ia64/mm/fault.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/mm/fault.c
+--- linux-2.6.31/arch/ia64/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/mm/fault.c 2009-09-10 16:11:43.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
@@ -326,9 +326,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.30.5/arch/m32r/kernel/traps.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/m32r/kernel/traps.c
---- linux-2.6.30.5/arch/m32r/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/m32r/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/m32r/kernel/traps.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/m32r/kernel/traps.c
+--- linux-2.6.31/arch/m32r/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/m32r/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -341,9 +341,9 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.30.5/arch/m68k/Kconfig linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/m68k/Kconfig
---- linux-2.6.30.5/arch/m68k/Kconfig 2009-03-24 14:18:26.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/m68k/Kconfig 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/m68k/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/m68k/Kconfig
+--- linux-2.6.31/arch/m68k/Kconfig 2009-03-24 14:18:26.000000000 +0100
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/m68k/Kconfig 2009-09-10 16:11:43.000000000 +0200
@@ -616,6 +616,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -353,9 +353,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.30.5/arch/m68k/kernel/ptrace.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/m68k/kernel/ptrace.c
---- linux-2.6.30.5/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/m68k/kernel/ptrace.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/m68k/kernel/ptrace.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/m68k/kernel/ptrace.c
+--- linux-2.6.31/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/m68k/kernel/ptrace.c 2009-09-10 16:11:43.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
@@ -373,9 +373,9 @@
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.30.5/arch/m68k/kernel/traps.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/m68k/kernel/traps.c
---- linux-2.6.30.5/arch/m68k/kernel/traps.c 2009-03-24 14:18:26.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/m68k/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/m68k/kernel/traps.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/m68k/kernel/traps.c
+--- linux-2.6.31/arch/m68k/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/m68k/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
@@ -906,8 +906,8 @@ void show_registers(struct pt_regs *regs
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
regs->d4, regs->d5, regs->a0, regs->a1);
@@ -387,9 +387,9 @@
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
-diff -NurpP --minimal linux-2.6.30.5/arch/m68knommu/Kconfig linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/m68knommu/Kconfig
---- linux-2.6.30.5/arch/m68knommu/Kconfig 2009-06-11 17:11:59.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/m68knommu/Kconfig 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/m68knommu/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/m68knommu/Kconfig
+--- linux-2.6.31/arch/m68knommu/Kconfig 2009-06-11 17:11:59.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/m68knommu/Kconfig 2009-09-10 16:11:43.000000000 +0200
@@ -721,6 +721,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -399,9 +399,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.30.5/arch/m68knommu/kernel/traps.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/m68knommu/kernel/traps.c
---- linux-2.6.30.5/arch/m68knommu/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/m68knommu/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/m68knommu/kernel/traps.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/m68knommu/kernel/traps.c
+--- linux-2.6.31/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/m68knommu/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
@@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_
printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
fp->d4, fp->d5, fp->a0, fp->a1);
@@ -414,10 +414,10 @@
show_stack(NULL, (unsigned long *)(fp + 1));
add_taint(TAINT_DIE);
do_exit(SIGSEGV);
-diff -NurpP --minimal linux-2.6.30.5/arch/mips/Kconfig linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/mips/Kconfig
---- linux-2.6.30.5/arch/mips/Kconfig 2009-06-11 17:12:00.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/mips/Kconfig 2009-07-04 01:11:38.000000000 +0200
-@@ -2137,6 +2137,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.31/arch/mips/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/mips/Kconfig
+--- linux-2.6.31/arch/mips/Kconfig 2009-09-10 15:25:24.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/mips/Kconfig 2009-09-10 16:11:43.000000000 +0200
+@@ -2186,6 +2186,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -426,9 +426,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.30.5/arch/mips/kernel/ptrace.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/mips/kernel/ptrace.c
---- linux-2.6.30.5/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/mips/kernel/ptrace.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/mips/kernel/ptrace.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/mips/kernel/ptrace.c
+--- linux-2.6.31/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/mips/kernel/ptrace.c 2009-09-10 16:11:43.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -447,9 +447,9 @@
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-2.6.30.5/arch/mips/kernel/scall32-o32.S linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/mips/kernel/scall32-o32.S
---- linux-2.6.30.5/arch/mips/kernel/scall32-o32.S 2009-06-11 17:12:01.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/mips/kernel/scall32-o32.S 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/mips/kernel/scall32-o32.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.31/arch/mips/kernel/scall32-o32.S 2009-09-10 15:25:38.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/mips/kernel/scall32-o32.S 2009-09-10 16:11:43.000000000 +0200
@@ -597,7 +597,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -459,9 +459,9 @@
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-2.6.30.5/arch/mips/kernel/scall64-64.S linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/mips/kernel/scall64-64.S
---- linux-2.6.30.5/arch/mips/kernel/scall64-64.S 2009-06-11 17:12:01.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/mips/kernel/scall64-64.S 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/mips/kernel/scall64-64.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/mips/kernel/scall64-64.S
+--- linux-2.6.31/arch/mips/kernel/scall64-64.S 2009-09-10 15:25:38.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/mips/kernel/scall64-64.S 2009-09-10 16:11:43.000000000 +0200
@@ -434,7 +434,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -471,9 +471,9 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.30.5/arch/mips/kernel/scall64-n32.S linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/mips/kernel/scall64-n32.S
---- linux-2.6.30.5/arch/mips/kernel/scall64-n32.S 2009-06-11 17:12:01.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/mips/kernel/scall64-n32.S 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/mips/kernel/scall64-n32.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.31/arch/mips/kernel/scall64-n32.S 2009-09-10 15:25:38.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/mips/kernel/scall64-n32.S 2009-09-10 16:11:43.000000000 +0200
@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -483,9 +483,9 @@
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.30.5/arch/mips/kernel/scall64-o32.S linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/mips/kernel/scall64-o32.S
---- linux-2.6.30.5/arch/mips/kernel/scall64-o32.S 2009-06-11 17:12:01.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/mips/kernel/scall64-o32.S 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/mips/kernel/scall64-o32.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.31/arch/mips/kernel/scall64-o32.S 2009-09-10 15:25:38.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/mips/kernel/scall64-o32.S 2009-09-10 16:11:43.000000000 +0200
@@ -480,7 +480,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -495,9 +495,9 @@
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.30.5/arch/mips/kernel/traps.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/mips/kernel/traps.c
---- linux-2.6.30.5/arch/mips/kernel/traps.c 2009-06-11 17:12:01.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/mips/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/mips/kernel/traps.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/mips/kernel/traps.c
+--- linux-2.6.31/arch/mips/kernel/traps.c 2009-09-10 15:25:38.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/mips/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
@@ -335,9 +335,10 @@ void show_registers(const struct pt_regs
__show_regs(regs);
@@ -512,10 +512,10 @@
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-2.6.30.5/arch/parisc/Kconfig linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/parisc/Kconfig
---- linux-2.6.30.5/arch/parisc/Kconfig 2009-06-11 17:12:02.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/parisc/Kconfig 2009-07-04 01:11:38.000000000 +0200
-@@ -291,6 +291,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.31/arch/parisc/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/parisc/Kconfig
+--- linux-2.6.31/arch/parisc/Kconfig 2009-09-10 15:25:39.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/parisc/Kconfig 2009-09-10 16:11:43.000000000 +0200
+@@ -293,6 +293,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -524,9 +524,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.30.5/arch/parisc/kernel/syscall_table.S linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/parisc/kernel/syscall_table.S
---- linux-2.6.30.5/arch/parisc/kernel/syscall_table.S 2009-06-11 17:12:03.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/parisc/kernel/syscall_table.S 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/parisc/kernel/syscall_table.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/parisc/kernel/syscall_table.S
+--- linux-2.6.31/arch/parisc/kernel/syscall_table.S 2009-09-10 15:25:40.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/parisc/kernel/syscall_table.S 2009-09-10 16:11:43.000000000 +0200
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -536,9 +536,9 @@
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.30.5/arch/parisc/kernel/traps.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/parisc/kernel/traps.c
---- linux-2.6.30.5/arch/parisc/kernel/traps.c 2009-06-11 17:12:03.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/parisc/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/parisc/kernel/traps.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/parisc/kernel/traps.c
+--- linux-2.6.31/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/parisc/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
@@ -551,7 +551,7 @@
#ifdef PRINT_USER_FAULTS
/* XXX for debugging only */
show_regs(regs);
-@@ -271,8 +272,8 @@ KERN_CRIT " || |
+@@ -270,8 +271,8 @@ void die_if_kernel(char *str, struct pt_
pdc_console_restart();
if (err)
@@ -562,10 +562,10 @@
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-2.6.30.5/arch/parisc/mm/fault.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/parisc/mm/fault.c
---- linux-2.6.30.5/arch/parisc/mm/fault.c 2009-03-24 14:18:33.000000000 +0100
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/parisc/mm/fault.c 2009-07-04 01:11:38.000000000 +0200
-@@ -238,8 +238,9 @@ bad_area:
+diff -NurpP --minimal linux-2.6.31/arch/parisc/mm/fault.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/parisc/mm/fault.c
+--- linux-2.6.31/arch/parisc/mm/fault.c 2009-09-10 15:25:40.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/parisc/mm/fault.c 2009-09-10 16:11:43.000000000 +0200
+@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
printk(KERN_DEBUG "\n");
@@ -577,7 +577,7 @@
if (vma) {
printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
vma->vm_start, vma->vm_end);
-@@ -265,7 +266,8 @@ no_context:
+@@ -264,7 +265,8 @@ no_context:
out_of_memory:
up_read(&mm->mmap_sem);
@@ -587,10 +587,10 @@
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.30.5/arch/powerpc/Kconfig linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/powerpc/Kconfig
---- linux-2.6.30.5/arch/powerpc/Kconfig 2009-06-11 17:12:03.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/powerpc/Kconfig 2009-07-04 01:11:38.000000000 +0200
-@@ -922,6 +922,8 @@ source "lib/Kconfig"
+diff -NurpP --minimal linux-2.6.31/arch/powerpc/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/powerpc/Kconfig
+--- linux-2.6.31/arch/powerpc/Kconfig 2009-09-10 15:25:40.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/powerpc/Kconfig 2009-09-10 16:11:43.000000000 +0200
+@@ -933,6 +933,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -599,20 +599,20 @@
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.30.5/arch/powerpc/kernel/irq.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/powerpc/kernel/irq.c
---- linux-2.6.30.5/arch/powerpc/kernel/irq.c 2009-06-11 17:12:14.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/powerpc/kernel/irq.c 2009-07-04 01:11:38.000000000 +0200
-@@ -53,6 +53,7 @@
- #include <linux/bootmem.h>
+diff -NurpP --minimal linux-2.6.31/arch/powerpc/kernel/irq.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/powerpc/kernel/irq.c
+--- linux-2.6.31/arch/powerpc/kernel/irq.c 2009-09-10 15:25:41.000000000 +0200
++++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/powerpc/kernel/irq.c 2009-09-10 16:15:56.000000000 +0200
+@@ -54,6 +54,7 @@
#include <linux/pci.h>
#include <linux/debugfs.h>
+ #include <linux/perf_counter.h>
+#include <linux/vs_context.h>
#include <asm/uaccess.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.30.5/arch/powerpc/kernel/process.c linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/powerpc/kernel/process.c
---- linux-2.6.30.5/arch/powerpc/kernel/process.c 2009-06-11 17:12:14.000000000 +0200
-+++ linux-2.6.30.5-vs2.3.0.36.14-pre7/arch/powerpc/kernel/process.c 2009-07-04 01:11:38.000000000 +0200
+diff -NurpP --minimal linux-2.6.31/arch/powerpc/kernel/process.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/powerpc/kernel/process.c
<<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.16&r2=1.17&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.700&r2=1.701&f=u
More information about the pld-cvs-commit
mailing list