packages (LINUX_2_6_28): kernel/kernel.spec, kernel/linux-2.6-vs2.3.patch -...
arekm
arekm at pld-linux.org
Tue Jul 28 12:18:12 CEST 2009
Author: arekm Date: Tue Jul 28 10:18:12 2009 GMT
Module: packages Tag: LINUX_2_6_28
---- Log message:
- update vserver patch; fixes 'pivot_root invalid argument' issue
---- Files affected:
packages/kernel:
kernel.spec (1.441.2.2083.2.9 -> 1.441.2.2083.2.10) , linux-2.6-vs2.3.patch (1.2.4.11.2.55.4.3 -> 1.2.4.11.2.55.4.4)
---- Diffs:
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.441.2.2083.2.9 packages/kernel/kernel.spec:1.441.2.2083.2.10
--- packages/kernel/kernel.spec:1.441.2.2083.2.9 Wed Jul 22 01:38:44 2009
+++ packages/kernel/kernel.spec Tue Jul 28 12:17:57 2009
@@ -282,7 +282,7 @@
# Taken from http://download.opensuse.org/factory/repo/src-oss/suse/src/kernel-source-2.6.27.7-3.1.src.rpm
Patch90: kernel-mpt-fusion.patch
-# based on http://vserver.13thfloor.at/Experimental/patch-2.6.28.9-vs2.3.0.36.10.diff
+# based on http://vserver.13thfloor.at/Experimental/patch-2.6.28.10-vs2.3.0.36.11.diff
Patch100: linux-2.6-vs2.3.patch
Patch101: kernel-vserver-fixes.patch
@@ -1698,6 +1698,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.2083.2.10 2009/07/28 10:17:57 arekm
+- update vserver patch; fixes 'pivot_root invalid argument' issue
+
Revision 1.441.2.2083.2.9 2009/07/21 23:38:44 arekm
- rel 3
================================================================
Index: packages/kernel/linux-2.6-vs2.3.patch
diff -u packages/kernel/linux-2.6-vs2.3.patch:1.2.4.11.2.55.4.3 packages/kernel/linux-2.6-vs2.3.patch:1.2.4.11.2.55.4.4
--- packages/kernel/linux-2.6-vs2.3.patch:1.2.4.11.2.55.4.3 Mon Apr 6 19:08:06 2009
+++ packages/kernel/linux-2.6-vs2.3.patch Tue Jul 28 12:17:59 2009
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.28.9/arch/alpha/Kconfig linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/Kconfig
---- linux-2.6.28.9/arch/alpha/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/Kconfig 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/alpha/Kconfig linux-2.6.28.10-vs2.3.0.36.11/arch/alpha/Kconfig
+--- linux-2.6.28.10/arch/alpha/Kconfig 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/alpha/Kconfig 2009-02-22 22:54:24.000000000 +0100
@@ -665,6 +665,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.28.9/arch/alpha/kernel/entry.S linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/entry.S
---- linux-2.6.28.9/arch/alpha/kernel/entry.S 2009-03-31 16:25:09.000000000 +0200
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/entry.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/alpha/kernel/entry.S linux-2.6.28.10-vs2.3.0.36.11/arch/alpha/kernel/entry.S
+--- linux-2.6.28.10/arch/alpha/kernel/entry.S 2009-05-05 10:42:44.000000000 +0200
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/alpha/kernel/entry.S 2009-02-22 22:54:24.000000000 +0100
@@ -872,24 +872,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -45,9 +45,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.28.9/arch/alpha/kernel/osf_sys.c linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/osf_sys.c
---- linux-2.6.28.9/arch/alpha/kernel/osf_sys.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/osf_sys.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/alpha/kernel/osf_sys.c linux-2.6.28.10-vs2.3.0.36.11/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.28.10/arch/alpha/kernel/osf_sys.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/alpha/kernel/osf_sys.c 2009-02-22 22:54:24.000000000 +0100
@@ -885,7 +885,7 @@ osf_gettimeofday(struct timeval32 __user
{
if (tv) {
@@ -57,9 +57,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.28.9/arch/alpha/kernel/ptrace.c linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/ptrace.c
---- linux-2.6.28.9/arch/alpha/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/alpha/kernel/ptrace.c linux-2.6.28.10-vs2.3.0.36.11/arch/alpha/kernel/ptrace.c
+--- linux-2.6.28.10/arch/alpha/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/alpha/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -68,9 +68,9 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.28.9/arch/alpha/kernel/systbls.S linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/systbls.S
---- linux-2.6.28.9/arch/alpha/kernel/systbls.S 2009-03-31 16:25:09.000000000 +0200
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/systbls.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/alpha/kernel/systbls.S linux-2.6.28.10-vs2.3.0.36.11/arch/alpha/kernel/systbls.S
+--- linux-2.6.28.10/arch/alpha/kernel/systbls.S 2009-05-05 10:42:44.000000000 +0200
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/alpha/kernel/systbls.S 2009-02-22 22:54:24.000000000 +0100
@@ -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.28.9/arch/alpha/kernel/traps.c linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/traps.c
---- linux-2.6.28.9/arch/alpha/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/alpha/kernel/traps.c linux-2.6.28.10-vs2.3.0.36.11/arch/alpha/kernel/traps.c
+--- linux-2.6.28.10/arch/alpha/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/alpha/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
@@ -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.28.9/arch/alpha/mm/fault.c linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/mm/fault.c
---- linux-2.6.28.9/arch/alpha/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/alpha/mm/fault.c linux-2.6.28.10-vs2.3.0.36.11/arch/alpha/mm/fault.c
+--- linux-2.6.28.10/arch/alpha/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/alpha/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
@@ -107,9 +107,9 @@
if (!user_mode(regs))
goto no_context;
do_group_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.28.9/arch/arm/Kconfig linux-2.6.28.9-vs2.3.0.36.10/arch/arm/Kconfig
---- linux-2.6.28.9/arch/arm/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/arm/Kconfig 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/arm/Kconfig linux-2.6.28.10-vs2.3.0.36.11/arch/arm/Kconfig
+--- linux-2.6.28.10/arch/arm/Kconfig 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/arm/Kconfig 2009-02-22 22:54:24.000000000 +0100
@@ -1282,6 +1282,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.28.9/arch/arm/kernel/calls.S linux-2.6.28.9-vs2.3.0.36.10/arch/arm/kernel/calls.S
---- linux-2.6.28.9/arch/arm/kernel/calls.S 2009-03-31 16:25:09.000000000 +0200
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/arm/kernel/calls.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/arm/kernel/calls.S linux-2.6.28.10-vs2.3.0.36.11/arch/arm/kernel/calls.S
+--- linux-2.6.28.10/arch/arm/kernel/calls.S 2009-05-05 10:42:44.000000000 +0200
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/arm/kernel/calls.S 2009-02-22 22:54:24.000000000 +0100
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -131,9 +131,9 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.28.9/arch/arm/kernel/process.c linux-2.6.28.9-vs2.3.0.36.10/arch/arm/kernel/process.c
---- linux-2.6.28.9/arch/arm/kernel/process.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/arm/kernel/process.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/arm/kernel/process.c linux-2.6.28.10-vs2.3.0.36.11/arch/arm/kernel/process.c
+--- linux-2.6.28.10/arch/arm/kernel/process.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/arm/kernel/process.c 2009-02-22 22:54:24.000000000 +0100
@@ -262,7 +262,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -144,9 +144,9 @@
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.28.9/arch/arm/kernel/traps.c linux-2.6.28.9-vs2.3.0.36.10/arch/arm/kernel/traps.c
---- linux-2.6.28.9/arch/arm/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/arm/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/arm/kernel/traps.c linux-2.6.28.10-vs2.3.0.36.11/arch/arm/kernel/traps.c
+--- linux-2.6.28.10/arch/arm/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/arm/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
@@ -214,8 +214,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.28.9/arch/arm/mm/fault.c linux-2.6.28.9-vs2.3.0.36.10/arch/arm/mm/fault.c
---- linux-2.6.28.9/arch/arm/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/arm/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/arm/mm/fault.c linux-2.6.28.10-vs2.3.0.36.11/arch/arm/mm/fault.c
+--- linux-2.6.28.10/arch/arm/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/arm/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
@@ -292,7 +292,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.28.9/arch/cris/Kconfig linux-2.6.28.9-vs2.3.0.36.10/arch/cris/Kconfig
---- linux-2.6.28.9/arch/cris/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/cris/Kconfig 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/cris/Kconfig linux-2.6.28.10-vs2.3.0.36.11/arch/cris/Kconfig
+--- linux-2.6.28.10/arch/cris/Kconfig 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/cris/Kconfig 2009-02-22 22:54:24.000000000 +0100
@@ -683,6 +683,8 @@ source "drivers/uwb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -183,9 +183,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.28.9/arch/frv/kernel/kernel_thread.S linux-2.6.28.9-vs2.3.0.36.10/arch/frv/kernel/kernel_thread.S
---- linux-2.6.28.9/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/frv/kernel/kernel_thread.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/frv/kernel/kernel_thread.S linux-2.6.28.10-vs2.3.0.36.11/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.28.10/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/frv/kernel/kernel_thread.S 2009-02-22 22:54:24.000000000 +0100
@@ -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.28.9/arch/h8300/Kconfig linux-2.6.28.9-vs2.3.0.36.10/arch/h8300/Kconfig
---- linux-2.6.28.9/arch/h8300/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/h8300/Kconfig 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/h8300/Kconfig linux-2.6.28.10-vs2.3.0.36.11/arch/h8300/Kconfig
+--- linux-2.6.28.10/arch/h8300/Kconfig 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/h8300/Kconfig 2009-02-22 22:54:24.000000000 +0100
@@ -224,6 +224,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.28.9/arch/ia64/ia32/ia32_entry.S linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.28.9/arch/ia64/ia32/ia32_entry.S 2009-03-31 16:25:10.000000000 +0200
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/ia32/ia32_entry.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/ia64/ia32/ia32_entry.S linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.28.10/arch/ia64/ia32/ia32_entry.S 2009-05-05 10:42:44.000000000 +0200
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/ia32/ia32_entry.S 2009-02-22 22:54:24.000000000 +0100
@@ -451,7 +451,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -219,9 +219,9 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.28.9/arch/ia64/Kconfig linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/Kconfig
---- linux-2.6.28.9/arch/ia64/Kconfig 2009-03-31 16:25:10.000000000 +0200
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/Kconfig 2009-03-31 16:26:47.000000000 +0200
+diff -NurpP --minimal linux-2.6.28.10/arch/ia64/Kconfig linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/Kconfig
+--- linux-2.6.28.10/arch/ia64/Kconfig 2009-05-05 10:42:44.000000000 +0200
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/Kconfig 2009-03-31 16:26:47.000000000 +0200
@@ -657,6 +657,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.28.9/arch/ia64/kernel/entry.S linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/kernel/entry.S
---- linux-2.6.28.9/arch/ia64/kernel/entry.S 2009-03-31 16:25:10.000000000 +0200
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/kernel/entry.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/ia64/kernel/entry.S linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/kernel/entry.S
+--- linux-2.6.28.10/arch/ia64/kernel/entry.S 2009-05-05 10:42:44.000000000 +0200
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/kernel/entry.S 2009-02-22 22:54:24.000000000 +0100
@@ -1653,7 +1653,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.28.9/arch/ia64/kernel/perfmon.c linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/kernel/perfmon.c
---- linux-2.6.28.9/arch/ia64/kernel/perfmon.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/kernel/perfmon.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/ia64/kernel/perfmon.c linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/kernel/perfmon.c
+--- linux-2.6.28.10/arch/ia64/kernel/perfmon.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/kernel/perfmon.c 2009-02-22 22:54:24.000000000 +0100
@@ -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.28.9/arch/ia64/kernel/process.c linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/kernel/process.c
---- linux-2.6.28.9/arch/ia64/kernel/process.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/kernel/process.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/ia64/kernel/process.c linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/kernel/process.c
+--- linux-2.6.28.10/arch/ia64/kernel/process.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/kernel/process.c 2009-02-22 22:54:24.000000000 +0100
@@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -277,9 +277,9 @@
printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
init_utsname()->release);
-diff -NurpP --minimal linux-2.6.28.9/arch/ia64/kernel/ptrace.c linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/kernel/ptrace.c
---- linux-2.6.28.9/arch/ia64/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/ia64/kernel/ptrace.c linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/kernel/ptrace.c
+--- linux-2.6.28.10/arch/ia64/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
@@ -23,6 +23,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -288,9 +288,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.28.9/arch/ia64/kernel/traps.c linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/kernel/traps.c
---- linux-2.6.28.9/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/ia64/kernel/traps.c linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/kernel/traps.c
+--- linux-2.6.28.10/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -315,9 +315,9 @@
}
}
}
-diff -NurpP --minimal linux-2.6.28.9/arch/ia64/mm/fault.c linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/mm/fault.c
---- linux-2.6.28.9/arch/ia64/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/ia64/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/ia64/mm/fault.c linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/mm/fault.c
+--- linux-2.6.28.10/arch/ia64/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/ia64/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
@@ -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.28.9/arch/m32r/kernel/traps.c linux-2.6.28.9-vs2.3.0.36.10/arch/m32r/kernel/traps.c
---- linux-2.6.28.9/arch/m32r/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/m32r/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/m32r/kernel/traps.c linux-2.6.28.10-vs2.3.0.36.11/arch/m32r/kernel/traps.c
+--- linux-2.6.28.10/arch/m32r/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/m32r/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
@@ -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.28.9/arch/m68k/Kconfig linux-2.6.28.9-vs2.3.0.36.10/arch/m68k/Kconfig
---- linux-2.6.28.9/arch/m68k/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/m68k/Kconfig 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/m68k/Kconfig linux-2.6.28.10-vs2.3.0.36.11/arch/m68k/Kconfig
+--- linux-2.6.28.10/arch/m68k/Kconfig 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/m68k/Kconfig 2009-02-22 22:54:24.000000000 +0100
@@ -617,6 +617,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.28.9/arch/m68k/kernel/ptrace.c linux-2.6.28.9-vs2.3.0.36.10/arch/m68k/kernel/ptrace.c
---- linux-2.6.28.9/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/m68k/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/m68k/kernel/ptrace.c linux-2.6.28.10-vs2.3.0.36.11/arch/m68k/kernel/ptrace.c
+--- linux-2.6.28.10/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/m68k/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
@@ -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.28.9/arch/m68k/kernel/traps.c linux-2.6.28.9-vs2.3.0.36.10/arch/m68k/kernel/traps.c
---- linux-2.6.28.9/arch/m68k/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/m68k/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/m68k/kernel/traps.c linux-2.6.28.10-vs2.3.0.36.11/arch/m68k/kernel/traps.c
+--- linux-2.6.28.10/arch/m68k/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/m68k/kernel/traps.c 2009-02-22 22:54:24.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);
@@ -387,9 +387,9 @@
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
-diff -NurpP --minimal linux-2.6.28.9/arch/m68knommu/Kconfig linux-2.6.28.9-vs2.3.0.36.10/arch/m68knommu/Kconfig
---- linux-2.6.28.9/arch/m68knommu/Kconfig 2009-03-31 16:25:10.000000000 +0200
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/m68knommu/Kconfig 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/m68knommu/Kconfig linux-2.6.28.10-vs2.3.0.36.11/arch/m68knommu/Kconfig
+--- linux-2.6.28.10/arch/m68knommu/Kconfig 2009-05-05 10:42:45.000000000 +0200
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/m68knommu/Kconfig 2009-02-22 22:54:24.000000000 +0100
@@ -743,6 +743,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.28.9/arch/m68knommu/kernel/traps.c linux-2.6.28.9-vs2.3.0.36.10/arch/m68knommu/kernel/traps.c
---- linux-2.6.28.9/arch/m68knommu/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/m68knommu/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/m68knommu/kernel/traps.c linux-2.6.28.10-vs2.3.0.36.11/arch/m68knommu/kernel/traps.c
+--- linux-2.6.28.10/arch/m68knommu/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/m68knommu/kernel/traps.c 2009-02-22 22:54:24.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);
@@ -414,9 +414,9 @@
show_stack(NULL, (unsigned long *)(fp + 1));
add_taint(TAINT_DIE);
do_exit(SIGSEGV);
-diff -NurpP --minimal linux-2.6.28.9/arch/mips/Kconfig linux-2.6.28.9-vs2.3.0.36.10/arch/mips/Kconfig
---- linux-2.6.28.9/arch/mips/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/mips/Kconfig 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/mips/Kconfig linux-2.6.28.10-vs2.3.0.36.11/arch/mips/Kconfig
+--- linux-2.6.28.10/arch/mips/Kconfig 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/mips/Kconfig 2009-02-22 22:54:24.000000000 +0100
@@ -2063,6 +2063,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.28.9/arch/mips/kernel/ptrace.c linux-2.6.28.9-vs2.3.0.36.10/arch/mips/kernel/ptrace.c
---- linux-2.6.28.9/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/mips/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/mips/kernel/ptrace.c linux-2.6.28.10-vs2.3.0.36.11/arch/mips/kernel/ptrace.c
+--- linux-2.6.28.10/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/mips/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
@@ -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.28.9/arch/mips/kernel/scall32-o32.S linux-2.6.28.9-vs2.3.0.36.10/arch/mips/kernel/scall32-o32.S
---- linux-2.6.28.9/arch/mips/kernel/scall32-o32.S 2009-03-31 16:25:10.000000000 +0200
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/mips/kernel/scall32-o32.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/mips/kernel/scall32-o32.S linux-2.6.28.10-vs2.3.0.36.11/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.28.10/arch/mips/kernel/scall32-o32.S 2009-05-05 10:42:45.000000000 +0200
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/mips/kernel/scall32-o32.S 2009-02-22 22:54:24.000000000 +0100
@@ -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.28.9/arch/mips/kernel/scall64-64.S linux-2.6.28.9-vs2.3.0.36.10/arch/mips/kernel/scall64-64.S
---- linux-2.6.28.9/arch/mips/kernel/scall64-64.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/mips/kernel/scall64-64.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/mips/kernel/scall64-64.S linux-2.6.28.10-vs2.3.0.36.11/arch/mips/kernel/scall64-64.S
+--- linux-2.6.28.10/arch/mips/kernel/scall64-64.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/mips/kernel/scall64-64.S 2009-02-22 22:54:24.000000000 +0100
@@ -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.28.9/arch/mips/kernel/scall64-n32.S linux-2.6.28.9-vs2.3.0.36.10/arch/mips/kernel/scall64-n32.S
---- linux-2.6.28.9/arch/mips/kernel/scall64-n32.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/mips/kernel/scall64-n32.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/mips/kernel/scall64-n32.S linux-2.6.28.10-vs2.3.0.36.11/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.28.10/arch/mips/kernel/scall64-n32.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/mips/kernel/scall64-n32.S 2009-02-22 22:54:24.000000000 +0100
@@ -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.28.9/arch/mips/kernel/scall64-o32.S linux-2.6.28.9-vs2.3.0.36.10/arch/mips/kernel/scall64-o32.S
---- linux-2.6.28.9/arch/mips/kernel/scall64-o32.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/mips/kernel/scall64-o32.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/mips/kernel/scall64-o32.S linux-2.6.28.10-vs2.3.0.36.11/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.28.10/arch/mips/kernel/scall64-o32.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/mips/kernel/scall64-o32.S 2009-02-22 22:54:24.000000000 +0100
@@ -480,7 +480,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -495,9 +495,9 @@
PTR sys32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.28.9/arch/mips/kernel/traps.c linux-2.6.28.9-vs2.3.0.36.10/arch/mips/kernel/traps.c
---- linux-2.6.28.9/arch/mips/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/mips/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/mips/kernel/traps.c linux-2.6.28.10-vs2.3.0.36.11/arch/mips/kernel/traps.c
+--- linux-2.6.28.10/arch/mips/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/mips/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
@@ -330,9 +330,10 @@ void show_registers(const struct pt_regs
__show_regs(regs);
@@ -512,9 +512,9 @@
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-2.6.28.9/arch/mips/mm/fault.c linux-2.6.28.9-vs2.3.0.36.10/arch/mips/mm/fault.c
---- linux-2.6.28.9/arch/mips/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/mips/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/mips/mm/fault.c linux-2.6.28.10-vs2.3.0.36.11/arch/mips/mm/fault.c
+--- linux-2.6.28.10/arch/mips/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/mips/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
@@ -178,7 +178,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -525,9 +525,9 @@
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.28.9/arch/parisc/Kconfig linux-2.6.28.9-vs2.3.0.36.10/arch/parisc/Kconfig
---- linux-2.6.28.9/arch/parisc/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/parisc/Kconfig 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/parisc/Kconfig linux-2.6.28.10-vs2.3.0.36.11/arch/parisc/Kconfig
+--- linux-2.6.28.10/arch/parisc/Kconfig 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/parisc/Kconfig 2009-02-22 22:54:24.000000000 +0100
@@ -280,6 +280,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -537,9 +537,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.28.9/arch/parisc/kernel/syscall_table.S linux-2.6.28.9-vs2.3.0.36.10/arch/parisc/kernel/syscall_table.S
---- linux-2.6.28.9/arch/parisc/kernel/syscall_table.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/parisc/kernel/syscall_table.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/parisc/kernel/syscall_table.S linux-2.6.28.10-vs2.3.0.36.11/arch/parisc/kernel/syscall_table.S
+--- linux-2.6.28.10/arch/parisc/kernel/syscall_table.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/parisc/kernel/syscall_table.S 2009-02-22 22:54:24.000000000 +0100
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -549,9 +549,9 @@
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.28.9/arch/parisc/kernel/traps.c linux-2.6.28.9-vs2.3.0.36.10/arch/parisc/kernel/traps.c
---- linux-2.6.28.9/arch/parisc/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/parisc/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/parisc/kernel/traps.c linux-2.6.28.10-vs2.3.0.36.11/arch/parisc/kernel/traps.c
+--- linux-2.6.28.10/arch/parisc/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/parisc/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
@@ -575,9 +575,9 @@
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-2.6.28.9/arch/parisc/mm/fault.c linux-2.6.28.9-vs2.3.0.36.10/arch/parisc/mm/fault.c
---- linux-2.6.28.9/arch/parisc/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/parisc/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/parisc/mm/fault.c linux-2.6.28.10-vs2.3.0.36.11/arch/parisc/mm/fault.c
+--- linux-2.6.28.10/arch/parisc/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/parisc/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
@@ -210,8 +210,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -600,9 +600,75 @@
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.28.9/arch/powerpc/Kconfig linux-2.6.28.9-vs2.3.0.36.10/arch/powerpc/Kconfig
---- linux-2.6.28.9/arch/powerpc/Kconfig 2009-03-31 16:25:10.000000000 +0200
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/powerpc/Kconfig 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.28.10/arch/powerpc/include/asm/futex.h linux-2.6.28.10-vs2.3.0.36.11/arch/powerpc/include/asm/futex.h
+--- linux-2.6.28.10/arch/powerpc/include/asm/futex.h 2009-05-05 10:42:45.000000000 +0200
++++ linux-2.6.28.10-vs2.3.0.36.11/arch/powerpc/include/asm/futex.h 2008-12-25 00:26:37.000000000 +0100
+@@ -27,7 +27,7 @@
+ PPC_LONG "1b,4b,2b,4b\n" \
+ ".previous" \
+ : "=&r" (oldval), "=&r" (ret) \
+- : "b" (uaddr), "i" (-EFAULT), "r" (oparg) \
++ : "b" (uaddr), "i" (-EFAULT), "1" (oparg) \
+ : "cr0", "memory")
+
+ static inline int futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
+@@ -47,19 +47,19 @@ static inline int futex_atomic_op_inuser
+
+ switch (op) {
+ case FUTEX_OP_SET:
+- __futex_atomic_op("mr %1,%4\n", ret, oldval, uaddr, oparg);
++ __futex_atomic_op("", ret, oldval, uaddr, oparg);
+ break;
+ case FUTEX_OP_ADD:
+- __futex_atomic_op("add %1,%0,%4\n", ret, oldval, uaddr, oparg);
++ __futex_atomic_op("add %1,%0,%1\n", ret, oldval, uaddr, oparg);
+ break;
+ case FUTEX_OP_OR:
+- __futex_atomic_op("or %1,%0,%4\n", ret, oldval, uaddr, oparg);
++ __futex_atomic_op("or %1,%0,%1\n", ret, oldval, uaddr, oparg);
+ break;
+ case FUTEX_OP_ANDN:
+- __futex_atomic_op("andc %1,%0,%4\n", ret, oldval, uaddr, oparg);
++ __futex_atomic_op("andc %1,%0,%1\n", ret, oldval, uaddr, oparg);
+ break;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.441.2.2083.2.9&r2=1.441.2.2083.2.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/linux-2.6-vs2.3.patch?r1=1.2.4.11.2.55.4.3&r2=1.2.4.11.2.55.4.4&f=u
More information about the pld-cvs-commit
mailing list