SOURCES (LINUX_2_6): linux-2.6-vs2.1.patch - vs2.1.1-rc3
baggins
baggins at pld-linux.org
Mon Feb 13 19:16:55 CET 2006
Author: baggins Date: Mon Feb 13 18:16:55 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- vs2.1.1-rc3
---- Files affected:
SOURCES:
linux-2.6-vs2.1.patch (1.1.2.8 -> 1.1.2.9)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.8 SOURCES/linux-2.6-vs2.1.patch:1.1.2.9
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.8 Mon Feb 13 18:54:52 2006
+++ SOURCES/linux-2.6-vs2.1.patch Mon Feb 13 19:16:49 2006
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.15.4/Documentation/vserver/debug.txt linux-2.6.15.4-vs2.1.1-rc2/Documentation/vserver/debug.txt
+diff -NurpP --minimal linux-2.6.15.4/Documentation/vserver/debug.txt linux-2.6.15.4-vs2.1.1-rc3/Documentation/vserver/debug.txt
--- linux-2.6.15.4/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/Documentation/vserver/debug.txt 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/Documentation/vserver/debug.txt 2006-01-04 21:59:59 +0100
@@ -0,0 +1,106 @@
+
+debug_cvirt:
@@ -120,9 +120,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/asm-offsets.c linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/asm-offsets.c
+diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/asm-offsets.c linux-2.6.15.4-vs2.1.1-rc3/arch/alpha/kernel/asm-offsets.c
--- linux-2.6.15.4/arch/alpha/kernel/asm-offsets.c 2004-08-14 12:56:24 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/asm-offsets.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/alpha/kernel/asm-offsets.c 2006-01-04 21:59:59 +0100
@@ -35,6 +35,7 @@ void foo(void)
DEFINE(PT_PTRACED, PT_PTRACED);
DEFINE(CLONE_VM, CLONE_VM);
@@ -131,9 +131,9 @@
DEFINE(SIGCHLD, SIGCHLD);
BLANK();
-diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/entry.S linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/entry.S
+diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/entry.S linux-2.6.15.4-vs2.1.1-rc3/arch/alpha/kernel/entry.S
--- linux-2.6.15.4/arch/alpha/kernel/entry.S 2005-10-28 20:49:08 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/entry.S 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/alpha/kernel/entry.S 2006-01-04 21:59:59 +0100
@@ -645,7 +645,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
@@ -173,9 +173,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/ptrace.c linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/ptrace.c linux-2.6.15.4-vs2.1.1-rc3/arch/alpha/kernel/ptrace.c
--- linux-2.6.15.4/arch/alpha/kernel/ptrace.c 2005-06-22 02:37:51 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/ptrace.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/alpha/kernel/ptrace.c 2006-01-04 21:59:59 +0100
@@ -289,6 +289,8 @@ do_sys_ptrace(long request, long pid, lo
read_unlock(&tasklist_lock);
if (!child)
@@ -185,9 +185,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
-diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/systbls.S linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/systbls.S
+diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/systbls.S linux-2.6.15.4-vs2.1.1-rc3/arch/alpha/kernel/systbls.S
--- linux-2.6.15.4/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/systbls.S 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/alpha/kernel/systbls.S 2006-01-04 21:59:59 +0100
@@ -447,7 +447,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -197,9 +197,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.15.4/arch/alpha/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/traps.c
+diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc3/arch/alpha/kernel/traps.c
--- linux-2.6.15.4/arch/alpha/kernel/traps.c 2005-10-28 20:49:08 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/kernel/traps.c 2006-02-12 14:28:46 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/alpha/kernel/traps.c 2006-02-12 14:28:46 +0100
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -210,9 +210,9 @@
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.15.4/arch/alpha/mm/init.c linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/mm/init.c
+diff -NurpP --minimal linux-2.6.15.4/arch/alpha/mm/init.c linux-2.6.15.4-vs2.1.1-rc3/arch/alpha/mm/init.c
--- linux-2.6.15.4/arch/alpha/mm/init.c 2005-03-02 12:38:18 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/mm/init.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/alpha/mm/init.c 2006-01-04 21:59:59 +0100
@@ -20,6 +20,7 @@
#include <linux/init.h>
#include <linux/bootmem.h> /* max_low_pfn */
@@ -221,9 +221,9 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.15.4/arch/arm/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/arm/Kconfig
+diff -NurpP --minimal linux-2.6.15.4/arch/arm/Kconfig linux-2.6.15.4-vs2.1.1-rc3/arch/arm/Kconfig
--- linux-2.6.15.4/arch/arm/Kconfig 2006-01-03 17:29:06 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/arm/Kconfig 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/arm/Kconfig 2006-01-04 21:59:59 +0100
@@ -756,6 +756,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -233,9 +233,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.4/arch/arm/kernel/calls.S linux-2.6.15.4-vs2.1.1-rc2/arch/arm/kernel/calls.S
+diff -NurpP --minimal linux-2.6.15.4/arch/arm/kernel/calls.S linux-2.6.15.4-vs2.1.1-rc3/arch/arm/kernel/calls.S
--- linux-2.6.15.4/arch/arm/kernel/calls.S 2006-01-03 17:29:06 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/arm/kernel/calls.S 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/arm/kernel/calls.S 2006-01-04 21:59:59 +0100
@@ -327,7 +327,7 @@ __syscall_start:
/* 310 */ .long sys_request_key
.long sys_keyctl
@@ -245,9 +245,9 @@
.long sys_ioprio_set
/* 315 */ .long sys_ioprio_get
.long sys_inotify_init
-diff -NurpP --minimal linux-2.6.15.4/arch/arm/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/arm/kernel/process.c
+diff -NurpP --minimal linux-2.6.15.4/arch/arm/kernel/process.c linux-2.6.15.4-vs2.1.1-rc3/arch/arm/kernel/process.c
--- linux-2.6.15.4/arch/arm/kernel/process.c 2006-01-03 17:29:06 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/arm/kernel/process.c 2006-02-12 14:28:46 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/arm/kernel/process.c 2006-02-12 14:28:46 +0100
@@ -227,7 +227,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -268,9 +268,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.15.4/arch/arm26/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/Kconfig
+diff -NurpP --minimal linux-2.6.15.4/arch/arm26/Kconfig linux-2.6.15.4-vs2.1.1-rc3/arch/arm26/Kconfig
--- linux-2.6.15.4/arch/arm26/Kconfig 2005-10-28 20:49:09 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/Kconfig 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/arm26/Kconfig 2006-01-04 21:59:59 +0100
@@ -232,6 +232,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -280,9 +280,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.4/arch/arm26/kernel/calls.S linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/kernel/calls.S
+diff -NurpP --minimal linux-2.6.15.4/arch/arm26/kernel/calls.S linux-2.6.15.4-vs2.1.1-rc3/arch/arm26/kernel/calls.S
--- linux-2.6.15.4/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/kernel/calls.S 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/arm26/kernel/calls.S 2006-01-04 21:59:59 +0100
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -295,9 +295,9 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.15.4/arch/arm26/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/kernel/process.c
+diff -NurpP --minimal linux-2.6.15.4/arch/arm26/kernel/process.c linux-2.6.15.4-vs2.1.1-rc3/arch/arm26/kernel/process.c
--- linux-2.6.15.4/arch/arm26/kernel/process.c 2006-01-03 17:29:08 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/kernel/process.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/arm26/kernel/process.c 2006-01-04 21:59:59 +0100
@@ -367,7 +367,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;
@@ -308,9 +308,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.15.4/arch/arm26/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/kernel/traps.c
+diff -NurpP --minimal linux-2.6.15.4/arch/arm26/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc3/arch/arm26/kernel/traps.c
--- linux-2.6.15.4/arch/arm26/kernel/traps.c 2005-03-02 12:38:19 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/arm26/kernel/traps.c 2006-02-12 14:30:03 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/arm26/kernel/traps.c 2006-02-12 14:30:03 +0100
@@ -186,8 +186,9 @@ NORET_TYPE void die(const char *str, str
printk("Internal error: %s: %x\n", str, err);
printk("CPU: %d\n", smp_processor_id());
@@ -323,9 +323,9 @@
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.15.4/arch/cris/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/cris/Kconfig
+diff -NurpP --minimal linux-2.6.15.4/arch/cris/Kconfig linux-2.6.15.4-vs2.1.1-rc3/arch/cris/Kconfig
--- linux-2.6.15.4/arch/cris/Kconfig 2005-08-29 22:24:51 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/cris/Kconfig 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/cris/Kconfig 2006-01-04 21:59:59 +0100
@@ -177,6 +177,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -335,9 +335,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.4/arch/cris/arch-v10/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/cris/arch-v10/kernel/process.c
+diff -NurpP --minimal linux-2.6.15.4/arch/cris/arch-v10/kernel/process.c linux-2.6.15.4-vs2.1.1-rc3/arch/cris/arch-v10/kernel/process.c
--- linux-2.6.15.4/arch/cris/arch-v10/kernel/process.c 2005-08-29 22:24:51 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/cris/arch-v10/kernel/process.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/cris/arch-v10/kernel/process.c 2006-01-04 21:59:59 +0100
@@ -104,7 +104,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.dccr = 1 << I_DCCR_BITNR;
@@ -348,9 +348,9 @@
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.15.4/arch/cris/arch-v32/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/cris/arch-v32/kernel/process.c
+diff -NurpP --minimal linux-2.6.15.4/arch/cris/arch-v32/kernel/process.c linux-2.6.15.4-vs2.1.1-rc3/arch/cris/arch-v32/kernel/process.c
--- linux-2.6.15.4/arch/cris/arch-v32/kernel/process.c 2005-08-29 22:24:51 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/cris/arch-v32/kernel/process.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/cris/arch-v32/kernel/process.c 2006-01-04 21:59:59 +0100
@@ -121,7 +121,8 @@ kernel_thread(int (*fn)(void *), void *
regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
@@ -361,9 +361,9 @@
}
/*
-diff -NurpP --minimal linux-2.6.15.4/arch/frv/kernel/kernel_thread.S linux-2.6.15.4-vs2.1.1-rc2/arch/frv/kernel/kernel_thread.S
+diff -NurpP --minimal linux-2.6.15.4/arch/frv/kernel/kernel_thread.S linux-2.6.15.4-vs2.1.1-rc3/arch/frv/kernel/kernel_thread.S
--- linux-2.6.15.4/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/frv/kernel/kernel_thread.S 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/frv/kernel/kernel_thread.S 2006-01-04 21:59:59 +0100
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -382,9 +382,20 @@
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.15.4/arch/h8300/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/h8300/Kconfig
+diff -NurpP --minimal linux-2.6.15.4/arch/frv/mm/mmu-context.c linux-2.6.15.4-vs2.1.1-rc3/arch/frv/mm/mmu-context.c
+--- linux-2.6.15.4/arch/frv/mm/mmu-context.c 2005-03-02 12:38:20 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/frv/mm/mmu-context.c 2006-02-13 16:25:38 +0100
+@@ -11,6 +11,7 @@
+
+ #include <linux/sched.h>
+ #include <linux/mm.h>
++#include <linux/vs_pid.h>
+ #include <asm/tlbflush.h>
+
+ #define NR_CXN 4096
+diff -NurpP --minimal linux-2.6.15.4/arch/h8300/Kconfig linux-2.6.15.4-vs2.1.1-rc3/arch/h8300/Kconfig
--- linux-2.6.15.4/arch/h8300/Kconfig 2005-08-29 22:24:52 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/h8300/Kconfig 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/h8300/Kconfig 2006-01-04 21:59:59 +0100
@@ -191,6 +191,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -394,9 +405,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.4/arch/h8300/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/h8300/kernel/process.c
+diff -NurpP --minimal linux-2.6.15.4/arch/h8300/kernel/process.c linux-2.6.15.4-vs2.1.1-rc3/arch/h8300/kernel/process.c
--- linux-2.6.15.4/arch/h8300/kernel/process.c 2006-01-03 17:29:08 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/h8300/kernel/process.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/h8300/kernel/process.c 2006-01-04 21:59:59 +0100
@@ -132,7 +132,7 @@ int kernel_thread(int (*fn)(void *), voi
fs = get_fs();
@@ -406,9 +417,9 @@
__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.15.4/arch/i386/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/i386/Kconfig
+diff -NurpP --minimal linux-2.6.15.4/arch/i386/Kconfig linux-2.6.15.4-vs2.1.1-rc3/arch/i386/Kconfig
--- linux-2.6.15.4/arch/i386/Kconfig 2006-01-03 17:29:08 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/i386/Kconfig 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/i386/Kconfig 2006-01-04 21:59:59 +0100
@@ -448,6 +448,46 @@ config HIGHMEM64G
endchoice
@@ -465,9 +476,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.4/arch/i386/boot/compressed/misc.c linux-2.6.15.4-vs2.1.1-rc2/arch/i386/boot/compressed/misc.c
+diff -NurpP --minimal linux-2.6.15.4/arch/i386/boot/compressed/misc.c linux-2.6.15.4-vs2.1.1-rc3/arch/i386/boot/compressed/misc.c
--- linux-2.6.15.4/arch/i386/boot/compressed/misc.c 2005-08-29 22:24:52 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/i386/boot/compressed/misc.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/i386/boot/compressed/misc.c 2006-01-04 21:59:59 +0100
@@ -309,7 +309,7 @@ static void setup_normal_output_buffer(v
#else
if ((RM_ALT_MEM_K > RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) < 1024) error("Less than 2MB of memory");
@@ -488,9 +499,9 @@
mv->hcount = 0; /* say: we need not to move high_buffer */
}
else mv->hcount = -1;
-diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/process.c
+diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/process.c linux-2.6.15.4-vs2.1.1-rc3/arch/i386/kernel/process.c
--- linux-2.6.15.4/arch/i386/kernel/process.c 2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/process.c 2006-02-12 14:28:46 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/i386/kernel/process.c 2006-02-12 14:28:46 +0100
@@ -290,8 +290,10 @@ void show_regs(struct pt_regs * regs)
unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
@@ -514,9 +525,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/setup.c linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/setup.c
+diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/setup.c linux-2.6.15.4-vs2.1.1-rc3/arch/i386/kernel/setup.c
--- linux-2.6.15.4/arch/i386/kernel/setup.c 2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/setup.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/i386/kernel/setup.c 2006-01-04 21:59:59 +0100
@@ -1184,8 +1184,8 @@ void __init setup_bootmem_allocator(void
* the (very unlikely) case of us accidentally initializing the
* bootmem allocator with an invalid RAM area.
@@ -528,9 +539,9 @@
/*
* reserve physical page 0 - it's a special BIOS page on many boxes,
-diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/sys_i386.c linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/sys_i386.c
+diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/sys_i386.c linux-2.6.15.4-vs2.1.1-rc3/arch/i386/kernel/sys_i386.c
--- linux-2.6.15.4/arch/i386/kernel/sys_i386.c 2004-08-14 12:56:23 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/sys_i386.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/i386/kernel/sys_i386.c 2006-01-04 21:59:59 +0100
@@ -19,6 +19,7 @@
#include <linux/mman.h>
#include <linux/file.h>
@@ -578,9 +589,9 @@
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/syscall_table.S linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/syscall_table.S
+diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/syscall_table.S linux-2.6.15.4-vs2.1.1-rc3/arch/i386/kernel/syscall_table.S
--- linux-2.6.15.4/arch/i386/kernel/syscall_table.S 2005-08-29 22:24:52 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/syscall_table.S 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/i386/kernel/syscall_table.S 2006-01-04 21:59:59 +0100
@@ -273,7 +273,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -590,9 +601,9 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/traps.c
+diff -NurpP --minimal linux-2.6.15.4/arch/i386/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc3/arch/i386/kernel/traps.c
--- linux-2.6.15.4/arch/i386/kernel/traps.c 2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/i386/kernel/traps.c 2006-02-12 14:31:40 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/i386/kernel/traps.c 2006-02-12 14:31:40 +0100
@@ -53,6 +53,7 @@
#include <asm/kdebug.h>
@@ -633,9 +644,9 @@
} else
printk(KERN_ERR "Recursive die() failure, output suppressed\n");
-diff -NurpP --minimal linux-2.6.15.4/arch/ia64/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/Kconfig
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/Kconfig linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/Kconfig
--- linux-2.6.15.4/arch/ia64/Kconfig 2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/Kconfig 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/Kconfig 2006-01-04 21:59:59 +0100
@@ -461,6 +461,8 @@ endmenu
source "arch/ia64/Kconfig.debug"
@@ -645,9 +656,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.4/arch/ia64/ia32/binfmt_elf32.c linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/ia32/binfmt_elf32.c
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/ia32/binfmt_elf32.c linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/ia32/binfmt_elf32.c
--- linux-2.6.15.4/arch/ia64/ia32/binfmt_elf32.c 2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/ia32/binfmt_elf32.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/ia32/binfmt_elf32.c 2006-01-04 21:59:59 +0100
@@ -199,7 +199,7 @@ ia64_elf32_init (struct pt_regs *regs)
int
ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
@@ -667,9 +678,9 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.15.4/arch/ia64/ia32/ia32_entry.S linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/ia32/ia32_entry.S
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/ia32/ia32_entry.S linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/ia32/ia32_entry.S
--- linux-2.6.15.4/arch/ia64/ia32/ia32_entry.S 2005-10-28 20:49:10 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/ia32/ia32_entry.S 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/ia32/ia32_entry.S 2006-01-04 21:59:59 +0100
@@ -483,7 +483,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -679,9 +690,9 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/asm-offsets.c linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/asm-offsets.c
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/asm-offsets.c linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/asm-offsets.c
--- linux-2.6.15.4/arch/ia64/kernel/asm-offsets.c 2005-10-28 20:49:10 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/asm-offsets.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/asm-offsets.c 2006-01-04 21:59:59 +0100
@@ -192,6 +192,7 @@ void foo(void)
/* for assembly files which can't include sched.h: */
DEFINE(IA64_CLONE_VFORK, CLONE_VFORK);
@@ -690,9 +701,9 @@
BLANK();
DEFINE(IA64_CPUINFO_NSEC_PER_CYC_OFFSET,
-diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/entry.S linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/entry.S
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/entry.S linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/entry.S
--- linux-2.6.15.4/arch/ia64/kernel/entry.S 2005-10-28 20:49:10 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/entry.S 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/entry.S 2006-01-04 21:59:59 +0100
@@ -1589,7 +1589,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -702,15 +713,15 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/perfmon.c linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/perfmon.c
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/perfmon.c linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/perfmon.c
--- linux-2.6.15.4/arch/ia64/kernel/perfmon.c 2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/perfmon.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/perfmon.c 2006-02-13 16:25:38 +0100
@@ -39,6 +39,8 @@
#include <linux/mount.h>
#include <linux/bitops.h>
#include <linux/rcupdate.h>
+#include <linux/vs_memory.h>
-+#include <linux/vs_cvirt.h>
++#include <linux/vs_pid.h>
#include <asm/errno.h>
#include <asm/intrinsics.h>
@@ -723,9 +734,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.15.4/arch/ia64/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/process.c
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/process.c linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/process.c
--- linux-2.6.15.4/arch/ia64/kernel/process.c 2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/process.c 2006-02-12 14:28:46 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/process.c 2006-02-12 14:28:46 +0100
@@ -109,7 +109,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -746,10 +757,18 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/ptrace.c linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/ptrace.c linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/ptrace.c
--- linux-2.6.15.4/arch/ia64/kernel/ptrace.c 2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/ptrace.c 2006-01-04 21:59:59 +0100
-@@ -1450,6 +1450,9 @@ sys_ptrace (long request, pid_t pid, uns
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/ptrace.c 2006-02-13 16:25:38 +0100
+@@ -18,6 +18,7 @@
+ #include <linux/security.h>
+ #include <linux/audit.h>
+ #include <linux/signal.h>
++#include <linux/vs_pid.h>
+
+ #include <asm/pgtable.h>
+ #include <asm/processor.h>
+@@ -1450,6 +1451,9 @@ sys_ptrace (long request, pid_t pid, uns
read_unlock(&tasklist_lock);
if (!child)
goto out;
@@ -759,9 +778,20 @@
ret = -EPERM;
if (pid == 1) /* no messing around with init! */
goto out_tsk;
-diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/traps.c
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/signal.c linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/signal.c
+--- linux-2.6.15.4/arch/ia64/kernel/signal.c 2006-01-03 17:29:09 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/signal.c 2006-02-13 16:25:38 +0100
+@@ -21,6 +21,7 @@
+ #include <linux/binfmts.h>
+ #include <linux/unistd.h>
+ #include <linux/wait.h>
++#include <linux/vs_pid.h>
+
+ #include <asm/ia32.h>
+ #include <asm/intrinsics.h>
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/traps.c
--- linux-2.6.15.4/arch/ia64/kernel/traps.c 2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/kernel/traps.c 2006-02-12 14:28:46 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/traps.c 2006-02-12 14:28:46 +0100
@@ -106,8 +106,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -786,9 +816,9 @@
}
exception = fp_emulate(fp_fault, bundle, ®s->cr_ipsr, ®s->ar_fpsr, &isr, ®s->pr,
-diff -NurpP --minimal linux-2.6.15.4/arch/ia64/mm/fault.c linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/mm/fault.c
+diff -NurpP --minimal linux-2.6.15.4/arch/ia64/mm/fault.c linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/mm/fault.c
--- linux-2.6.15.4/arch/ia64/mm/fault.c 2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/ia64/mm/fault.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/mm/fault.c 2006-01-04 21:59:59 +0100
@@ -10,6 +10,7 @@
#include <linux/smp_lock.h>
#include <linux/interrupt.h>
@@ -797,9 +827,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.15.4/arch/m32r/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/m32r/kernel/process.c
+diff -NurpP --minimal linux-2.6.15.4/arch/m32r/kernel/process.c linux-2.6.15.4-vs2.1.1-rc3/arch/m32r/kernel/process.c
--- linux-2.6.15.4/arch/m32r/kernel/process.c 2006-01-03 17:29:09 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/m32r/kernel/process.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/m32r/kernel/process.c 2006-01-04 21:59:59 +0100
@@ -204,8 +204,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.psw = M32R_PSW_BIE;
@@ -811,9 +841,9 @@
}
/*
-diff -NurpP --minimal linux-2.6.15.4/arch/m32r/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc2/arch/m32r/kernel/traps.c
+diff -NurpP --minimal linux-2.6.15.4/arch/m32r/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc3/arch/m32r/kernel/traps.c
--- linux-2.6.15.4/arch/m32r/kernel/traps.c 2005-10-28 20:49:11 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/m32r/kernel/traps.c 2006-02-12 14:28:46 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/m32r/kernel/traps.c 2006-02-12 14:28:46 +0100
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -826,9 +856,9 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.15.4/arch/m68k/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/m68k/Kconfig
+diff -NurpP --minimal linux-2.6.15.4/arch/m68k/Kconfig linux-2.6.15.4-vs2.1.1-rc3/arch/m68k/Kconfig
--- linux-2.6.15.4/arch/m68k/Kconfig 2006-01-03 17:29:10 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/m68k/Kconfig 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/m68k/Kconfig 2006-01-04 21:59:59 +0100
@@ -650,6 +650,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -838,9 +868,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.4/arch/m68k/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/m68k/kernel/process.c
+diff -NurpP --minimal linux-2.6.15.4/arch/m68k/kernel/process.c linux-2.6.15.4-vs2.1.1-rc3/arch/m68k/kernel/process.c
--- linux-2.6.15.4/arch/m68k/kernel/process.c 2006-01-03 17:29:10 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/m68k/kernel/process.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/m68k/kernel/process.c 2006-01-04 21:59:59 +0100
@@ -157,7 +157,8 @@ int kernel_thread(int (*fn)(void *), voi
{
@@ -851,9 +881,9 @@
retval = __NR_clone;
__asm__ __volatile__
-diff -NurpP --minimal linux-2.6.15.4/arch/m68k/kernel/ptrace.c linux-2.6.15.4-vs2.1.1-rc2/arch/m68k/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.15.4/arch/m68k/kernel/ptrace.c linux-2.6.15.4-vs2.1.1-rc3/arch/m68k/kernel/ptrace.c
--- linux-2.6.15.4/arch/m68k/kernel/ptrace.c 2006-01-03 17:29:10 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/m68k/kernel/ptrace.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/m68k/kernel/ptrace.c 2006-01-04 21:59:59 +0100
@@ -280,6 +280,8 @@ long arch_ptrace(struct task_struct *chi
ret = ptrace_request(child, request, addr, data);
break;
@@ -863,9 +893,9 @@
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.15.4/arch/m68k/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc2/arch/m68k/kernel/traps.c
+diff -NurpP --minimal linux-2.6.15.4/arch/m68k/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc3/arch/m68k/kernel/traps.c
--- linux-2.6.15.4/arch/m68k/kernel/traps.c 2004-08-14 12:56:24 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/m68k/kernel/traps.c 2006-02-12 14:28:46 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/m68k/kernel/traps.c 2006-02-12 14:28:46 +0100
@@ -1198,8 +1198,9 @@ void die_if_kernel (char *str, struct pt
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
fp->d4, fp->d5, fp->a0, fp->a1);
@@ -878,9 +908,9 @@
show_stack(NULL, (unsigned long *)fp);
do_exit(SIGSEGV);
}
-diff -NurpP --minimal linux-2.6.15.4/arch/m68knommu/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/m68knommu/Kconfig
+diff -NurpP --minimal linux-2.6.15.4/arch/m68knommu/Kconfig linux-2.6.15.4-vs2.1.1-rc3/arch/m68knommu/Kconfig
--- linux-2.6.15.4/arch/m68knommu/Kconfig 2006-01-03 17:29:10 +0100
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/m68knommu/Kconfig 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/m68knommu/Kconfig 2006-01-04 21:59:59 +0100
@@ -646,6 +646,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -890,9 +920,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.15.4/arch/m68knommu/kernel/process.c linux-2.6.15.4-vs2.1.1-rc2/arch/m68knommu/kernel/process.c
+diff -NurpP --minimal linux-2.6.15.4/arch/m68knommu/kernel/process.c linux-2.6.15.4-vs2.1.1-rc3/arch/m68knommu/kernel/process.c
--- linux-2.6.15.4/arch/m68knommu/kernel/process.c 2005-08-29 22:24:53 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/m68knommu/kernel/process.c 2006-01-04 21:59:59 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/m68knommu/kernel/process.c 2006-01-04 21:59:59 +0100
@@ -115,7 +115,7 @@ void show_regs(struct pt_regs * regs)
int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
{
@@ -902,9 +932,9 @@
mm_segment_t fs;
fs = get_fs();
-diff -NurpP --minimal linux-2.6.15.4/arch/m68knommu/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc2/arch/m68knommu/kernel/traps.c
+diff -NurpP --minimal linux-2.6.15.4/arch/m68knommu/kernel/traps.c linux-2.6.15.4-vs2.1.1-rc3/arch/m68knommu/kernel/traps.c
--- linux-2.6.15.4/arch/m68knommu/kernel/traps.c 2005-10-28 20:49:11 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/m68knommu/kernel/traps.c 2006-02-12 14:28:46 +0100
++++ linux-2.6.15.4-vs2.1.1-rc3/arch/m68knommu/kernel/traps.c 2006-02-12 14:28:46 +0100
@@ -81,8 +81,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);
@@ -917,9 +947,9 @@
show_stack(NULL, (unsigned long *)fp);
do_exit(SIGSEGV);
}
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.1.patch?r1=1.1.2.8&r2=1.1.2.9&f=u
More information about the pld-cvs-commit
mailing list