SOURCES (LINUX_2_6): linux-2.6-vs2.3.patch - patch-2.6.23-rc9-vs2....
zbyniu
zbyniu at pld-linux.org
Tue Oct 9 16:39:08 CEST 2007
Author: zbyniu Date: Tue Oct 9 14:39:08 2007 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- patch-2.6.23-rc9-vs2.3.0-pre2.diff
---- Files affected:
SOURCES:
linux-2.6-vs2.3.patch (1.2.4.11.2.11 -> 1.2.4.11.2.12)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.11 SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.12
--- SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.11 Sat Oct 6 11:51:07 2007
+++ SOURCES/linux-2.6-vs2.3.patch Tue Oct 9 16:39:02 2007
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.22.9/Documentation/vserver/debug.txt linux-2.6.22.9-vs2.3.0.26.4/Documentation/vserver/debug.txt
---- linux-2.6.22.9/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.3.0.26.4/Documentation/vserver/debug.txt 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/Documentation/vserver/debug.txt linux-2.6.23-rc9-vs2.3.0-pre2/Documentation/vserver/debug.txt
+--- linux-2.6.23-rc9/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
++++ linux-2.6.23-rc9-vs2.3.0-pre2/Documentation/vserver/debug.txt 2007-09-13 03:59:33 +0200
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,22 +156,22 @@
+ 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.22.9/Makefile linux-2.6.22.9-vs2.3.0.26.4/Makefile
---- linux-2.6.22.9/Makefile 2007-09-30 15:54:33 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/Makefile 2007-10-05 16:29:34 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/Makefile linux-2.6.23-rc9-vs2.3.0-pre2/Makefile
+--- linux-2.6.23-rc9/Makefile 2007-10-07 13:49:25 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/Makefile 2007-10-07 14:26:35 +0200
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
- SUBLEVEL = 22
--EXTRAVERSION = .9
-+EXTRAVERSION = .9-vs2.3.0.26.4
- NAME = Holy Dancing Manatees, Batman!
+ SUBLEVEL = 23
+-EXTRAVERSION =-rc9
++EXTRAVERSION = -rc9-vs2.3.0-pre2
+ NAME = Arr Matey! A Hairy Bilge Rat!
# *DOCUMENTATION*
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/Kconfig linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/Kconfig
---- linux-2.6.22.9/arch/alpha/Kconfig 2007-07-09 13:17:31 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/Kconfig 2007-08-05 20:53:12 +0200
-@@ -662,6 +662,8 @@ config DUMMY_CONSOLE
+diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/Kconfig linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/Kconfig
+--- linux-2.6.23-rc9/arch/alpha/Kconfig 2007-09-12 01:54:36 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/Kconfig 2007-09-13 03:59:33 +0200
+@@ -665,6 +665,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -180,9 +180,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/kernel/asm-offsets.c linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.22.9/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10 +0100
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/kernel/asm-offsets.c 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/kernel/asm-offsets.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.23-rc9/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10 +0100
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/asm-offsets.c 2007-09-13 03:59:33 +0200
@@ -36,6 +36,7 @@ void foo(void)
DEFINE(PT_PTRACED, PT_PTRACED);
DEFINE(CLONE_VM, CLONE_VM);
@@ -191,9 +191,9 @@
DEFINE(SIGCHLD, SIGCHLD);
BLANK();
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/kernel/entry.S linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/kernel/entry.S
---- linux-2.6.22.9/arch/alpha/kernel/entry.S 2007-07-09 13:17:31 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/kernel/entry.S 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/kernel/entry.S linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/entry.S
+--- linux-2.6.23-rc9/arch/alpha/kernel/entry.S 2007-07-09 13:17:31 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/entry.S 2007-09-13 03:59:33 +0200
@@ -643,7 +643,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
@@ -235,9 +235,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/kernel/osf_sys.c linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/kernel/osf_sys.c
---- linux-2.6.22.9/arch/alpha/kernel/osf_sys.c 2007-07-09 13:17:31 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/kernel/osf_sys.c 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/kernel/osf_sys.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.23-rc9/arch/alpha/kernel/osf_sys.c 2007-07-09 13:17:31 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/osf_sys.c 2007-09-13 03:59:33 +0200
@@ -883,7 +883,7 @@ osf_gettimeofday(struct timeval32 __user
{
if (tv) {
@@ -247,9 +247,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/kernel/ptrace.c linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/kernel/ptrace.c
---- linux-2.6.22.9/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/kernel/ptrace.c 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/kernel/ptrace.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/ptrace.c
+--- linux-2.6.23-rc9/arch/alpha/kernel/ptrace.c 2007-09-12 01:54:36 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/ptrace.c 2007-09-13 03:59:33 +0200
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -270,9 +270,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/kernel/semaphore.c linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/kernel/semaphore.c
---- linux-2.6.22.9/arch/alpha/kernel/semaphore.c 2004-08-14 12:55:32 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/kernel/semaphore.c 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/kernel/semaphore.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/semaphore.c
+--- linux-2.6.23-rc9/arch/alpha/kernel/semaphore.c 2004-08-14 12:55:32 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/semaphore.c 2007-09-13 03:59:33 +0200
@@ -68,8 +68,8 @@ __down_failed(struct semaphore *sem)
DECLARE_WAITQUEUE(wait, tsk);
@@ -306,9 +306,9 @@
#endif
tsk->state = TASK_INTERRUPTIBLE;
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/kernel/systbls.S linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/kernel/systbls.S
---- linux-2.6.22.9/arch/alpha/kernel/systbls.S 2007-07-09 13:17:31 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/kernel/systbls.S 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/kernel/systbls.S linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/systbls.S
+--- linux-2.6.23-rc9/arch/alpha/kernel/systbls.S 2007-07-09 13:17:31 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/systbls.S 2007-09-13 03:59:33 +0200
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -318,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.22.9/arch/alpha/kernel/traps.c linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/kernel/traps.c
---- linux-2.6.22.9/arch/alpha/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/kernel/traps.c 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/kernel/traps.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/traps.c
+--- linux-2.6.23-rc9/arch/alpha/kernel/traps.c 2007-09-12 01:54:36 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/traps.c 2007-09-13 03:59:33 +0200
@@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -329,12 +329,12 @@
+ printk("%s(%d[#%u]): %s %ld\n", current->comm,
+ current->pid, current->xid, str, err);
dik_show_regs(regs, r9_15);
+ add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
- dik_show_code((unsigned int *)regs->pc);
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/mm/fault.c linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/mm/fault.c
---- linux-2.6.22.9/arch/alpha/mm/fault.c 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/alpha/mm/fault.c 2007-08-05 20:53:12 +0200
-@@ -197,8 +197,8 @@ do_page_fault(unsigned long address, uns
+diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/mm/fault.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/mm/fault.c
+--- linux-2.6.23-rc9/arch/alpha/mm/fault.c 2007-09-12 01:54:36 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/mm/fault.c 2007-09-13 03:59:33 +0200
+@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
}
@@ -345,10 +345,10 @@
if (!user_mode(regs))
goto no_context;
do_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.22.9/arch/arm/Kconfig linux-2.6.22.9-vs2.3.0.26.4/arch/arm/Kconfig
---- linux-2.6.22.9/arch/arm/Kconfig 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/arm/Kconfig 2007-08-05 20:53:12 +0200
-@@ -1042,6 +1042,8 @@ source "arch/arm/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.23-rc9/arch/arm/Kconfig linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/Kconfig
+--- linux-2.6.23-rc9/arch/arm/Kconfig 2007-09-12 01:54:36 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/Kconfig 2007-09-13 03:59:33 +0200
+@@ -1063,6 +1063,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -357,9 +357,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/arm/kernel/calls.S linux-2.6.22.9-vs2.3.0.26.4/arch/arm/kernel/calls.S
---- linux-2.6.22.9/arch/arm/kernel/calls.S 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/arm/kernel/calls.S 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/arm/kernel/calls.S linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/calls.S
+--- linux-2.6.23-rc9/arch/arm/kernel/calls.S 2007-07-09 13:17:32 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/calls.S 2007-09-13 03:59:33 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -369,10 +369,22 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.22.9/arch/arm/kernel/process.c linux-2.6.22.9-vs2.3.0.26.4/arch/arm/kernel/process.c
---- linux-2.6.22.9/arch/arm/kernel/process.c 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/arm/kernel/process.c 2007-08-05 20:53:12 +0200
-@@ -261,7 +261,8 @@ void __show_regs(struct pt_regs *regs)
+diff -NurpP --minimal linux-2.6.23-rc9/arch/arm/kernel/ecard.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/ecard.c
+--- linux-2.6.23-rc9/arch/arm/kernel/ecard.c 2007-07-09 13:17:32 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/ecard.c 2007-10-01 18:33:50 +0200
+@@ -249,7 +249,7 @@ static void ecard_init_pgtables(struct m
+
+ static int ecard_init_mm(void)
+ {
+- struct mm_struct * mm = mm_alloc();
++ struct mm_struct * mm = mm_alloc(current->vx_info);
+ struct mm_struct *active_mm = current->active_mm;
+
+ if (!mm)
+diff -NurpP --minimal linux-2.6.23-rc9/arch/arm/kernel/process.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/process.c
+--- linux-2.6.23-rc9/arch/arm/kernel/process.c 2007-09-12 01:54:36 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/process.c 2007-09-13 03:59:33 +0200
+@@ -265,7 +265,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
printk("\n");
@@ -382,7 +394,7 @@
__show_regs(regs);
__backtrace();
}
-@@ -423,7 +424,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+@@ -427,7 +428,8 @@ pid_t kernel_thread(int (*fn)(void *), v
regs.ARM_pc = (unsigned long)kernel_thread_helper;
regs.ARM_cpsr = SVC_MODE;
@@ -392,9 +404,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.22.9/arch/arm/kernel/traps.c linux-2.6.22.9-vs2.3.0.26.4/arch/arm/kernel/traps.c
---- linux-2.6.22.9/arch/arm/kernel/traps.c 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/arm/kernel/traps.c 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/arm/kernel/traps.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/traps.c
+--- linux-2.6.23-rc9/arch/arm/kernel/traps.c 2007-09-12 01:54:36 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/traps.c 2007-09-13 03:59:33 +0200
@@ -222,8 +222,8 @@ static void __die(const char *str, int e
str, err, ++die_counter);
print_modules();
@@ -406,10 +418,10 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.22.9/arch/arm/mm/fault.c linux-2.6.22.9-vs2.3.0.26.4/arch/arm/mm/fault.c
---- linux-2.6.22.9/arch/arm/mm/fault.c 2007-07-09 13:17:39 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/arm/mm/fault.c 2007-08-05 20:53:12 +0200
-@@ -266,7 +266,8 @@ do_page_fault(unsigned long addr, unsign
+diff -NurpP --minimal linux-2.6.23-rc9/arch/arm/mm/fault.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/mm/fault.c
+--- linux-2.6.23-rc9/arch/arm/mm/fault.c 2007-09-12 01:54:40 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/mm/fault.c 2007-09-13 03:59:33 +0200
+@@ -265,7 +265,8 @@ do_page_fault(unsigned long addr, unsign
* happened to us that made us unable to handle
* the page fault gracefully.
*/
@@ -418,66 +430,11 @@
+ tsk->comm, tsk->pid, tsk->xid);
do_exit(SIGKILL);
return 0;
-
-diff -NurpP --minimal linux-2.6.22.9/arch/arm26/Kconfig linux-2.6.22.9-vs2.3.0.26.4/arch/arm26/Kconfig
---- linux-2.6.22.9/arch/arm26/Kconfig 2007-07-09 13:17:40 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/arm26/Kconfig 2007-08-05 20:53:12 +0200
-@@ -243,6 +243,8 @@ source "drivers/usb/Kconfig"
-
- source "arch/arm26/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/arm26/kernel/calls.S linux-2.6.22.9-vs2.3.0.26.4/arch/arm26/kernel/calls.S
---- linux-2.6.22.9/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/arm26/kernel/calls.S 2007-08-05 20:53:12 +0200
-@@ -257,6 +257,11 @@ __syscall_start:
- .long sys_lremovexattr
- .long sys_fremovexattr
- .long sys_tkill
-+
-+ .rept 313 - (. - __syscall_start) / 4
-+ .long sys_ni_syscall
-+ .endr
-+ .long sys_vserver /* 313 */
- __syscall_end:
-
- .rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.22.9/arch/arm26/kernel/process.c linux-2.6.22.9-vs2.3.0.26.4/arch/arm26/kernel/process.c
---- linux-2.6.22.9/arch/arm26/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/arm26/kernel/process.c 2007-08-05 20:53:12 +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;
-
-- return do_fork(flags|CLONE_VM|CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
-+ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
-+ 0, ®s, 0, NULL, NULL);
- }
- EXPORT_SYMBOL(kernel_thread);
-
-diff -NurpP --minimal linux-2.6.22.9/arch/arm26/kernel/traps.c linux-2.6.22.9-vs2.3.0.26.4/arch/arm26/kernel/traps.c
---- linux-2.6.22.9/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/arm26/kernel/traps.c 2007-08-05 20:53:12 +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());
- show_regs(regs);
-- printk("Process %s (pid: %d, stack limit = 0x%p)\n",
-- current->comm, current->pid, end_of_stack(tsk));
-+ printk("Process %s (pid: %d[#%u], stack limit = 0x%p)\n",
-+ current->comm, current->pid,
-+ current->xid, end_of_stack(tsk));
-
- if (!user_mode(regs) || in_interrupt()) {
- __dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.22.9/arch/cris/Kconfig linux-2.6.22.9-vs2.3.0.26.4/arch/cris/Kconfig
---- linux-2.6.22.9/arch/cris/Kconfig 2007-05-02 19:24:19 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/cris/Kconfig 2007-08-05 20:53:12 +0200
-@@ -200,6 +200,8 @@ source "drivers/usb/Kconfig"
+ }
+diff -NurpP --minimal linux-2.6.23-rc9/arch/cris/Kconfig linux-2.6.23-rc9-vs2.3.0-pre2/arch/cris/Kconfig
+--- linux-2.6.23-rc9/arch/cris/Kconfig 2007-09-12 01:54:41 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/cris/Kconfig 2007-09-13 03:59:33 +0200
+@@ -198,6 +198,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -486,9 +443,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/cris/arch-v10/kernel/process.c linux-2.6.22.9-vs2.3.0.26.4/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.22.9/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/cris/arch-v10/kernel/process.c 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/cris/arch-v10/kernel/process.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.23-rc9/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/cris/arch-v10/kernel/process.c 2007-09-13 03:59:33 +0200
@@ -103,7 +103,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.dccr = 1 << I_DCCR_BITNR;
@@ -499,9 +456,9 @@
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.22.9/arch/cris/arch-v32/kernel/process.c linux-2.6.22.9-vs2.3.0.26.4/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.22.9/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/cris/arch-v32/kernel/process.c 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/cris/arch-v32/kernel/process.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.23-rc9/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/cris/arch-v32/kernel/process.c 2007-09-13 03:59:33 +0200
@@ -120,7 +120,8 @@ kernel_thread(int (*fn)(void *), void *
regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
@@ -512,9 +469,9 @@
}
/*
-diff -NurpP --minimal linux-2.6.22.9/arch/frv/kernel/kernel_thread.S linux-2.6.22.9-vs2.3.0.26.4/arch/frv/kernel/kernel_thread.S
---- linux-2.6.22.9/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/frv/kernel/kernel_thread.S 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/frv/kernel/kernel_thread.S linux-2.6.23-rc9-vs2.3.0-pre2/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.23-rc9/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/frv/kernel/kernel_thread.S 2007-09-13 03:59:33 +0200
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -533,10 +490,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.22.9/arch/h8300/Kconfig linux-2.6.22.9-vs2.3.0.26.4/arch/h8300/Kconfig
---- linux-2.6.22.9/arch/h8300/Kconfig 2007-07-09 13:17:41 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/h8300/Kconfig 2007-08-05 20:53:12 +0200
-@@ -222,6 +222,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.23-rc9/arch/h8300/Kconfig linux-2.6.23-rc9-vs2.3.0-pre2/arch/h8300/Kconfig
+--- linux-2.6.23-rc9/arch/h8300/Kconfig 2007-09-12 01:54:42 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/h8300/Kconfig 2007-09-13 03:59:33 +0200
+@@ -225,6 +225,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -545,10 +502,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/h8300/kernel/process.c linux-2.6.22.9-vs2.3.0.26.4/arch/h8300/kernel/process.c
---- linux-2.6.22.9/arch/h8300/kernel/process.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/h8300/kernel/process.c 2007-08-05 20:53:12 +0200
-@@ -134,7 +134,7 @@ int kernel_thread(int (*fn)(void *), voi
+diff -NurpP --minimal linux-2.6.23-rc9/arch/h8300/kernel/process.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/h8300/kernel/process.c
+--- linux-2.6.23-rc9/arch/h8300/kernel/process.c 2007-09-12 01:54:42 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/h8300/kernel/process.c 2007-09-13 03:59:33 +0200
+@@ -135,7 +135,7 @@ int kernel_thread(int (*fn)(void *), voi
fs = get_fs();
set_fs (KERNEL_DS);
@@ -557,10 +514,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.22.9/arch/i386/Kconfig linux-2.6.22.9-vs2.3.0.26.4/arch/i386/Kconfig
---- linux-2.6.22.9/arch/i386/Kconfig 2007-07-09 13:17:41 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/i386/Kconfig 2007-08-05 20:53:12 +0200
-@@ -1230,6 +1230,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.23-rc9/arch/i386/Kconfig linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/Kconfig
+--- linux-2.6.23-rc9/arch/i386/Kconfig 2007-09-12 01:54:42 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/Kconfig 2007-09-13 03:59:33 +0200
+@@ -1256,6 +1256,8 @@ endif # INSTRUMENTATION
source "arch/i386/Kconfig.debug"
@@ -569,11 +526,11 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/i386/kernel/process.c linux-2.6.22.9-vs2.3.0.26.4/arch/i386/kernel/process.c
---- linux-2.6.22.9/arch/i386/kernel/process.c 2007-07-09 13:17:42 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/i386/kernel/process.c 2007-08-05 20:53:12 +0200
-@@ -302,8 +302,10 @@ void show_regs(struct pt_regs * regs)
- unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
+diff -NurpP --minimal linux-2.6.23-rc9/arch/i386/kernel/process.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/process.c
+--- linux-2.6.23-rc9/arch/i386/kernel/process.c 2007-09-12 01:54:44 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/process.c 2007-09-13 03:59:33 +0200
+@@ -303,8 +303,10 @@ void show_regs(struct pt_regs * regs)
+ unsigned long d0, d1, d2, d3, d6, d7;
printk("\n");
- printk("Pid: %d, comm: %20s\n", current->pid, current->comm);
@@ -585,7 +542,7 @@
print_symbol("EIP is at %s\n", regs->eip);
if (user_mode_vm(regs))
-@@ -355,7 +357,8 @@ int kernel_thread(int (*fn)(void *), voi
+@@ -367,7 +369,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.. */
@@ -595,9 +552,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.22.9/arch/i386/kernel/syscall_table.S linux-2.6.22.9-vs2.3.0.26.4/arch/i386/kernel/syscall_table.S
---- linux-2.6.22.9/arch/i386/kernel/syscall_table.S 2007-07-09 13:17:42 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/i386/kernel/syscall_table.S 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/i386/kernel/syscall_table.S linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/syscall_table.S
+--- linux-2.6.23-rc9/arch/i386/kernel/syscall_table.S 2007-09-12 01:54:44 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/syscall_table.S 2007-09-13 03:59:33 +0200
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -607,21 +564,21 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.22.9/arch/i386/kernel/sysenter.c linux-2.6.22.9-vs2.3.0.26.4/arch/i386/kernel/sysenter.c
---- linux-2.6.22.9/arch/i386/kernel/sysenter.c 2007-09-05 03:37:48 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/i386/kernel/sysenter.c 2007-09-05 03:06:10 +0200
-@@ -17,6 +17,7 @@
- #include <linux/elf.h>
+diff -NurpP --minimal linux-2.6.23-rc9/arch/i386/kernel/sysenter.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/sysenter.c
+--- linux-2.6.23-rc9/arch/i386/kernel/sysenter.c 2007-09-12 01:54:44 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/sysenter.c 2007-09-13 03:59:33 +0200
+@@ -18,6 +18,7 @@
#include <linux/mm.h>
+ #include <linux/err.h>
#include <linux/module.h>
+#include <linux/vs_memory.h>
#include <asm/cpufeature.h>
#include <asm/msr.h>
-diff -NurpP --minimal linux-2.6.22.9/arch/i386/kernel/traps.c linux-2.6.22.9-vs2.3.0.26.4/arch/i386/kernel/traps.c
---- linux-2.6.22.9/arch/i386/kernel/traps.c 2007-07-09 13:17:42 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/i386/kernel/traps.c 2007-08-05 20:53:12 +0200
-@@ -56,6 +56,8 @@
+diff -NurpP --minimal linux-2.6.23-rc9/arch/i386/kernel/traps.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/traps.c
+--- linux-2.6.23-rc9/arch/i386/kernel/traps.c 2007-09-12 01:54:44 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/traps.c 2007-09-13 03:59:33 +0200
+@@ -60,6 +60,8 @@
#include <asm/stacktrace.h>
#include <linux/module.h>
@@ -630,7 +587,7 @@
#include "mach_traps.h"
-@@ -303,8 +305,8 @@ void show_registers(struct pt_regs *regs
+@@ -317,8 +319,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);
@@ -641,7 +598,7 @@
current_thread_info(), current, task_thread_info(current));
/*
* When in-kernel, we also print out the stack and code at the
-@@ -375,6 +377,8 @@ void die(const char * str, struct pt_reg
+@@ -389,6 +391,8 @@ void die(const char * str, struct pt_reg
oops_enter();
@@ -650,7 +607,7 @@
if (die.lock_owner != raw_smp_processor_id()) {
console_verbose();
spin_lock_irqsave(&die.lock, flags);
-@@ -412,9 +416,9 @@ void die(const char * str, struct pt_reg
+@@ -426,9 +430,9 @@ void die(const char * str, struct pt_reg
if (nl)
printk("\n");
if (notify_die(DIE_OOPS, str, regs, err,
@@ -662,10 +619,10 @@
/* Executive summary in case the oops scrolled away */
esp = (unsigned long) (®s->esp);
savesegment(ss, ss);
-diff -NurpP --minimal linux-2.6.22.9/arch/i386/mm/fault.c linux-2.6.22.9-vs2.3.0.26.4/arch/i386/mm/fault.c
---- linux-2.6.22.9/arch/i386/mm/fault.c 2007-09-05 03:37:48 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/i386/mm/fault.c 2007-09-05 03:06:10 +0200
-@@ -587,7 +587,8 @@ out_of_memory:
+diff -NurpP --minimal linux-2.6.23-rc9/arch/i386/mm/fault.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/mm/fault.c
+--- linux-2.6.23-rc9/arch/i386/mm/fault.c 2007-09-12 01:54:44 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/mm/fault.c 2007-09-13 03:59:33 +0200
+@@ -596,7 +596,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
}
@@ -675,10 +632,10 @@
if (error_code & 4)
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/Kconfig linux-2.6.22.9-vs2.3.0.26.4/arch/ia64/Kconfig
---- linux-2.6.22.9/arch/ia64/Kconfig 2007-07-09 13:17:43 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/ia64/Kconfig 2007-08-05 20:53:12 +0200
-@@ -592,6 +592,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.23-rc9/arch/ia64/Kconfig linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/Kconfig
+--- linux-2.6.23-rc9/arch/ia64/Kconfig 2007-09-12 01:54:44 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/Kconfig 2007-09-13 03:59:33 +0200
+@@ -591,6 +591,8 @@ endmenu
source "arch/ia64/Kconfig.debug"
@@ -687,22 +644,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/ia32/binfmt_elf32.c linux-2.6.22.9-vs2.3.0.26.4/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.22.9/arch/ia64/ia32/binfmt_elf32.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/ia64/ia32/binfmt_elf32.c 2007-08-05 20:53:12 +0200
-@@ -233,7 +233,8 @@ ia32_setup_arg_pages (struct linux_binpr
- kmem_cache_free(vm_area_cachep, mpnt);
- return ret;
- }
-- current->mm->stack_vm = current->mm->total_vm = vma_pages(mpnt);
-+ vx_vmpages_sub(current->mm, current->mm->total_vm - vma_pages(mpnt));
-+ current->mm->stack_vm = current->mm->total_vm;
- }
-
- for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/ia32/ia32_entry.S linux-2.6.22.9-vs2.3.0.26.4/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.22.9/arch/ia64/ia32/ia32_entry.S 2007-07-09 13:17:43 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/ia64/ia32/ia32_entry.S 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/ia64/ia32/ia32_entry.S linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.23-rc9/arch/ia64/ia32/ia32_entry.S 2007-09-12 01:54:45 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/ia32/ia32_entry.S 2007-09-13 03:59:33 +0200
@@ -446,7 +446,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -712,9 +656,9 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/ia32/sys_ia32.c linux-2.6.22.9-vs2.3.0.26.4/arch/ia64/ia32/sys_ia32.c
---- linux-2.6.22.9/arch/ia64/ia32/sys_ia32.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/ia64/ia32/sys_ia32.c 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/ia64/ia32/sys_ia32.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/ia32/sys_ia32.c
+--- linux-2.6.23-rc9/arch/ia64/ia32/sys_ia32.c 2007-09-12 01:54:45 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/ia32/sys_ia32.c 2007-09-13 03:59:33 +0200
@@ -1182,7 +1182,7 @@ sys32_gettimeofday (struct compat_timeva
{
if (tv) {
@@ -724,10 +668,10 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/kernel/asm-offsets.c linux-2.6.22.9-vs2.3.0.26.4/arch/ia64/kernel/asm-offsets.c
---- linux-2.6.22.9/arch/ia64/kernel/asm-offsets.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/ia64/kernel/asm-offsets.c 2007-08-05 20:53:12 +0200
-@@ -192,6 +192,7 @@ void foo(void)
+diff -NurpP --minimal linux-2.6.23-rc9/arch/ia64/kernel/asm-offsets.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/kernel/asm-offsets.c
+--- linux-2.6.23-rc9/arch/ia64/kernel/asm-offsets.c 2007-09-12 01:54:45 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/kernel/asm-offsets.c 2007-09-13 03:59:33 +0200
+@@ -194,6 +194,7 @@ void foo(void)
/* for assembly files which can't include sched.h: */
DEFINE(IA64_CLONE_VFORK, CLONE_VFORK);
DEFINE(IA64_CLONE_VM, CLONE_VM);
@@ -735,9 +679,9 @@
BLANK();
DEFINE(IA64_CPUINFO_NSEC_PER_CYC_OFFSET,
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/kernel/entry.S linux-2.6.22.9-vs2.3.0.26.4/arch/ia64/kernel/entry.S
---- linux-2.6.22.9/arch/ia64/kernel/entry.S 2007-07-09 13:17:43 +0200
-+++ linux-2.6.22.9-vs2.3.0.26.4/arch/ia64/kernel/entry.S 2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.23-rc9/arch/ia64/kernel/entry.S linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/kernel/entry.S
+--- linux-2.6.23-rc9/arch/ia64/kernel/entry.S 2007-09-12 01:54:45 +0200
++++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/kernel/entry.S 2007-09-13 03:59:33 +0200
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.4.11.2.11&r2=1.2.4.11.2.12&f=u
More information about the pld-cvs-commit
mailing list