SOURCES (LINUX_2_6): linux-2.6-vs2.2.patch - http://vserver.13thfl...
mguevara
mguevara at pld-linux.org
Mon Sep 3 12:32:55 CEST 2007
Author: mguevara Date: Mon Sep 3 10:32:55 2007 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- http://vserver.13thfloor.at/Experimental/patch-2.6.22.2-vs2.2.0.3.diff
---- Files affected:
SOURCES:
linux-2.6-vs2.2.patch (1.1.4.3 -> 1.1.4.4)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.2.patch
diff -u SOURCES/linux-2.6-vs2.2.patch:1.1.4.3 SOURCES/linux-2.6-vs2.2.patch:1.1.4.4
--- SOURCES/linux-2.6-vs2.2.patch:1.1.4.3 Tue May 29 15:37:35 2007
+++ SOURCES/linux-2.6-vs2.2.patch Mon Sep 3 12:32:49 2007
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.21/Documentation/vserver/debug.txt linux-2.6.21-vs2.2.0-rc1/Documentation/vserver/debug.txt
---- linux-2.6.21/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
-+++ linux-2.6.21-vs2.2.0-rc1/Documentation/vserver/debug.txt 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/Documentation/vserver/debug.txt linux-2.6.22.2-vs2.2.0.3/Documentation/vserver/debug.txt
+--- linux-2.6.22.2/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.2-vs2.2.0.3/Documentation/vserver/debug.txt 2007-06-15 02:37:02 +0200
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,21 +156,33 @@
+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-2.6.21/arch/alpha/Kconfig linux-2.6.21-vs2.2.0-rc1/arch/alpha/Kconfig
---- linux-2.6.21/arch/alpha/Kconfig 2007-05-02 19:24:16 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/alpha/Kconfig 2007-05-02 20:40:17 +0200
-@@ -644,6 +644,8 @@ source "arch/alpha/oprofile/Kconfig"
-
- source "arch/alpha/Kconfig.debug"
+diff -NurpP --minimal linux-2.6.22.2/Makefile linux-2.6.22.2-vs2.2.0.3/Makefile
+--- linux-2.6.22.2/Makefile 2007-08-12 03:07:38 +0200
++++ linux-2.6.22.2-vs2.2.0.3/Makefile 2007-08-12 12:47:26 +0200
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 22
+-EXTRAVERSION = .2
++EXTRAVERSION = .2-vs2.2.0.3
+ NAME = Holy Dancing Manatees, Batman!
+
+ # *DOCUMENTATION*
+diff -NurpP --minimal linux-2.6.22.2/arch/alpha/Kconfig linux-2.6.22.2-vs2.2.0.3/arch/alpha/Kconfig
+--- linux-2.6.22.2/arch/alpha/Kconfig 2007-07-09 13:17:31 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/alpha/Kconfig 2007-06-15 02:37:02 +0200
+@@ -662,6 +662,8 @@ config DUMMY_CONSOLE
+ depends on VGA_HOSE
+ default y
+source "kernel/vserver/Kconfig"
+
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.21/arch/alpha/kernel/asm-offsets.c linux-2.6.21-vs2.2.0-rc1/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.21/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10 +0100
-+++ linux-2.6.21-vs2.2.0-rc1/arch/alpha/kernel/asm-offsets.c 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/alpha/kernel/asm-offsets.c linux-2.6.22.2-vs2.2.0.3/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.22.2/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10 +0100
++++ linux-2.6.22.2-vs2.2.0.3/arch/alpha/kernel/asm-offsets.c 2007-06-15 02:37:02 +0200
@@ -36,6 +36,7 @@ void foo(void)
DEFINE(PT_PTRACED, PT_PTRACED);
DEFINE(CLONE_VM, CLONE_VM);
@@ -179,10 +191,10 @@
DEFINE(SIGCHLD, SIGCHLD);
BLANK();
-diff -NurpP --minimal linux-2.6.21/arch/alpha/kernel/entry.S linux-2.6.21-vs2.2.0-rc1/arch/alpha/kernel/entry.S
---- linux-2.6.21/arch/alpha/kernel/entry.S 2006-11-30 21:18:23 +0100
-+++ linux-2.6.21-vs2.2.0-rc1/arch/alpha/kernel/entry.S 2007-05-02 20:40:17 +0200
-@@ -644,7 +644,7 @@ kernel_thread:
+diff -NurpP --minimal linux-2.6.22.2/arch/alpha/kernel/entry.S linux-2.6.22.2-vs2.2.0.3/arch/alpha/kernel/entry.S
+--- linux-2.6.22.2/arch/alpha/kernel/entry.S 2007-07-09 13:17:31 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/alpha/kernel/entry.S 2007-06-15 02:37:02 +0200
+@@ -643,7 +643,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
/* Shuffle FLAGS to the front; add CLONE_VM. */
@@ -191,7 +203,7 @@
or $18, $1, $16
bsr $26, sys_clone
-@@ -873,24 +873,15 @@ sys_getxgid:
+@@ -872,24 +872,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
sys_getxpid:
@@ -223,10 +235,10 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.21/arch/alpha/kernel/osf_sys.c linux-2.6.21-vs2.2.0-rc1/arch/alpha/kernel/osf_sys.c
---- linux-2.6.21/arch/alpha/kernel/osf_sys.c 2007-02-06 02:59:58 +0100
-+++ linux-2.6.21-vs2.2.0-rc1/arch/alpha/kernel/osf_sys.c 2007-05-02 20:40:17 +0200
-@@ -885,7 +885,7 @@ osf_gettimeofday(struct timeval32 __user
+diff -NurpP --minimal linux-2.6.22.2/arch/alpha/kernel/osf_sys.c linux-2.6.22.2-vs2.2.0.3/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.22.2/arch/alpha/kernel/osf_sys.c 2007-07-09 13:17:31 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/alpha/kernel/osf_sys.c 2007-06-15 02:37:02 +0200
+@@ -883,7 +883,7 @@ osf_gettimeofday(struct timeval32 __user
{
if (tv) {
struct timeval ktv;
@@ -235,9 +247,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.21/arch/alpha/kernel/ptrace.c linux-2.6.21-vs2.2.0-rc1/arch/alpha/kernel/ptrace.c
---- linux-2.6.21/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/alpha/kernel/ptrace.c 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/alpha/kernel/ptrace.c linux-2.6.22.2-vs2.2.0.3/arch/alpha/kernel/ptrace.c
+--- linux-2.6.22.2/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/alpha/kernel/ptrace.c 2007-06-15 02:37:02 +0200
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -250,7 +262,7 @@
goto out_notsk;
}
-+ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT)) {
++ if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) {
+ ret = -EPERM;
+ goto out;
+ }
@@ -258,9 +270,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -NurpP --minimal linux-2.6.21/arch/alpha/kernel/semaphore.c linux-2.6.21-vs2.2.0-rc1/arch/alpha/kernel/semaphore.c
---- linux-2.6.21/arch/alpha/kernel/semaphore.c 2004-08-14 12:55:32 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/alpha/kernel/semaphore.c 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/alpha/kernel/semaphore.c linux-2.6.22.2-vs2.2.0.3/arch/alpha/kernel/semaphore.c
+--- linux-2.6.22.2/arch/alpha/kernel/semaphore.c 2004-08-14 12:55:32 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/alpha/kernel/semaphore.c 2007-06-15 02:37:02 +0200
@@ -68,8 +68,8 @@ __down_failed(struct semaphore *sem)
DECLARE_WAITQUEUE(wait, tsk);
@@ -294,9 +306,9 @@
#endif
tsk->state = TASK_INTERRUPTIBLE;
-diff -NurpP --minimal linux-2.6.21/arch/alpha/kernel/systbls.S linux-2.6.21-vs2.2.0-rc1/arch/alpha/kernel/systbls.S
---- linux-2.6.21/arch/alpha/kernel/systbls.S 2006-11-30 21:18:23 +0100
-+++ linux-2.6.21-vs2.2.0-rc1/arch/alpha/kernel/systbls.S 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/alpha/kernel/systbls.S linux-2.6.22.2-vs2.2.0.3/arch/alpha/kernel/systbls.S
+--- linux-2.6.22.2/arch/alpha/kernel/systbls.S 2007-07-09 13:17:31 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/alpha/kernel/systbls.S 2007-06-15 02:37:02 +0200
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -306,9 +318,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.21/arch/alpha/kernel/traps.c linux-2.6.21-vs2.2.0-rc1/arch/alpha/kernel/traps.c
---- linux-2.6.21/arch/alpha/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/alpha/kernel/traps.c 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/alpha/kernel/traps.c linux-2.6.22.2-vs2.2.0.3/arch/alpha/kernel/traps.c
+--- linux-2.6.22.2/arch/alpha/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/alpha/kernel/traps.c 2007-06-15 02:37:02 +0200
@@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -319,10 +331,10 @@
dik_show_regs(regs, r9_15);
dik_show_trace((unsigned long *)(regs+1));
dik_show_code((unsigned int *)regs->pc);
-diff -NurpP --minimal linux-2.6.21/arch/alpha/mm/fault.c linux-2.6.21-vs2.2.0-rc1/arch/alpha/mm/fault.c
---- linux-2.6.21/arch/alpha/mm/fault.c 2007-02-06 02:59:58 +0100
-+++ linux-2.6.21-vs2.2.0-rc1/arch/alpha/mm/fault.c 2007-05-02 20:40:17 +0200
-@@ -198,8 +198,8 @@ do_page_fault(unsigned long address, uns
+diff -NurpP --minimal linux-2.6.22.2/arch/alpha/mm/fault.c linux-2.6.22.2-vs2.2.0.3/arch/alpha/mm/fault.c
+--- linux-2.6.22.2/arch/alpha/mm/fault.c 2007-07-09 13:17:32 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/alpha/mm/fault.c 2007-06-15 02:37:02 +0200
+@@ -197,8 +197,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
}
@@ -333,10 +345,10 @@
if (!user_mode(regs))
goto no_context;
do_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.21/arch/arm/Kconfig linux-2.6.21-vs2.2.0-rc1/arch/arm/Kconfig
---- linux-2.6.21/arch/arm/Kconfig 2007-05-02 19:24:16 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/arm/Kconfig 2007-05-02 20:40:17 +0200
-@@ -1005,6 +1005,8 @@ source "arch/arm/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.22.2/arch/arm/Kconfig linux-2.6.22.2-vs2.2.0.3/arch/arm/Kconfig
+--- linux-2.6.22.2/arch/arm/Kconfig 2007-07-09 13:17:32 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/arm/Kconfig 2007-06-15 02:37:02 +0200
+@@ -1042,6 +1042,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -345,9 +357,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.21/arch/arm/kernel/calls.S linux-2.6.21-vs2.2.0-rc1/arch/arm/kernel/calls.S
---- linux-2.6.21/arch/arm/kernel/calls.S 2007-05-02 19:24:17 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/arm/kernel/calls.S 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/arm/kernel/calls.S linux-2.6.22.2-vs2.2.0.3/arch/arm/kernel/calls.S
+--- linux-2.6.22.2/arch/arm/kernel/calls.S 2007-07-09 13:17:32 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/arm/kernel/calls.S 2007-07-07 03:52:53 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -357,10 +369,10 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.21/arch/arm/kernel/process.c linux-2.6.21-vs2.2.0-rc1/arch/arm/kernel/process.c
---- linux-2.6.21/arch/arm/kernel/process.c 2007-05-02 19:24:17 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/arm/kernel/process.c 2007-05-02 20:40:17 +0200
-@@ -252,7 +252,8 @@ void __show_regs(struct pt_regs *regs)
+diff -NurpP --minimal linux-2.6.22.2/arch/arm/kernel/process.c linux-2.6.22.2-vs2.2.0.3/arch/arm/kernel/process.c
+--- linux-2.6.22.2/arch/arm/kernel/process.c 2007-07-09 13:17:32 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/arm/kernel/process.c 2007-07-07 03:52:53 +0200
+@@ -261,7 +261,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
printk("\n");
@@ -370,7 +382,7 @@
__show_regs(regs);
__backtrace();
}
-@@ -414,7 +415,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+@@ -423,7 +424,8 @@ pid_t kernel_thread(int (*fn)(void *), v
regs.ARM_pc = (unsigned long)kernel_thread_helper;
regs.ARM_cpsr = SVC_MODE;
@@ -380,11 +392,11 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.21/arch/arm/kernel/traps.c linux-2.6.21-vs2.2.0-rc1/arch/arm/kernel/traps.c
---- linux-2.6.21/arch/arm/kernel/traps.c 2007-05-02 19:24:17 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/arm/kernel/traps.c 2007-05-02 20:40:17 +0200
-@@ -199,8 +199,8 @@ static void __die(const char *str, int e
- printk("Internal error: %s: %x [#%d]\n", str, err, ++die_counter);
+diff -NurpP --minimal linux-2.6.22.2/arch/arm/kernel/traps.c linux-2.6.22.2-vs2.2.0.3/arch/arm/kernel/traps.c
+--- linux-2.6.22.2/arch/arm/kernel/traps.c 2007-07-09 13:17:32 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/arm/kernel/traps.c 2007-07-09 13:11:53 +0200
+@@ -222,8 +222,8 @@ static void __die(const char *str, int e
+ str, err, ++die_counter);
print_modules();
__show_regs(regs);
- printk("Process %s (pid: %d, stack limit = 0x%p)\n",
@@ -394,10 +406,10 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.21/arch/arm/mm/fault.c linux-2.6.21-vs2.2.0-rc1/arch/arm/mm/fault.c
---- linux-2.6.21/arch/arm/mm/fault.c 2007-02-06 03:00:01 +0100
-+++ linux-2.6.21-vs2.2.0-rc1/arch/arm/mm/fault.c 2007-05-02 20:40:17 +0200
-@@ -267,7 +267,8 @@ do_page_fault(unsigned long addr, unsign
+diff -NurpP --minimal linux-2.6.22.2/arch/arm/mm/fault.c linux-2.6.22.2-vs2.2.0.3/arch/arm/mm/fault.c
+--- linux-2.6.22.2/arch/arm/mm/fault.c 2007-07-09 13:17:39 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/arm/mm/fault.c 2007-06-15 02:37:02 +0200
+@@ -266,7 +266,8 @@ do_page_fault(unsigned long addr, unsign
* happened to us that made us unable to handle
* the page fault gracefully.
*/
@@ -407,10 +419,10 @@
do_exit(SIGKILL);
return 0;
-diff -NurpP --minimal linux-2.6.21/arch/arm26/Kconfig linux-2.6.21-vs2.2.0-rc1/arch/arm26/Kconfig
---- linux-2.6.21/arch/arm26/Kconfig 2007-05-02 19:24:19 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/arm26/Kconfig 2007-05-02 20:40:17 +0200
-@@ -246,6 +246,8 @@ source "drivers/usb/Kconfig"
+diff -NurpP --minimal linux-2.6.22.2/arch/arm26/Kconfig linux-2.6.22.2-vs2.2.0.3/arch/arm26/Kconfig
+--- linux-2.6.22.2/arch/arm26/Kconfig 2007-07-09 13:17:40 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/arm26/Kconfig 2007-06-15 02:37:02 +0200
+@@ -243,6 +243,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -419,9 +431,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.21/arch/arm26/kernel/calls.S linux-2.6.21-vs2.2.0-rc1/arch/arm26/kernel/calls.S
---- linux-2.6.21/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.21-vs2.2.0-rc1/arch/arm26/kernel/calls.S 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/arm26/kernel/calls.S linux-2.6.22.2-vs2.2.0.3/arch/arm26/kernel/calls.S
+--- linux-2.6.22.2/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
++++ linux-2.6.22.2-vs2.2.0.3/arch/arm26/kernel/calls.S 2007-06-15 02:37:02 +0200
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -434,9 +446,9 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.21/arch/arm26/kernel/process.c linux-2.6.21-vs2.2.0-rc1/arch/arm26/kernel/process.c
---- linux-2.6.21/arch/arm26/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/arm26/kernel/process.c 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/arm26/kernel/process.c linux-2.6.22.2-vs2.2.0.3/arch/arm26/kernel/process.c
+--- linux-2.6.22.2/arch/arm26/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/arm26/kernel/process.c 2007-06-15 02:37:02 +0200
@@ -365,7 +365,8 @@ pid_t kernel_thread(int (*fn)(void *), v
regs.ARM_r3 = (unsigned long)do_exit;
regs.ARM_pc = (unsigned long)kernel_thread_helper | MODE_SVC26;
@@ -447,9 +459,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.21/arch/arm26/kernel/traps.c linux-2.6.21-vs2.2.0-rc1/arch/arm26/kernel/traps.c
---- linux-2.6.21/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/arm26/kernel/traps.c 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/arm26/kernel/traps.c linux-2.6.22.2-vs2.2.0.3/arch/arm26/kernel/traps.c
+--- linux-2.6.22.2/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/arm26/kernel/traps.c 2007-06-15 02:37:02 +0200
@@ -185,8 +185,9 @@ NORET_TYPE void die(const char *str, str
printk("Internal error: %s: %x\n", str, err);
printk("CPU: %d\n", smp_processor_id());
@@ -462,9 +474,9 @@
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.21/arch/cris/Kconfig linux-2.6.21-vs2.2.0-rc1/arch/cris/Kconfig
---- linux-2.6.21/arch/cris/Kconfig 2007-05-02 19:24:19 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/cris/Kconfig 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/cris/Kconfig linux-2.6.22.2-vs2.2.0.3/arch/cris/Kconfig
+--- linux-2.6.22.2/arch/cris/Kconfig 2007-05-02 19:24:19 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/cris/Kconfig 2007-06-15 02:37:02 +0200
@@ -200,6 +200,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -474,9 +486,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.21/arch/cris/arch-v10/kernel/process.c linux-2.6.21-vs2.2.0-rc1/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.21/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/cris/arch-v10/kernel/process.c 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/cris/arch-v10/kernel/process.c linux-2.6.22.2-vs2.2.0.3/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.22.2/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/cris/arch-v10/kernel/process.c 2007-06-15 02:37:02 +0200
@@ -103,7 +103,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.dccr = 1 << I_DCCR_BITNR;
@@ -487,9 +499,9 @@
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.21/arch/cris/arch-v32/kernel/process.c linux-2.6.21-vs2.2.0-rc1/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.21/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/cris/arch-v32/kernel/process.c 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/cris/arch-v32/kernel/process.c linux-2.6.22.2-vs2.2.0.3/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.22.2/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/cris/arch-v32/kernel/process.c 2007-06-15 02:37:02 +0200
@@ -120,7 +120,8 @@ kernel_thread(int (*fn)(void *), void *
regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
@@ -500,9 +512,9 @@
}
/*
-diff -NurpP --minimal linux-2.6.21/arch/frv/kernel/kernel_thread.S linux-2.6.21-vs2.2.0-rc1/arch/frv/kernel/kernel_thread.S
---- linux-2.6.21/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
-+++ linux-2.6.21-vs2.2.0-rc1/arch/frv/kernel/kernel_thread.S 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/frv/kernel/kernel_thread.S linux-2.6.22.2-vs2.2.0.3/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.22.2/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
++++ linux-2.6.22.2-vs2.2.0.3/arch/frv/kernel/kernel_thread.S 2007-06-15 02:37:02 +0200
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -521,10 +533,10 @@
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-2.6.21/arch/h8300/Kconfig linux-2.6.21-vs2.2.0-rc1/arch/h8300/Kconfig
---- linux-2.6.21/arch/h8300/Kconfig 2007-05-02 19:24:19 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/h8300/Kconfig 2007-05-02 20:40:17 +0200
-@@ -214,6 +214,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.22.2/arch/h8300/Kconfig linux-2.6.22.2-vs2.2.0.3/arch/h8300/Kconfig
+--- linux-2.6.22.2/arch/h8300/Kconfig 2007-07-09 13:17:41 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/h8300/Kconfig 2007-06-15 02:37:02 +0200
+@@ -222,6 +222,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -533,9 +545,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.21/arch/h8300/kernel/process.c linux-2.6.21-vs2.2.0-rc1/arch/h8300/kernel/process.c
---- linux-2.6.21/arch/h8300/kernel/process.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/h8300/kernel/process.c 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/h8300/kernel/process.c linux-2.6.22.2-vs2.2.0.3/arch/h8300/kernel/process.c
+--- linux-2.6.22.2/arch/h8300/kernel/process.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/h8300/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -134,7 +134,7 @@ int kernel_thread(int (*fn)(void *), voi
fs = get_fs();
@@ -545,10 +557,10 @@
__asm__("mov.l sp,er3\n\t"
"sub.l er2,er2\n\t"
"mov.l %2,er1\n\t"
-diff -NurpP --minimal linux-2.6.21/arch/i386/Kconfig linux-2.6.21-vs2.2.0-rc1/arch/i386/Kconfig
---- linux-2.6.21/arch/i386/Kconfig 2007-05-02 19:24:19 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/i386/Kconfig 2007-05-02 20:40:17 +0200
-@@ -1241,6 +1241,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.22.2/arch/i386/Kconfig linux-2.6.22.2-vs2.2.0.3/arch/i386/Kconfig
+--- linux-2.6.22.2/arch/i386/Kconfig 2007-07-09 13:17:41 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/i386/Kconfig 2007-07-09 13:11:53 +0200
+@@ -1230,6 +1230,8 @@ endmenu
source "arch/i386/Kconfig.debug"
@@ -557,10 +569,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.21/arch/i386/kernel/process.c linux-2.6.21-vs2.2.0-rc1/arch/i386/kernel/process.c
---- linux-2.6.21/arch/i386/kernel/process.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/i386/kernel/process.c 2007-05-02 20:40:17 +0200
-@@ -297,8 +297,10 @@ void show_regs(struct pt_regs * regs)
+diff -NurpP --minimal linux-2.6.22.2/arch/i386/kernel/process.c linux-2.6.22.2-vs2.2.0.3/arch/i386/kernel/process.c
+--- linux-2.6.22.2/arch/i386/kernel/process.c 2007-07-09 13:17:42 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/i386/kernel/process.c 2007-06-15 02:37:03 +0200
+@@ -302,8 +302,10 @@ void show_regs(struct pt_regs * regs)
unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
printk("\n");
@@ -573,7 +585,7 @@
print_symbol("EIP is at %s\n", regs->eip);
if (user_mode_vm(regs))
-@@ -350,7 +352,8 @@ int kernel_thread(int (*fn)(void *), voi
+@@ -355,7 +357,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.eflags = X86_EFLAGS_IF | X86_EFLAGS_SF | X86_EFLAGS_PF | 0x2;
/* Ok, create the new process.. */
@@ -583,9 +595,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.21/arch/i386/kernel/syscall_table.S linux-2.6.21-vs2.2.0-rc1/arch/i386/kernel/syscall_table.S
---- linux-2.6.21/arch/i386/kernel/syscall_table.S 2006-11-30 21:18:26 +0100
-+++ linux-2.6.21-vs2.2.0-rc1/arch/i386/kernel/syscall_table.S 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/i386/kernel/syscall_table.S linux-2.6.22.2-vs2.2.0.3/arch/i386/kernel/syscall_table.S
+--- linux-2.6.22.2/arch/i386/kernel/syscall_table.S 2007-07-09 13:17:42 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/i386/kernel/syscall_table.S 2007-06-15 02:37:03 +0200
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -595,9 +607,9 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.21/arch/i386/kernel/sysenter.c linux-2.6.21-vs2.2.0-rc1/arch/i386/kernel/sysenter.c
---- linux-2.6.21/arch/i386/kernel/sysenter.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/i386/kernel/sysenter.c 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/i386/kernel/sysenter.c linux-2.6.22.2-vs2.2.0.3/arch/i386/kernel/sysenter.c
+--- linux-2.6.22.2/arch/i386/kernel/sysenter.c 2007-07-09 13:17:42 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/i386/kernel/sysenter.c 2007-06-15 02:37:03 +0200
@@ -17,6 +17,7 @@
#include <linux/elf.h>
#include <linux/mm.h>
@@ -606,9 +618,9 @@
#include <asm/cpufeature.h>
#include <asm/msr.h>
-diff -NurpP --minimal linux-2.6.21/arch/i386/kernel/traps.c linux-2.6.21-vs2.2.0-rc1/arch/i386/kernel/traps.c
---- linux-2.6.21/arch/i386/kernel/traps.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/i386/kernel/traps.c 2007-05-02 20:52:05 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/i386/kernel/traps.c linux-2.6.22.2-vs2.2.0.3/arch/i386/kernel/traps.c
+--- linux-2.6.22.2/arch/i386/kernel/traps.c 2007-07-09 13:17:42 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/i386/kernel/traps.c 2007-06-15 02:38:37 +0200
@@ -56,6 +56,8 @@
#include <asm/stacktrace.h>
@@ -618,7 +630,7 @@
#include "mach_traps.h"
-@@ -317,8 +319,8 @@ void show_registers(struct pt_regs *regs
+@@ -303,8 +305,8 @@ void show_registers(struct pt_regs *regs
regs->esi, regs->edi, regs->ebp, esp);
printk(KERN_EMERG "ds: %04x es: %04x fs: %04x gs: %04x ss: %04x\n",
regs->xds & 0xffff, regs->xes & 0xffff, regs->xfs & 0xffff, gs, ss);
@@ -626,10 +638,10 @@
- TASK_COMM_LEN, current->comm, current->pid,
+ printk(KERN_EMERG "Process %.*s (pid: %d[#%u], ti=%p task=%p task.ti=%p)",
+ TASK_COMM_LEN, current->comm, current->pid, current->xid,
- current_thread_info(), current, current->thread_info);
+ current_thread_info(), current, task_thread_info(current));
/*
* When in-kernel, we also print out the stack and code at the
-@@ -389,6 +391,8 @@ void die(const char * str, struct pt_reg
+@@ -375,6 +377,8 @@ void die(const char * str, struct pt_reg
oops_enter();
@@ -638,7 +650,7 @@
if (die.lock_owner != raw_smp_processor_id()) {
console_verbose();
spin_lock_irqsave(&die.lock, flags);
-@@ -426,9 +430,9 @@ void die(const char * str, struct pt_reg
+@@ -412,9 +416,9 @@ void die(const char * str, struct pt_reg
if (nl)
printk("\n");
if (notify_die(DIE_OOPS, str, regs, err,
@@ -650,10 +662,10 @@
/* Executive summary in case the oops scrolled away */
esp = (unsigned long) (®s->esp);
savesegment(ss, ss);
-diff -NurpP --minimal linux-2.6.21/arch/i386/mm/fault.c linux-2.6.21-vs2.2.0-rc1/arch/i386/mm/fault.c
---- linux-2.6.21/arch/i386/mm/fault.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/i386/mm/fault.c 2007-05-02 20:40:17 +0200
-@@ -566,7 +566,8 @@ out_of_memory:
+diff -NurpP --minimal linux-2.6.22.2/arch/i386/mm/fault.c linux-2.6.22.2-vs2.2.0.3/arch/i386/mm/fault.c
+--- linux-2.6.22.2/arch/i386/mm/fault.c 2007-07-09 13:17:43 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/i386/mm/fault.c 2007-06-17 05:54:16 +0200
+@@ -586,7 +586,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
}
@@ -663,10 +675,10 @@
if (error_code & 4)
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.21/arch/ia64/Kconfig linux-2.6.21-vs2.2.0-rc1/arch/ia64/Kconfig
---- linux-2.6.21/arch/ia64/Kconfig 2007-05-02 19:24:20 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/ia64/Kconfig 2007-05-02 20:40:17 +0200
-@@ -577,6 +577,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.22.2/arch/ia64/Kconfig linux-2.6.22.2-vs2.2.0.3/arch/ia64/Kconfig
+--- linux-2.6.22.2/arch/ia64/Kconfig 2007-07-09 13:17:43 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/ia64/Kconfig 2007-06-15 02:37:03 +0200
+@@ -592,6 +592,8 @@ endmenu
source "arch/ia64/Kconfig.debug"
@@ -675,9 +687,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.21/arch/ia64/ia32/binfmt_elf32.c linux-2.6.21-vs2.2.0-rc1/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.21/arch/ia64/ia32/binfmt_elf32.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/ia64/ia32/binfmt_elf32.c 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/ia64/ia32/binfmt_elf32.c linux-2.6.22.2-vs2.2.0.3/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.22.2/arch/ia64/ia32/binfmt_elf32.c 2007-05-02 19:24:20 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/ia64/ia32/binfmt_elf32.c 2007-06-15 02:37:03 +0200
@@ -233,7 +233,8 @@ ia32_setup_arg_pages (struct linux_binpr
kmem_cache_free(vm_area_cachep, mpnt);
return ret;
@@ -688,10 +700,10 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.21/arch/ia64/ia32/ia32_entry.S linux-2.6.21-vs2.2.0-rc1/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.21/arch/ia64/ia32/ia32_entry.S 2007-05-02 19:24:20 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/ia64/ia32/ia32_entry.S 2007-05-02 20:40:17 +0200
-@@ -483,7 +483,7 @@ ia32_syscall_table:
+diff -NurpP --minimal linux-2.6.22.2/arch/ia64/ia32/ia32_entry.S linux-2.6.22.2-vs2.2.0.3/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.22.2/arch/ia64/ia32/ia32_entry.S 2007-07-09 13:17:43 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/ia64/ia32/ia32_entry.S 2007-06-15 02:37:03 +0200
+@@ -446,7 +446,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
data8 sys32_fadvise64_64
@@ -700,9 +712,9 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.21/arch/ia64/ia32/sys_ia32.c linux-2.6.21-vs2.2.0-rc1/arch/ia64/ia32/sys_ia32.c
---- linux-2.6.21/arch/ia64/ia32/sys_ia32.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/ia64/ia32/sys_ia32.c 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/ia64/ia32/sys_ia32.c linux-2.6.22.2-vs2.2.0.3/arch/ia64/ia32/sys_ia32.c
+--- linux-2.6.22.2/arch/ia64/ia32/sys_ia32.c 2007-05-02 19:24:20 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/ia64/ia32/sys_ia32.c 2007-06-15 02:37:03 +0200
@@ -1182,7 +1182,7 @@ sys32_gettimeofday (struct compat_timeva
{
if (tv) {
@@ -712,9 +724,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.21/arch/ia64/kernel/asm-offsets.c linux-2.6.21-vs2.2.0-rc1/arch/ia64/kernel/asm-offsets.c
---- linux-2.6.21/arch/ia64/kernel/asm-offsets.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/ia64/kernel/asm-offsets.c 2007-05-02 20:40:17 +0200
+diff -NurpP --minimal linux-2.6.22.2/arch/ia64/kernel/asm-offsets.c linux-2.6.22.2-vs2.2.0.3/arch/ia64/kernel/asm-offsets.c
+--- linux-2.6.22.2/arch/ia64/kernel/asm-offsets.c 2007-05-02 19:24:20 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/ia64/kernel/asm-offsets.c 2007-06-15 02:37:03 +0200
@@ -192,6 +192,7 @@ void foo(void)
/* for assembly files which can't include sched.h: */
DEFINE(IA64_CLONE_VFORK, CLONE_VFORK);
@@ -723,10 +735,10 @@
BLANK();
DEFINE(IA64_CPUINFO_NSEC_PER_CYC_OFFSET,
-diff -NurpP --minimal linux-2.6.21/arch/ia64/kernel/entry.S linux-2.6.21-vs2.2.0-rc1/arch/ia64/kernel/entry.S
---- linux-2.6.21/arch/ia64/kernel/entry.S 2007-05-02 19:24:20 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/arch/ia64/kernel/entry.S 2007-05-02 20:40:17 +0200
-@@ -1576,7 +1576,7 @@ sys_call_table:
+diff -NurpP --minimal linux-2.6.22.2/arch/ia64/kernel/entry.S linux-2.6.22.2-vs2.2.0.3/arch/ia64/kernel/entry.S
+--- linux-2.6.22.2/arch/ia64/kernel/entry.S 2007-07-09 13:17:43 +0200
++++ linux-2.6.22.2-vs2.2.0.3/arch/ia64/kernel/entry.S 2007-06-15 02:37:03 +0200
+@@ -1547,7 +1547,7 @@ sys_call_table:
data8 sys_mq_notify
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-vs2.2.patch?r1=1.1.4.3&r2=1.1.4.4&f=u
More information about the pld-cvs-commit
mailing list