Author: arekm Date: Thu Feb 25 22:47:07 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- vserver updated
---- Files affected:
packages/kernel:
kernel-vserver-2.3.patch (1.31 -> 1.32) , kernel-vserver-fixes.patch (1.10
-> 1.11) , kernel.spec (1.756 -> 1.757)
---- Diffs:
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.31
packages/kernel/kernel-vserver-2.3.patch:1.32
--- packages/kernel/kernel-vserver-2.3.patch:1.31 Tue Feb 23 20:11:25 2010
+++ packages/kernel/kernel-vserver-2.3.patch Thu Feb 25 23:47:01 2010
@@ -1,7 +1,7 @@
-diff -NurpP --minimal linux-2.6.32.8/arch/alpha/Kconfig
linux-2.6.32.8-vs2.3.0.36.29.1/arch/alpha/Kconfig
---- linux-2.6.32.8/arch/alpha/Kconfig 2009-12-03 20:01:49.000000000 +0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/alpha/Kconfig 2009-12-03
20:04:56.000000000 +0100
-@@ -674,6 +674,8 @@ config DUMMY_CONSOLE
+diff -NurpP --minimal linux-2.6.33/arch/alpha/Kconfig
linux-2.6.33-vs2.3.0.36.30/arch/alpha/Kconfig
+--- linux-2.6.33/arch/alpha/Kconfig 2010-02-25 11:51:18.000000000 +0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/alpha/Kconfig 2010-02-25
12:02:16.000000000 +0100
+@@ -675,6 +675,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.32.8/arch/alpha/kernel/entry.S
linux-2.6.32.8-vs2.3.0.36.29.1/arch/alpha/kernel/entry.S
---- linux-2.6.32.8/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/alpha/kernel/entry.S 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/alpha/kernel/entry.S
linux-2.6.33-vs2.3.0.36.30/arch/alpha/kernel/entry.S
+--- linux-2.6.33/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000
+0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/alpha/kernel/entry.S 2010-02-25
12:02:16.000000000 +0100
@@ -874,24 +874,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -45,9 +45,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.32.8/arch/alpha/kernel/osf_sys.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.8/arch/alpha/kernel/osf_sys.c 2010-02-12 10:09:00.000000000
+0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/alpha/kernel/osf_sys.c 2010-01-20
04:21:33.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/alpha/kernel/osf_sys.c
linux-2.6.33-vs2.3.0.36.30/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.33/arch/alpha/kernel/osf_sys.c 2010-02-25 11:51:19.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/alpha/kernel/osf_sys.c 2010-02-25
12:02:16.000000000 +0100
@@ -865,7 +865,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
{
if (tv) {
@@ -57,9 +57,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.32.8/arch/alpha/kernel/ptrace.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/alpha/kernel/ptrace.c
---- linux-2.6.32.8/arch/alpha/kernel/ptrace.c 2009-09-10 15:25:14.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/alpha/kernel/ptrace.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/alpha/kernel/ptrace.c
linux-2.6.33-vs2.3.0.36.30/arch/alpha/kernel/ptrace.c
+--- linux-2.6.33/arch/alpha/kernel/ptrace.c 2009-09-10 15:25:14.000000000
+0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/alpha/kernel/ptrace.c 2010-02-25
12:02:16.000000000 +0100
@@ -14,6 +14,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.32.8/arch/alpha/kernel/systbls.S
linux-2.6.32.8-vs2.3.0.36.29.1/arch/alpha/kernel/systbls.S
---- linux-2.6.32.8/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000
+0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/alpha/kernel/systbls.S 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/alpha/kernel/systbls.S
linux-2.6.33-vs2.3.0.36.30/arch/alpha/kernel/systbls.S
+--- linux-2.6.33/arch/alpha/kernel/systbls.S 2010-02-25 11:51:19.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/alpha/kernel/systbls.S 2010-02-25
12:02:16.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.32.8/arch/alpha/kernel/traps.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/alpha/kernel/traps.c
---- linux-2.6.32.8/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/alpha/kernel/traps.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/alpha/kernel/traps.c
linux-2.6.33-vs2.3.0.36.30/arch/alpha/kernel/traps.c
+--- linux-2.6.33/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000
+0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/alpha/kernel/traps.c 2010-02-25
12:02:16.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.32.8/arch/alpha/mm/fault.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/alpha/mm/fault.c
---- linux-2.6.32.8/arch/alpha/mm/fault.c 2009-09-10 15:25:14.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/alpha/mm/fault.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/alpha/mm/fault.c
linux-2.6.33-vs2.3.0.36.30/arch/alpha/mm/fault.c
+--- linux-2.6.33/arch/alpha/mm/fault.c 2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/alpha/mm/fault.c 2010-02-25
12:02:16.000000000 +0100
@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
@@ -107,10 +107,21 @@
if (!user_mode(regs))
goto no_context;
do_group_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.32.8/arch/arm/Kconfig
linux-2.6.32.8-vs2.3.0.36.29.1/arch/arm/Kconfig
---- linux-2.6.32.8/arch/arm/Kconfig 2009-12-03 20:01:49.000000000 +0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/arm/Kconfig 2009-12-03
20:04:56.000000000 +0100
-@@ -1512,6 +1512,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.33/arch/arm/include/asm/tlb.h
linux-2.6.33-vs2.3.0.36.30/arch/arm/include/asm/tlb.h
+--- linux-2.6.33/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000
+0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/arm/include/asm/tlb.h 2010-02-25
12:02:16.000000000 +0100
+@@ -27,6 +27,7 @@
+
+ #else /* !CONFIG_MMU */
+
++#include <linux/vs_memory.h>
+ #include <asm/pgalloc.h>
+
+ /*
+diff -NurpP --minimal linux-2.6.33/arch/arm/Kconfig
linux-2.6.33-vs2.3.0.36.30/arch/arm/Kconfig
+--- linux-2.6.33/arch/arm/Kconfig 2010-02-25 11:51:19.000000000 +0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/arm/Kconfig 2010-02-25
12:02:16.000000000 +0100
+@@ -1542,6 +1542,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -119,9 +130,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.8/arch/arm/kernel/calls.S
linux-2.6.32.8-vs2.3.0.36.29.1/arch/arm/kernel/calls.S
---- linux-2.6.32.8/arch/arm/kernel/calls.S 2010-02-12 10:09:00.000000000
+0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/arm/kernel/calls.S 2010-01-20
04:21:33.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/arm/kernel/calls.S
linux-2.6.33-vs2.3.0.36.30/arch/arm/kernel/calls.S
+--- linux-2.6.33/arch/arm/kernel/calls.S 2010-02-25 11:51:20.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/arm/kernel/calls.S 2010-02-25
12:02:16.000000000 +0100
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -131,10 +142,10 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.32.8/arch/arm/kernel/process.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/arm/kernel/process.c
---- linux-2.6.32.8/arch/arm/kernel/process.c 2009-12-03 20:01:50.000000000
+0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/arm/kernel/process.c 2009-12-03
20:04:56.000000000 +0100
-@@ -269,7 +269,8 @@ void __show_regs(struct pt_regs *regs)
+diff -NurpP --minimal linux-2.6.33/arch/arm/kernel/process.c
linux-2.6.33-vs2.3.0.36.30/arch/arm/kernel/process.c
+--- linux-2.6.33/arch/arm/kernel/process.c 2010-02-25 11:51:20.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/arm/kernel/process.c 2010-02-25
12:02:16.000000000 +0100
+@@ -270,7 +270,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
printk("\n");
@@ -144,9 +155,9 @@
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.32.8/arch/arm/kernel/traps.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/arm/kernel/traps.c
---- linux-2.6.32.8/arch/arm/kernel/traps.c 2009-12-03 20:01:50.000000000
+0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/arm/kernel/traps.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/arm/kernel/traps.c
linux-2.6.33-vs2.3.0.36.30/arch/arm/kernel/traps.c
+--- linux-2.6.33/arch/arm/kernel/traps.c 2009-12-03 20:01:50.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/arm/kernel/traps.c 2010-02-25
12:02:16.000000000 +0100
@@ -234,8 +234,8 @@ static void __die(const char *str, int e
sysfs_printk_last_file();
print_modules();
@@ -158,9 +169,9 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.32.8/arch/avr32/mm/fault.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/avr32/mm/fault.c
---- linux-2.6.32.8/arch/avr32/mm/fault.c 2009-09-10 15:25:20.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/avr32/mm/fault.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/avr32/mm/fault.c
linux-2.6.33-vs2.3.0.36.30/arch/avr32/mm/fault.c
+--- linux-2.6.33/arch/avr32/mm/fault.c 2009-09-10 15:25:20.000000000 +0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/avr32/mm/fault.c 2010-02-25
12:02:16.000000000 +0100
@@ -216,7 +216,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -171,9 +182,9 @@
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.8/arch/cris/Kconfig
linux-2.6.32.8-vs2.3.0.36.29.1/arch/cris/Kconfig
---- linux-2.6.32.8/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/cris/Kconfig 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/cris/Kconfig
linux-2.6.33-vs2.3.0.36.30/arch/cris/Kconfig
+--- linux-2.6.33/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/cris/Kconfig 2010-02-25
12:02:16.000000000 +0100
@@ -685,6 +685,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -183,9 +194,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.8/arch/cris/mm/fault.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/cris/mm/fault.c
---- linux-2.6.32.8/arch/cris/mm/fault.c 2009-12-03 20:01:56.000000000
+0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/cris/mm/fault.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/cris/mm/fault.c
linux-2.6.33-vs2.3.0.36.30/arch/cris/mm/fault.c
+--- linux-2.6.33/arch/cris/mm/fault.c 2010-02-25 11:51:26.000000000 +0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/cris/mm/fault.c 2010-02-25
12:02:16.000000000 +0100
@@ -245,7 +245,8 @@ do_page_fault(unsigned long address, str
out_of_memory:
@@ -196,9 +207,9 @@
if (user_mode(regs))
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.8/arch/frv/kernel/kernel_thread.S
linux-2.6.32.8-vs2.3.0.36.29.1/arch/frv/kernel/kernel_thread.S
---- linux-2.6.32.8/arch/frv/kernel/kernel_thread.S 2008-12-25
00:26:37.000000000 +0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/frv/kernel/kernel_thread.S
2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/frv/kernel/kernel_thread.S
linux-2.6.33-vs2.3.0.36.30/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.33/arch/frv/kernel/kernel_thread.S 2008-12-25
00:26:37.000000000 +0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/frv/kernel/kernel_thread.S 2010-02-25
12:02:16.000000000 +0100
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
@@ -208,9 +219,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.32.8/arch/frv/mm/fault.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/frv/mm/fault.c
---- linux-2.6.32.8/arch/frv/mm/fault.c 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/frv/mm/fault.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/frv/mm/fault.c
linux-2.6.33-vs2.3.0.36.30/arch/frv/mm/fault.c
+--- linux-2.6.33/arch/frv/mm/fault.c 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/frv/mm/fault.c 2010-02-25
12:02:16.000000000 +0100
@@ -257,7 +257,8 @@ asmlinkage void do_page_fault(int datamm
*/
out_of_memory:
@@ -221,10 +232,10 @@
if (user_mode(__frame))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.8/arch/h8300/Kconfig
linux-2.6.32.8-vs2.3.0.36.29.1/arch/h8300/Kconfig
---- linux-2.6.32.8/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/h8300/Kconfig 2009-12-03
20:04:56.000000000 +0100
-@@ -226,6 +226,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.33/arch/h8300/Kconfig
linux-2.6.33-vs2.3.0.36.30/arch/h8300/Kconfig
+--- linux-2.6.33/arch/h8300/Kconfig 2010-02-25 11:51:26.000000000 +0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/h8300/Kconfig 2010-02-25
12:02:16.000000000 +0100
+@@ -230,6 +230,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -233,9 +244,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.8/arch/ia64/ia32/ia32_entry.S
linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.32.8/arch/ia64/ia32/ia32_entry.S 2009-06-11 17:11:57.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/ia32/ia32_entry.S 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/ia64/ia32/ia32_entry.S
linux-2.6.33-vs2.3.0.36.30/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.33/arch/ia64/ia32/ia32_entry.S 2010-02-25 11:51:26.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/ia64/ia32/ia32_entry.S 2010-02-25
12:02:16.000000000 +0100
@@ -451,7 +451,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -245,9 +256,9 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.32.8/arch/ia64/include/asm/tlb.h
linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/include/asm/tlb.h
---- linux-2.6.32.8/arch/ia64/include/asm/tlb.h 2009-09-10 15:25:22.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/include/asm/tlb.h 2009-12-31
14:37:34.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/ia64/include/asm/tlb.h
linux-2.6.33-vs2.3.0.36.30/arch/ia64/include/asm/tlb.h
+--- linux-2.6.33/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/ia64/include/asm/tlb.h 2010-02-25
12:02:16.000000000 +0100
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -256,10 +267,10 @@
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.32.8/arch/ia64/Kconfig
linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/Kconfig
---- linux-2.6.32.8/arch/ia64/Kconfig 2009-12-03 20:01:56.000000000 +0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/Kconfig 2009-12-03
20:04:56.000000000 +0100
-@@ -685,6 +685,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.33/arch/ia64/Kconfig
linux-2.6.33-vs2.3.0.36.30/arch/ia64/Kconfig
+--- linux-2.6.33/arch/ia64/Kconfig 2010-02-25 11:51:26.000000000 +0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/ia64/Kconfig 2010-02-25
12:02:16.000000000 +0100
+@@ -682,6 +682,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -268,9 +279,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.8/arch/ia64/kernel/entry.S
linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/kernel/entry.S
---- linux-2.6.32.8/arch/ia64/kernel/entry.S 2009-09-10 15:25:22.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/kernel/entry.S 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/ia64/kernel/entry.S
linux-2.6.33-vs2.3.0.36.30/arch/ia64/kernel/entry.S
+--- linux-2.6.33/arch/ia64/kernel/entry.S 2010-02-25 11:51:26.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/ia64/kernel/entry.S 2010-02-25
12:02:16.000000000 +0100
@@ -1753,7 +1753,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -280,9 +291,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.32.8/arch/ia64/kernel/perfmon.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/kernel/perfmon.c
---- linux-2.6.32.8/arch/ia64/kernel/perfmon.c 2009-09-10 15:25:22.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/kernel/perfmon.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/ia64/kernel/perfmon.c
linux-2.6.33-vs2.3.0.36.30/arch/ia64/kernel/perfmon.c
+--- linux-2.6.33/arch/ia64/kernel/perfmon.c 2010-02-25 11:51:26.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/ia64/kernel/perfmon.c 2010-02-25
12:02:16.000000000 +0100
@@ -41,6 +41,7 @@
#include <linux/rcupdate.h>
#include <linux/completion.h>
@@ -291,7 +302,7 @@
#include <asm/errno.h>
#include <asm/intrinsics.h>
-@@ -2372,7 +2373,7 @@ pfm_smpl_buffer_alloc(struct task_struct
+@@ -2367,7 +2368,7 @@ pfm_smpl_buffer_alloc(struct task_struct
*/
insert_vm_struct(mm, vma);
@@ -300,9 +311,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.32.8/arch/ia64/kernel/process.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/kernel/process.c
---- linux-2.6.32.8/arch/ia64/kernel/process.c 2009-12-03 20:01:56.000000000
+0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/kernel/process.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/ia64/kernel/process.c
linux-2.6.33-vs2.3.0.36.30/arch/ia64/kernel/process.c
+--- linux-2.6.33/arch/ia64/kernel/process.c 2009-12-03 20:01:56.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/ia64/kernel/process.c 2010-02-25
12:02:16.000000000 +0100
@@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -314,9 +325,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.32.8/arch/ia64/kernel/ptrace.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/kernel/ptrace.c
---- linux-2.6.32.8/arch/ia64/kernel/ptrace.c 2009-09-10 15:25:22.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/kernel/ptrace.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/ia64/kernel/ptrace.c
linux-2.6.33-vs2.3.0.36.30/arch/ia64/kernel/ptrace.c
+--- linux-2.6.33/arch/ia64/kernel/ptrace.c 2009-09-10 15:25:22.000000000
+0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/ia64/kernel/ptrace.c 2010-02-25
12:02:16.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -325,9 +336,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.32.8/arch/ia64/kernel/traps.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/kernel/traps.c
---- linux-2.6.32.8/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000
+0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/kernel/traps.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/ia64/kernel/traps.c
linux-2.6.33-vs2.3.0.36.30/arch/ia64/kernel/traps.c
+--- linux-2.6.33/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/ia64/kernel/traps.c 2010-02-25
12:02:16.000000000 +0100
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -352,9 +363,9 @@
}
}
}
-diff -NurpP --minimal linux-2.6.32.8/arch/ia64/mm/fault.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/mm/fault.c
---- linux-2.6.32.8/arch/ia64/mm/fault.c 2009-09-10 15:25:23.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/ia64/mm/fault.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/ia64/mm/fault.c
linux-2.6.33-vs2.3.0.36.30/arch/ia64/mm/fault.c
+--- linux-2.6.33/arch/ia64/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/ia64/mm/fault.c 2010-02-25
12:02:16.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
@@ -373,9 +384,9 @@
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.8/arch/m32r/kernel/traps.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/m32r/kernel/traps.c
---- linux-2.6.32.8/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000
+0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/m32r/kernel/traps.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/m32r/kernel/traps.c
linux-2.6.33-vs2.3.0.36.30/arch/m32r/kernel/traps.c
+--- linux-2.6.33/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/m32r/kernel/traps.c 2010-02-25
12:02:16.000000000 +0100
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -388,9 +399,9 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.32.8/arch/m32r/mm/fault.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/m32r/mm/fault.c
---- linux-2.6.32.8/arch/m32r/mm/fault.c 2009-09-10 15:25:23.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/m32r/mm/fault.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/m32r/mm/fault.c
linux-2.6.33-vs2.3.0.36.30/arch/m32r/mm/fault.c
+--- linux-2.6.33/arch/m32r/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/m32r/mm/fault.c 2010-02-25
12:02:16.000000000 +0100
@@ -276,7 +276,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -401,9 +412,9 @@
if (error_code & ACE_USERMODE)
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.8/arch/m68k/Kconfig
linux-2.6.32.8-vs2.3.0.36.29.1/arch/m68k/Kconfig
---- linux-2.6.32.8/arch/m68k/Kconfig 2009-12-03 20:01:57.000000000 +0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/m68k/Kconfig 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/m68k/Kconfig
linux-2.6.33-vs2.3.0.36.30/arch/m68k/Kconfig
+--- linux-2.6.33/arch/m68k/Kconfig 2009-12-03 20:01:57.000000000 +0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/m68k/Kconfig 2010-02-25
12:02:16.000000000 +0100
@@ -622,6 +622,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -413,9 +424,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.8/arch/m68k/kernel/ptrace.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/m68k/kernel/ptrace.c
---- linux-2.6.32.8/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000
+0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/m68k/kernel/ptrace.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/m68k/kernel/ptrace.c
linux-2.6.33-vs2.3.0.36.30/arch/m68k/kernel/ptrace.c
+--- linux-2.6.33/arch/m68k/kernel/ptrace.c 2010-02-25 11:51:27.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/m68k/kernel/ptrace.c 2010-02-25
12:02:16.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
@@ -424,7 +435,7 @@
#include <asm/uaccess.h>
#include <asm/page.h>
-@@ -269,6 +270,8 @@ long arch_ptrace(struct task_struct *chi
+@@ -249,6 +250,8 @@ long arch_ptrace(struct task_struct *chi
ret = ptrace_request(child, request, addr, data);
break;
}
@@ -433,9 +444,9 @@
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.32.8/arch/m68k/kernel/traps.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/m68k/kernel/traps.c
---- linux-2.6.32.8/arch/m68k/kernel/traps.c 2009-09-10 15:25:23.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/m68k/kernel/traps.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/m68k/kernel/traps.c
linux-2.6.33-vs2.3.0.36.30/arch/m68k/kernel/traps.c
+--- linux-2.6.33/arch/m68k/kernel/traps.c 2009-09-10 15:25:23.000000000
+0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/m68k/kernel/traps.c 2010-02-25
12:02:16.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);
@@ -447,9 +458,9 @@
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
-diff -NurpP --minimal linux-2.6.32.8/arch/m68k/mm/fault.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/m68k/mm/fault.c
---- linux-2.6.32.8/arch/m68k/mm/fault.c 2009-09-10 15:25:23.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/m68k/mm/fault.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/m68k/mm/fault.c
linux-2.6.33-vs2.3.0.36.30/arch/m68k/mm/fault.c
+--- linux-2.6.33/arch/m68k/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/m68k/mm/fault.c 2010-02-25
12:02:16.000000000 +0100
@@ -186,7 +186,8 @@ out_of_memory:
goto survive;
}
@@ -460,10 +471,10 @@
if (user_mode(regs))
do_group_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.32.8/arch/m68knommu/Kconfig
linux-2.6.32.8-vs2.3.0.36.29.1/arch/m68knommu/Kconfig
---- linux-2.6.32.8/arch/m68knommu/Kconfig 2009-12-03 20:01:57.000000000
+0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/m68knommu/Kconfig 2009-12-03
20:04:56.000000000 +0100
-@@ -727,6 +727,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.33/arch/m68knommu/Kconfig
linux-2.6.33-vs2.3.0.36.30/arch/m68knommu/Kconfig
+--- linux-2.6.33/arch/m68knommu/Kconfig 2010-02-25 11:51:27.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/m68knommu/Kconfig 2010-02-25
12:02:16.000000000 +0100
+@@ -734,6 +734,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -472,9 +483,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.8/arch/m68knommu/kernel/traps.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/m68knommu/kernel/traps.c
---- linux-2.6.32.8/arch/m68knommu/kernel/traps.c 2009-09-10
15:25:23.000000000 +0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/m68knommu/kernel/traps.c
2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/m68knommu/kernel/traps.c
linux-2.6.33-vs2.3.0.36.30/arch/m68knommu/kernel/traps.c
+--- linux-2.6.33/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000
+0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/m68knommu/kernel/traps.c 2010-02-25
12:02:16.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);
@@ -487,9 +498,9 @@
show_stack(NULL, (unsigned long *)(fp + 1));
add_taint(TAINT_DIE);
do_exit(SIGSEGV);
-diff -NurpP --minimal linux-2.6.32.8/arch/microblaze/mm/fault.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/microblaze/mm/fault.c
---- linux-2.6.32.8/arch/microblaze/mm/fault.c 2009-09-10 15:25:24.000000000
+0200
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/microblaze/mm/fault.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/microblaze/mm/fault.c
linux-2.6.33-vs2.3.0.36.30/arch/microblaze/mm/fault.c
+--- linux-2.6.33/arch/microblaze/mm/fault.c 2009-09-10 15:25:24.000000000
+0200
++++ linux-2.6.33-vs2.3.0.36.30/arch/microblaze/mm/fault.c 2010-02-25
12:02:16.000000000 +0100
@@ -279,7 +279,8 @@ out_of_memory:
goto survive;
}
@@ -500,10 +511,10 @@
if (user_mode(regs))
do_exit(SIGKILL);
bad_page_fault(regs, address, SIGKILL);
-diff -NurpP --minimal linux-2.6.32.8/arch/mips/Kconfig
linux-2.6.32.8-vs2.3.0.36.29.1/arch/mips/Kconfig
---- linux-2.6.32.8/arch/mips/Kconfig 2009-12-03 20:01:58.000000000 +0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/mips/Kconfig 2009-12-03
20:04:56.000000000 +0100
-@@ -2188,6 +2188,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.33/arch/mips/Kconfig
linux-2.6.33-vs2.3.0.36.30/arch/mips/Kconfig
+--- linux-2.6.33/arch/mips/Kconfig 2010-02-25 11:51:27.000000000 +0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/mips/Kconfig 2010-02-25
12:02:16.000000000 +0100
+@@ -2220,6 +2220,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -512,9 +523,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.8/arch/mips/kernel/ptrace.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/mips/kernel/ptrace.c
---- linux-2.6.32.8/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000
+0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/mips/kernel/ptrace.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/mips/kernel/ptrace.c
linux-2.6.33-vs2.3.0.36.30/arch/mips/kernel/ptrace.c
+--- linux-2.6.33/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/mips/kernel/ptrace.c 2010-02-25
12:02:16.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -533,9 +544,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.32.8/arch/mips/kernel/scall32-o32.S
linux-2.6.32.8-vs2.3.0.36.29.1/arch/mips/kernel/scall32-o32.S
---- linux-2.6.32.8/arch/mips/kernel/scall32-o32.S 2009-12-03
20:01:59.000000000 +0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/mips/kernel/scall32-o32.S
2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/mips/kernel/scall32-o32.S
linux-2.6.33-vs2.3.0.36.30/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.33/arch/mips/kernel/scall32-o32.S 2010-02-25
11:51:28.000000000 +0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/mips/kernel/scall32-o32.S 2010-02-25
12:02:16.000000000 +0100
@@ -525,7 +525,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -545,9 +556,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.32.8/arch/mips/kernel/scall64-64.S
linux-2.6.32.8-vs2.3.0.36.29.1/arch/mips/kernel/scall64-64.S
---- linux-2.6.32.8/arch/mips/kernel/scall64-64.S 2009-12-03
20:01:59.000000000 +0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/mips/kernel/scall64-64.S
2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/mips/kernel/scall64-64.S
linux-2.6.33-vs2.3.0.36.30/arch/mips/kernel/scall64-64.S
+--- linux-2.6.33/arch/mips/kernel/scall64-64.S 2010-02-25 11:51:28.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/mips/kernel/scall64-64.S 2010-02-25
12:02:16.000000000 +0100
@@ -362,7 +362,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -557,9 +568,9 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.32.8/arch/mips/kernel/scall64-n32.S
linux-2.6.32.8-vs2.3.0.36.29.1/arch/mips/kernel/scall64-n32.S
---- linux-2.6.32.8/arch/mips/kernel/scall64-n32.S 2009-12-03
20:01:59.000000000 +0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/mips/kernel/scall64-n32.S
2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/mips/kernel/scall64-n32.S
linux-2.6.33-vs2.3.0.36.30/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.33/arch/mips/kernel/scall64-n32.S 2010-02-25
11:51:28.000000000 +0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/mips/kernel/scall64-n32.S 2010-02-25
12:02:16.000000000 +0100
@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -569,9 +580,9 @@
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.32.8/arch/mips/kernel/scall64-o32.S
linux-2.6.32.8-vs2.3.0.36.29.1/arch/mips/kernel/scall64-o32.S
---- linux-2.6.32.8/arch/mips/kernel/scall64-o32.S 2009-12-03
20:01:59.000000000 +0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/mips/kernel/scall64-o32.S
2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.33/arch/mips/kernel/scall64-o32.S
linux-2.6.33-vs2.3.0.36.30/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.33/arch/mips/kernel/scall64-o32.S 2010-02-25
11:51:28.000000000 +0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/mips/kernel/scall64-o32.S 2010-02-25
12:02:16.000000000 +0100
@@ -480,7 +480,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -581,10 +592,10 @@
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.32.8/arch/mips/kernel/traps.c
linux-2.6.32.8-vs2.3.0.36.29.1/arch/mips/kernel/traps.c
---- linux-2.6.32.8/arch/mips/kernel/traps.c 2009-12-03 20:01:59.000000000
+0100
-+++ linux-2.6.32.8-vs2.3.0.36.29.1/arch/mips/kernel/traps.c 2009-12-03
20:04:56.000000000 +0100
-@@ -335,9 +335,10 @@ void show_registers(const struct pt_regs
+diff -NurpP --minimal linux-2.6.33/arch/mips/kernel/traps.c
linux-2.6.33-vs2.3.0.36.30/arch/mips/kernel/traps.c
+--- linux-2.6.33/arch/mips/kernel/traps.c 2010-02-25 11:51:28.000000000
+0100
++++ linux-2.6.33-vs2.3.0.36.30/arch/mips/kernel/traps.c 2010-02-25
12:02:16.000000000 +0100
+@@ -333,9 +333,10 @@ void show_registers(const struct pt_regs
__show_regs(regs);
print_modules();
@@ -598,9 +609,9 @@
if (cpu_has_userlocal) {
unsigned long tls;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.31&r2=1.32&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-fixes.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.756&r2=1.757&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
