SOURCES (LINUX_2_6): linux-2.6-vs2.1.patch - vs2.1.1-rc24
hawk
hawk at pld-linux.org
Thu Jun 22 14:36:59 CEST 2006
Author: hawk Date: Thu Jun 22 12:36:59 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- vs2.1.1-rc24
---- Files affected:
SOURCES:
linux-2.6-vs2.1.patch (1.1.2.26 -> 1.1.2.27)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.26 SOURCES/linux-2.6-vs2.1.patch:1.1.2.27
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.26 Fri May 26 17:11:24 2006
+++ SOURCES/linux-2.6-vs2.1.patch Thu Jun 22 14:36:53 2006
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.16.17/Documentation/vserver/debug.txt linux-2.6.16.17-vs2.1.1-rc21/Documentation/vserver/debug.txt
---- linux-2.6.16.17/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/Documentation/vserver/debug.txt 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/Documentation/vserver/debug.txt linux-2.6.17-vs2.1.1-rc24/Documentation/vserver/debug.txt
+--- linux-2.6.17/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
++++ linux-2.6.17-vs2.1.1-rc24/Documentation/vserver/debug.txt 2006-06-18 05:02:48 +0200
@@ -0,0 +1,108 @@
+
+debug_cvirt:
@@ -110,10 +110,10 @@
+ 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.16.17/arch/alpha/Kconfig linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/Kconfig
---- linux-2.6.16.17/arch/alpha/Kconfig 2006-02-18 14:39:40 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/Kconfig 2006-04-26 19:06:59 +0200
-@@ -619,6 +619,8 @@ source "arch/alpha/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.17/arch/alpha/Kconfig linux-2.6.17-vs2.1.1-rc24/arch/alpha/Kconfig
+--- linux-2.6.17/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/alpha/Kconfig 2006-06-18 05:02:48 +0200
+@@ -632,6 +632,8 @@ source "arch/alpha/oprofile/Kconfig"
source "arch/alpha/Kconfig.debug"
@@ -122,9 +122,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16.17/arch/alpha/kernel/asm-offsets.c linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.16.17/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/kernel/asm-offsets.c 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/alpha/kernel/asm-offsets.c linux-2.6.17-vs2.1.1-rc24/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.17/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10 +0100
++++ linux-2.6.17-vs2.1.1-rc24/arch/alpha/kernel/asm-offsets.c 2006-06-18 05:02:48 +0200
@@ -36,6 +36,7 @@ void foo(void)
DEFINE(PT_PTRACED, PT_PTRACED);
DEFINE(CLONE_VM, CLONE_VM);
@@ -133,9 +133,9 @@
DEFINE(SIGCHLD, SIGCHLD);
BLANK();
-diff -NurpP --minimal linux-2.6.16.17/arch/alpha/kernel/entry.S linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/kernel/entry.S
---- linux-2.6.16.17/arch/alpha/kernel/entry.S 2006-04-09 13:49:39 +0200
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/kernel/entry.S 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/alpha/kernel/entry.S linux-2.6.17-vs2.1.1-rc24/arch/alpha/kernel/entry.S
+--- linux-2.6.17/arch/alpha/kernel/entry.S 2006-04-09 13:49:39 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/alpha/kernel/entry.S 2006-06-18 05:02:48 +0200
@@ -645,7 +645,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
@@ -177,9 +177,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.16.17/arch/alpha/kernel/osf_sys.c linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/kernel/osf_sys.c
---- linux-2.6.16.17/arch/alpha/kernel/osf_sys.c 2006-02-15 13:54:10 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/kernel/osf_sys.c 2006-05-11 16:06:22 +0200
+diff -NurpP --minimal linux-2.6.17/arch/alpha/kernel/osf_sys.c linux-2.6.17-vs2.1.1-rc24/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.17/arch/alpha/kernel/osf_sys.c 2006-06-18 04:51:38 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/alpha/kernel/osf_sys.c 2006-06-18 05:02:48 +0200
@@ -38,6 +38,7 @@
#include <linux/uio.h>
#include <linux/vfs.h>
@@ -235,7 +235,7 @@
break;
}
up_read(&uts_sem);
-@@ -607,17 +612,6 @@ osf_sigstack(struct sigstack __user *uss
+@@ -607,30 +612,30 @@ osf_sigstack(struct sigstack __user *uss
asmlinkage long
osf_sysinfo(int command, char __user *buf, long count)
{
@@ -253,7 +253,13 @@
unsigned long offset;
char *res;
long len, err = -EINVAL;
-@@ -630,7 +624,18 @@ osf_sysinfo(int command, char __user *bu
+
+ offset = command-1;
+- if (offset >= sizeof(sysinfo_table)/sizeof(char *)) {
++ if (offset >= 9) {
+ /* Digital UNIX has a few unpublished interfaces here */
+ printk("sysinfo(%d)", command);
+ goto out;
}
down_read(&uts_sem);
@@ -273,10 +279,27 @@
len = strlen(res)+1;
if (len > count)
len = count;
-diff -NurpP --minimal linux-2.6.16.17/arch/alpha/kernel/ptrace.c linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/kernel/ptrace.c
---- linux-2.6.16.17/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/kernel/ptrace.c 2006-04-28 05:07:10 +0200
-@@ -283,6 +283,11 @@ do_sys_ptrace(long request, long pid, lo
+@@ -881,7 +886,7 @@ osf_gettimeofday(struct timeval32 __user
+ {
+ if (tv) {
+ struct timeval ktv;
+- do_gettimeofday(&ktv);
++ vx_gettimeofday(&ktv);
+ if (put_tv32(tv, &ktv))
+ return -EFAULT;
+ }
+diff -NurpP --minimal linux-2.6.17/arch/alpha/kernel/ptrace.c linux-2.6.17-vs2.1.1-rc24/arch/alpha/kernel/ptrace.c
+--- linux-2.6.17/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/alpha/kernel/ptrace.c 2006-06-18 17:54:04 +0200
+@@ -15,6 +15,7 @@
+ #include <linux/slab.h>
+ #include <linux/security.h>
+ #include <linux/signal.h>
++#include <linux/vs_pid.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/pgtable.h>
+@@ -283,6 +284,11 @@ do_sys_ptrace(long request, long pid, lo
goto out_notsk;
}
@@ -288,9 +311,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -NurpP --minimal linux-2.6.16.17/arch/alpha/kernel/systbls.S linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/kernel/systbls.S
---- linux-2.6.16.17/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/kernel/systbls.S 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/alpha/kernel/systbls.S linux-2.6.17-vs2.1.1-rc24/arch/alpha/kernel/systbls.S
+--- linux-2.6.17/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/alpha/kernel/systbls.S 2006-06-18 05:02:48 +0200
@@ -447,7 +447,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -300,9 +323,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.16.17/arch/alpha/kernel/traps.c linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/kernel/traps.c
---- linux-2.6.16.17/arch/alpha/kernel/traps.c 2005-10-28 20:49:08 +0200
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/kernel/traps.c 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/alpha/kernel/traps.c linux-2.6.17-vs2.1.1-rc24/arch/alpha/kernel/traps.c
+--- linux-2.6.17/arch/alpha/kernel/traps.c 2005-10-28 20:49:08 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/alpha/kernel/traps.c 2006-06-18 05:02:48 +0200
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -313,9 +336,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.16.17/arch/alpha/mm/init.c linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/mm/init.c
---- linux-2.6.16.17/arch/alpha/mm/init.c 2006-02-18 14:39:40 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/alpha/mm/init.c 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/alpha/mm/init.c linux-2.6.17-vs2.1.1-rc24/arch/alpha/mm/init.c
+--- linux-2.6.17/arch/alpha/mm/init.c 2006-06-18 04:51:38 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/alpha/mm/init.c 2006-06-18 05:02:48 +0200
@@ -21,6 +21,7 @@
#include <linux/init.h>
#include <linux/bootmem.h> /* max_low_pfn */
@@ -324,10 +347,10 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.16.17/arch/arm/Kconfig linux-2.6.16.17-vs2.1.1-rc21/arch/arm/Kconfig
---- linux-2.6.16.17/arch/arm/Kconfig 2006-04-09 13:49:39 +0200
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/arm/Kconfig 2006-04-26 19:06:59 +0200
-@@ -827,6 +827,8 @@ source "arch/arm/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.17/arch/arm/Kconfig linux-2.6.17-vs2.1.1-rc24/arch/arm/Kconfig
+--- linux-2.6.17/arch/arm/Kconfig 2006-06-18 04:51:38 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/arm/Kconfig 2006-06-18 05:02:48 +0200
+@@ -873,6 +873,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -336,9 +359,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16.17/arch/arm/kernel/calls.S linux-2.6.16.17-vs2.1.1-rc21/arch/arm/kernel/calls.S
---- linux-2.6.16.17/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/arm/kernel/calls.S 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/arm/kernel/calls.S linux-2.6.17-vs2.1.1-rc24/arch/arm/kernel/calls.S
+--- linux-2.6.17/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
++++ linux-2.6.17-vs2.1.1-rc24/arch/arm/kernel/calls.S 2006-06-18 05:02:48 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -348,9 +371,9 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.16.17/arch/arm/kernel/process.c linux-2.6.16.17-vs2.1.1-rc21/arch/arm/kernel/process.c
---- linux-2.6.16.17/arch/arm/kernel/process.c 2006-04-09 13:49:40 +0200
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/arm/kernel/process.c 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/arm/kernel/process.c linux-2.6.17-vs2.1.1-rc24/arch/arm/kernel/process.c
+--- linux-2.6.17/arch/arm/kernel/process.c 2006-06-18 04:51:42 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/arm/kernel/process.c 2006-06-18 05:02:48 +0200
@@ -227,7 +227,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -361,7 +384,7 @@
__show_regs(regs);
__backtrace();
}
-@@ -448,7 +449,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+@@ -461,7 +462,8 @@ pid_t kernel_thread(int (*fn)(void *), v
regs.ARM_pc = (unsigned long)kernel_thread_helper;
regs.ARM_cpsr = SVC_MODE;
@@ -371,10 +394,10 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.16.17/arch/arm26/Kconfig linux-2.6.16.17-vs2.1.1-rc21/arch/arm26/Kconfig
---- linux-2.6.16.17/arch/arm26/Kconfig 2006-02-18 14:39:41 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/arm26/Kconfig 2006-04-26 19:06:59 +0200
-@@ -230,6 +230,8 @@ source "drivers/usb/Kconfig"
+diff -NurpP --minimal linux-2.6.17/arch/arm26/Kconfig linux-2.6.17-vs2.1.1-rc24/arch/arm26/Kconfig
+--- linux-2.6.17/arch/arm26/Kconfig 2006-06-18 04:51:48 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/arm26/Kconfig 2006-06-18 05:02:48 +0200
+@@ -234,6 +234,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -383,9 +406,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16.17/arch/arm26/kernel/calls.S linux-2.6.16.17-vs2.1.1-rc21/arch/arm26/kernel/calls.S
---- linux-2.6.16.17/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/arm26/kernel/calls.S 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/arm26/kernel/calls.S linux-2.6.17-vs2.1.1-rc24/arch/arm26/kernel/calls.S
+--- linux-2.6.17/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
++++ linux-2.6.17-vs2.1.1-rc24/arch/arm26/kernel/calls.S 2006-06-18 05:02:48 +0200
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -398,9 +421,9 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.16.17/arch/arm26/kernel/process.c linux-2.6.16.17-vs2.1.1-rc21/arch/arm26/kernel/process.c
---- linux-2.6.16.17/arch/arm26/kernel/process.c 2006-01-18 06:07:51 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/arm26/kernel/process.c 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/arm26/kernel/process.c linux-2.6.17-vs2.1.1-rc24/arch/arm26/kernel/process.c
+--- linux-2.6.17/arch/arm26/kernel/process.c 2006-01-18 06:07:51 +0100
++++ linux-2.6.17-vs2.1.1-rc24/arch/arm26/kernel/process.c 2006-06-18 05:02:48 +0200
@@ -366,7 +366,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;
@@ -411,9 +434,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.16.17/arch/arm26/kernel/traps.c linux-2.6.16.17-vs2.1.1-rc21/arch/arm26/kernel/traps.c
---- linux-2.6.16.17/arch/arm26/kernel/traps.c 2006-01-18 06:07:51 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/arm26/kernel/traps.c 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/arm26/kernel/traps.c linux-2.6.17-vs2.1.1-rc24/arch/arm26/kernel/traps.c
+--- linux-2.6.17/arch/arm26/kernel/traps.c 2006-06-18 04:51:48 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/arm26/kernel/traps.c 2006-06-18 05:02:48 +0200
@@ -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());
@@ -426,10 +449,10 @@
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.16.17/arch/cris/Kconfig linux-2.6.16.17-vs2.1.1-rc21/arch/cris/Kconfig
---- linux-2.6.16.17/arch/cris/Kconfig 2006-02-18 14:39:42 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/cris/Kconfig 2006-04-26 19:06:59 +0200
-@@ -173,6 +173,8 @@ source "drivers/usb/Kconfig"
+diff -NurpP --minimal linux-2.6.17/arch/cris/Kconfig linux-2.6.17-vs2.1.1-rc24/arch/cris/Kconfig
+--- linux-2.6.17/arch/cris/Kconfig 2006-06-18 04:51:48 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/cris/Kconfig 2006-06-18 05:02:49 +0200
+@@ -181,6 +181,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -438,9 +461,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16.17/arch/cris/arch-v10/kernel/process.c linux-2.6.16.17-vs2.1.1-rc21/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.16.17/arch/cris/arch-v10/kernel/process.c 2006-01-18 06:07:51 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/cris/arch-v10/kernel/process.c 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/cris/arch-v10/kernel/process.c linux-2.6.17-vs2.1.1-rc24/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.17/arch/cris/arch-v10/kernel/process.c 2006-01-18 06:07:51 +0100
++++ linux-2.6.17-vs2.1.1-rc24/arch/cris/arch-v10/kernel/process.c 2006-06-18 05:02:49 +0200
@@ -104,7 +104,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.dccr = 1 << I_DCCR_BITNR;
@@ -451,9 +474,9 @@
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.16.17/arch/cris/arch-v32/kernel/process.c linux-2.6.16.17-vs2.1.1-rc21/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.16.17/arch/cris/arch-v32/kernel/process.c 2006-01-18 06:07:51 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/cris/arch-v32/kernel/process.c 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/cris/arch-v32/kernel/process.c linux-2.6.17-vs2.1.1-rc24/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.17/arch/cris/arch-v32/kernel/process.c 2006-01-18 06:07:51 +0100
++++ linux-2.6.17-vs2.1.1-rc24/arch/cris/arch-v32/kernel/process.c 2006-06-18 05:02:49 +0200
@@ -121,7 +121,8 @@ kernel_thread(int (*fn)(void *), void *
regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
@@ -464,9 +487,9 @@
}
/*
-diff -NurpP --minimal linux-2.6.16.17/arch/frv/kernel/kernel_thread.S linux-2.6.16.17-vs2.1.1-rc21/arch/frv/kernel/kernel_thread.S
---- linux-2.6.16.17/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/frv/kernel/kernel_thread.S 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/frv/kernel/kernel_thread.S linux-2.6.17-vs2.1.1-rc24/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.17/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
++++ linux-2.6.17-vs2.1.1-rc24/arch/frv/kernel/kernel_thread.S 2006-06-18 05:02:49 +0200
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -485,9 +508,9 @@
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-2.6.16.17/arch/frv/mm/mmu-context.c linux-2.6.16.17-vs2.1.1-rc21/arch/frv/mm/mmu-context.c
---- linux-2.6.16.17/arch/frv/mm/mmu-context.c 2005-03-02 12:38:20 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/frv/mm/mmu-context.c 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/frv/mm/mmu-context.c linux-2.6.17-vs2.1.1-rc24/arch/frv/mm/mmu-context.c
+--- linux-2.6.17/arch/frv/mm/mmu-context.c 2006-06-18 04:51:49 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/frv/mm/mmu-context.c 2006-06-18 17:54:04 +0200
@@ -11,6 +11,7 @@
#include <linux/sched.h>
@@ -496,10 +519,10 @@
#include <asm/tlbflush.h>
#define NR_CXN 4096
-diff -NurpP --minimal linux-2.6.16.17/arch/h8300/Kconfig linux-2.6.16.17-vs2.1.1-rc21/arch/h8300/Kconfig
---- linux-2.6.16.17/arch/h8300/Kconfig 2006-02-18 14:39:42 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/h8300/Kconfig 2006-04-26 19:06:59 +0200
-@@ -191,6 +191,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.17/arch/h8300/Kconfig linux-2.6.17-vs2.1.1-rc24/arch/h8300/Kconfig
+--- linux-2.6.17/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/h8300/Kconfig 2006-06-18 05:02:49 +0200
+@@ -199,6 +199,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -508,9 +531,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16.17/arch/h8300/kernel/process.c linux-2.6.16.17-vs2.1.1-rc21/arch/h8300/kernel/process.c
---- linux-2.6.16.17/arch/h8300/kernel/process.c 2006-04-09 13:49:41 +0200
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/h8300/kernel/process.c 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/h8300/kernel/process.c linux-2.6.17-vs2.1.1-rc24/arch/h8300/kernel/process.c
+--- linux-2.6.17/arch/h8300/kernel/process.c 2006-06-18 04:51:49 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/h8300/kernel/process.c 2006-06-18 05:02:49 +0200
@@ -135,7 +135,7 @@ int kernel_thread(int (*fn)(void *), voi
fs = get_fs();
@@ -520,62 +543,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.16.17/arch/i386/Kconfig linux-2.6.16.17-vs2.1.1-rc21/arch/i386/Kconfig
---- linux-2.6.16.17/arch/i386/Kconfig 2006-04-09 13:49:41 +0200
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/i386/Kconfig 2006-04-26 19:06:59 +0200
-@@ -466,23 +466,43 @@ choice
- will also likely make your kernel incompatible with binary-only
- kernel modules.
-
-- If you are not absolutely sure what you are doing, leave this
-- option alone!
--
- config VMSPLIT_3G
-- bool "3G/1G user/kernel split"
-- config VMSPLIT_3G_OPT
-- bool "3G/1G user/kernel split (for full 1G low memory)"
-+ bool "3G/1G user/kernel split (Default)"
-+ help
-+ This is the default split of 3GB userspace to 1GB kernel
-+ space, which will result in about 860MB of lowmem.
-+
-+ config VMSPLIT_25G
-+ bool "2.5G/1.5G user/kernel split"
-+ help
-+ This split provides 2.5GB userspace and 1.5GB kernel
-+ space, which will result in about 1370MB of lowmem.
-+
- config VMSPLIT_2G
- bool "2G/2G user/kernel split"
-+ help
-+ This split provides 2GB userspace and 2GB kernel
-+ space, which will result in about 1880MB of lowmem.
-+
-+ config VMSPLIT_15G
-+ bool "1.5G/2.5G user/kernel split"
-+ help
-+ This split provides 1.5GB userspace and 2.5GB kernel
-+ space, which will result in about 2390MB of lowmem.
-+
- config VMSPLIT_1G
- bool "1G/3G user/kernel split"
-+ help
-+ This split provides 1GB userspace and 3GB kernel
-+ space, which will result in about 2900MB of lowmem.
-+
- endchoice
-
- config PAGE_OFFSET
- hex
-- default 0xB0000000 if VMSPLIT_3G_OPT
-- default 0x78000000 if VMSPLIT_2G
-+ default 0xA0000000 if VMSPLIT_25G
-+ default 0x80000000 if VMSPLIT_2G
-+ default 0x60000000 if VMSPLIT_15G
- default 0x40000000 if VMSPLIT_1G
- default 0xC0000000
-
-@@ -1071,6 +1091,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.17/arch/i386/Kconfig linux-2.6.17-vs2.1.1-rc24/arch/i386/Kconfig
+--- linux-2.6.17/arch/i386/Kconfig 2006-06-18 04:51:49 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/i386/Kconfig 2006-06-19 17:44:23 +0200
+@@ -1085,6 +1085,8 @@ endmenu
source "arch/i386/Kconfig.debug"
@@ -584,33 +555,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16.17/arch/i386/boot/compressed/misc.c linux-2.6.16.17-vs2.1.1-rc21/arch/i386/boot/compressed/misc.c
---- linux-2.6.16.17/arch/i386/boot/compressed/misc.c 2006-04-09 13:49:42 +0200
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/i386/boot/compressed/misc.c 2006-04-26 19:06:59 +0200
-@@ -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");
- #endif
-- output_data = (char *)__PHYSICAL_START; /* Normally Points to 1M */
-+ output_data = (char *)PHYSICAL_START; /* Normally Points to 1M */
- free_mem_end_ptr = (long)real_mode;
- }
-
-@@ -334,8 +334,8 @@ static void setup_output_buffer_if_we_ru
- low_buffer_size = low_buffer_end - LOW_BUFFER_START;
- high_loaded = 1;
- free_mem_end_ptr = (long)high_buffer_start;
-- if ( (__PHYSICAL_START + low_buffer_size) > ((ulg)high_buffer_start)) {
-- high_buffer_start = (uch *)(__PHYSICAL_START + low_buffer_size);
-+ if ((PHYSICAL_START + low_buffer_size) > ((ulg)high_buffer_start)) {
-+ high_buffer_start = (uch *)(PHYSICAL_START + low_buffer_size);
- mv->hcount = 0; /* say: we need not to move high_buffer */
- }
- else mv->hcount = -1;
-diff -NurpP --minimal linux-2.6.16.17/arch/i386/kernel/process.c linux-2.6.16.17-vs2.1.1-rc21/arch/i386/kernel/process.c
---- linux-2.6.16.17/arch/i386/kernel/process.c 2006-02-15 13:54:10 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/i386/kernel/process.c 2006-04-26 19:06:59 +0200
-@@ -291,8 +291,10 @@ void show_regs(struct pt_regs * regs)
+diff -NurpP --minimal linux-2.6.17/arch/i386/kernel/process.c linux-2.6.17-vs2.1.1-rc24/arch/i386/kernel/process.c
+--- linux-2.6.17/arch/i386/kernel/process.c 2006-06-18 04:51:53 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/i386/kernel/process.c 2006-06-18 05:02:49 +0200
+@@ -290,8 +290,10 @@ void show_regs(struct pt_regs * regs)
unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
printk("\n");
@@ -622,8 +570,8 @@
+ 0xffff & regs->xcs,regs->eip, smp_processor_id());
print_symbol("EIP is at %s\n", regs->eip);
- if (user_mode(regs))
-@@ -352,7 +354,8 @@ int kernel_thread(int (*fn)(void *), voi
+ if (user_mode_vm(regs))
+@@ -351,7 +353,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.. */
@@ -633,23 +581,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.16.17/arch/i386/kernel/setup.c linux-2.6.16.17-vs2.1.1-rc21/arch/i386/kernel/setup.c
---- linux-2.6.16.17/arch/i386/kernel/setup.c 2006-04-09 13:49:42 +0200
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/i386/kernel/setup.c 2006-04-26 19:06:59 +0200
-@@ -1192,8 +1192,8 @@ void __init setup_bootmem_allocator(void
- * the (very unlikely) case of us accidentally initializing the
- * bootmem allocator with an invalid RAM area.
- */
-- reserve_bootmem(__PHYSICAL_START, (PFN_PHYS(min_low_pfn) +
-- bootmap_size + PAGE_SIZE-1) - (__PHYSICAL_START));
-+ reserve_bootmem(PHYSICAL_START, (PFN_PHYS(min_low_pfn) +
-+ bootmap_size + PAGE_SIZE-1) - (PHYSICAL_START));
-
- /*
- * reserve physical page 0 - it's a special BIOS page on many boxes,
-diff -NurpP --minimal linux-2.6.16.17/arch/i386/kernel/sys_i386.c linux-2.6.16.17-vs2.1.1-rc21/arch/i386/kernel/sys_i386.c
---- linux-2.6.16.17/arch/i386/kernel/sys_i386.c 2004-08-14 12:56:23 +0200
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/i386/kernel/sys_i386.c 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/i386/kernel/sys_i386.c linux-2.6.17-vs2.1.1-rc24/arch/i386/kernel/sys_i386.c
+--- linux-2.6.17/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/i386/kernel/sys_i386.c 2006-06-18 05:02:49 +0200
@@ -19,6 +19,7 @@
#include <linux/mman.h>
#include <linux/file.h>
@@ -658,7 +592,7 @@
#include <asm/uaccess.h>
#include <asm/ipc.h>
-@@ -217,7 +218,7 @@ asmlinkage int sys_uname(struct old_utsn
+@@ -210,7 +211,7 @@ asmlinkage int sys_uname(struct old_utsn
if (!name)
return -EFAULT;
down_read(&uts_sem);
@@ -667,7 +601,7 @@
up_read(&uts_sem);
return err?-EFAULT:0;
}
-@@ -225,6 +226,7 @@ asmlinkage int sys_uname(struct old_utsn
+@@ -218,6 +219,7 @@ asmlinkage int sys_uname(struct old_utsn
asmlinkage int sys_olduname(struct oldold_utsname __user * name)
{
int error;
@@ -675,7 +609,7 @@
if (!name)
return -EFAULT;
-@@ -233,15 +235,16 @@ asmlinkage int sys_olduname(struct oldol
+@@ -226,15 +228,16 @@ asmlinkage int sys_olduname(struct oldol
down_read(&uts_sem);
@@ -697,9 +631,9 @@
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.16.17/arch/i386/kernel/syscall_table.S linux-2.6.16.17-vs2.1.1-rc21/arch/i386/kernel/syscall_table.S
---- linux-2.6.16.17/arch/i386/kernel/syscall_table.S 2006-02-18 14:39:43 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/i386/kernel/syscall_table.S 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/i386/kernel/syscall_table.S linux-2.6.17-vs2.1.1-rc24/arch/i386/kernel/syscall_table.S
+--- linux-2.6.17/arch/i386/kernel/syscall_table.S 2006-06-18 04:51:53 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/i386/kernel/syscall_table.S 2006-06-18 05:02:49 +0200
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -709,9 +643,9 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.16.17/arch/i386/kernel/traps.c linux-2.6.16.17-vs2.1.1-rc21/arch/i386/kernel/traps.c
---- linux-2.6.16.17/arch/i386/kernel/traps.c 2006-02-18 14:39:43 +0100
-+++ linux-2.6.16.17-vs2.1.1-rc21/arch/i386/kernel/traps.c 2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.17/arch/i386/kernel/traps.c linux-2.6.17-vs2.1.1-rc24/arch/i386/kernel/traps.c
+--- linux-2.6.17/arch/i386/kernel/traps.c 2006-06-18 04:51:53 +0200
++++ linux-2.6.17-vs2.1.1-rc24/arch/i386/kernel/traps.c 2006-06-18 05:02:49 +0200
@@ -53,6 +53,8 @@
#include <asm/kdebug.h>
@@ -721,7 +655,7 @@
#include "mach_traps.h"
-@@ -252,8 +254,9 @@ void show_registers(struct pt_regs *regs
+@@ -268,8 +270,9 @@ void show_registers(struct pt_regs *regs
regs->esi, regs->edi, regs->ebp, esp);
printk(KERN_EMERG "ds: %04x es: %04x ss: %04x\n",
regs->xds & 0xffff, regs->xes & 0xffff, ss);
@@ -733,30 +667,41 @@
/*
* When in-kernel, we also print out the stack and code at the
* time of the fault..
-@@ -333,6 +336,8 @@ void die(const char * str, struct pt_reg
- static int die_counter;
- unsigned long flags;
+@@ -351,6 +354,8 @@ void die(const char * str, struct pt_reg
+
+ oops_enter();
+ vxh_throw_oops();
+
if (die.lock_owner != raw_smp_processor_id()) {
console_verbose();
spin_lock_irqsave(&die.lock, flags);
-@@ -365,8 +370,9 @@ void die(const char * str, struct pt_reg
- #endif
+@@ -387,9 +392,9 @@ void die(const char * str, struct pt_reg
if (nl)
printk("\n");
-- notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV);
-+ notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV);
- show_registers(regs);
-+ vxh_dump_history();
+ if (notify_die(DIE_OOPS, str, regs, err,
+- current->thread.trap_no, SIGSEGV) !=
+- NOTIFY_STOP) {
++ current->thread.trap_no, SIGSEGV) != NOTIFY_STOP) {
<<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.26&r2=1.1.2.27&f=u
More information about the pld-cvs-commit
mailing list