SOURCES (LINUX_2_6): linux-2.6-vs2.1.patch - updated to vs2.1.1-rc15
baggins
baggins at pld-linux.org
Tue Apr 11 16:05:56 CEST 2006
Author: baggins Date: Tue Apr 11 14:05:55 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated to vs2.1.1-rc15
---- Files affected:
SOURCES:
linux-2.6-vs2.1.patch (1.1.2.12 -> 1.1.2.13)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.12 SOURCES/linux-2.6-vs2.1.patch:1.1.2.13
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.12 Tue Feb 14 13:41:44 2006
+++ SOURCES/linux-2.6-vs2.1.patch Tue Apr 11 16:05:50 2006
@@ -1,7 +1,7 @@
-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-rc3/Documentation/vserver/debug.txt 2006-01-04 21:59:59 +0100
-@@ -0,0 +1,106 @@
+diff -NurpP --minimal linux-2.6.16/Documentation/vserver/debug.txt linux-2.6.16-vs2.1.1-rc15/Documentation/vserver/debug.txt
+--- linux-2.6.16/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
++++ linux-2.6.16-vs2.1.1-rc15/Documentation/vserver/debug.txt 2006-03-20 18:09:05 +0100
+@@ -0,0 +1,108 @@
+
+debug_cvirt:
+
@@ -96,6 +96,8 @@
+ "task_get_vx_info(%p)"
+ "vx_migrate_task(%p,%p[#%d.%d])"
+ 6 40 "vx_set_init(%p[#%d],%p[#%d,%d,%d])"
++ "vx_exit_init(%p[#%d],%p[#%d,%d,%d])"
++ "vx_set_reaper(%p[#%d],%p[#%d,%d])"
+ 7 80 "vx_parse_xid(ť%sŤ): %d:#%d"
+ "vx_propagate_xid(%p[#%lu.%d]): %d,%d"
+
@@ -108,10 +110,13 @@
+ 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.15.4/arch/alpha/Kconfig linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/Kconfig
---- linux-2.6.15.4/arch/alpha/Kconfig 2005-10-28 20:49:08 +0200
-+++ linux-2.6.15.4-vs2.1.1-rc2/arch/alpha/Kconfig 2006-01-04 21:59:59 +0100
-@@ -609,6 +609,8 @@ source "arch/alpha/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.16/Makefile linux-2.6.16-vs2.1.1-rc15/Makefile
+--- linux-2.6.16/Makefile 2006-03-20 17:32:17 +0100
++++ linux-2.6.16-vs2.1.1-rc15/Makefile 2006-04-03 06:43:02 +0200
+diff -NurpP --minimal linux-2.6.16/arch/alpha/Kconfig linux-2.6.16-vs2.1.1-rc15/arch/alpha/Kconfig
+--- linux-2.6.16/arch/alpha/Kconfig 2006-03-20 17:32:17 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/alpha/Kconfig 2006-03-20 17:34:49 +0100
+@@ -619,6 +619,8 @@ source "arch/alpha/oprofile/Kconfig"
source "arch/alpha/Kconfig.debug"
@@ -120,10 +125,10 @@
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-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-rc3/arch/alpha/kernel/asm-offsets.c 2006-01-04 21:59:59 +0100
-@@ -35,6 +35,7 @@ void foo(void)
+diff -NurpP --minimal linux-2.6.16/arch/alpha/kernel/asm-offsets.c linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.16/arch/alpha/kernel/asm-offsets.c 2006-03-20 17:32:17 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/asm-offsets.c 2006-03-20 18:09:05 +0100
+@@ -36,6 +36,7 @@ void foo(void)
DEFINE(PT_PTRACED, PT_PTRACED);
DEFINE(CLONE_VM, CLONE_VM);
DEFINE(CLONE_UNTRACED, CLONE_UNTRACED);
@@ -131,9 +136,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-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-rc3/arch/alpha/kernel/entry.S 2006-01-04 21:59:59 +0100
+diff -NurpP --minimal linux-2.6.16/arch/alpha/kernel/entry.S linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/entry.S
+--- linux-2.6.16/arch/alpha/kernel/entry.S 2006-03-20 17:32:17 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/entry.S 2006-03-20 18:09:05 +0100
@@ -645,7 +645,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
@@ -143,7 +148,7 @@
or $18, $1, $16
bsr $26, sys_clone
-@@ -874,22 +874,15 @@ sys_getxgid:
+@@ -874,24 +874,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
sys_getxpid:
@@ -154,17 +159,19 @@
- /* See linux/kernel/timer.c sys_getppid for discussion
- about this loop. */
-- ldq $3, TASK_REAL_PARENT($2)
--1: ldl $1, TASK_TGID($3)
+- ldq $3, TASK_GROUP_LEADER($2)
+- ldq $4, TASK_REAL_PARENT($3)
+- ldl $0, TASK_TGID($2)
+-1: ldl $1, TASK_TGID($4)
-#ifdef CONFIG_SMP
-- mov $3, $4
+- mov $4, $5
- mb
-- ldq $3, TASK_REAL_PARENT($2)
-- cmpeq $3, $4, $4
-- beq $4, 1b
+- ldq $3, TASK_GROUP_LEADER($2)
+- ldq $4, TASK_REAL_PARENT($3)
+- cmpeq $4, $5, $5
+- beq $5, 1b
-#endif
- stq $1, 80($sp)
-- ldl $0, TASK_TGID($2)
+ lda $16, 96($sp)
+ jsr $26, do_getxpid
+ ldq $26, 0($sp)
@@ -173,9 +180,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-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-rc3/arch/alpha/kernel/ptrace.c 2006-01-04 21:59:59 +0100
+diff -NurpP --minimal linux-2.6.16/arch/alpha/kernel/ptrace.c linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/ptrace.c
+--- linux-2.6.16/arch/alpha/kernel/ptrace.c 2006-03-20 17:32:17 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/ptrace.c 2006-03-20 18:09:05 +0100
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -184,18 +191,21 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-@@ -289,6 +289,8 @@ do_sys_ptrace(long request, long pid, lo
- read_unlock(&tasklist_lock);
- if (!child)
+@@ -283,6 +284,11 @@ do_sys_ptrace(long request, long pid, lo
goto out_notsk;
-+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
-+ goto out;
+ }
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT)) {
++ ret = -EPERM;
++ goto out;
++ }
++
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-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-rc3/arch/alpha/kernel/systbls.S 2006-01-04 21:59:59 +0100
+ goto out;
+diff -NurpP --minimal linux-2.6.16/arch/alpha/kernel/systbls.S linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/systbls.S
+--- linux-2.6.16/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
++++ linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/systbls.S 2006-03-20 17:34:49 +0100
@@ -447,7 +447,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -205,9 +215,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-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-rc3/arch/alpha/kernel/traps.c 2006-02-12 14:28:46 +0100
+diff -NurpP --minimal linux-2.6.16/arch/alpha/kernel/traps.c linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/traps.c
+--- linux-2.6.16/arch/alpha/kernel/traps.c 2005-10-28 20:49:08 +0200
++++ linux-2.6.16-vs2.1.1-rc15/arch/alpha/kernel/traps.c 2006-03-20 18:09:05 +0100
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -218,10 +228,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.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-rc3/arch/alpha/mm/init.c 2006-01-04 21:59:59 +0100
-@@ -20,6 +20,7 @@
+diff -NurpP --minimal linux-2.6.16/arch/alpha/mm/init.c linux-2.6.16-vs2.1.1-rc15/arch/alpha/mm/init.c
+--- linux-2.6.16/arch/alpha/mm/init.c 2006-03-20 17:32:18 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/alpha/mm/init.c 2006-03-20 17:34:49 +0100
+@@ -21,6 +21,7 @@
#include <linux/init.h>
#include <linux/bootmem.h> /* max_low_pfn */
#include <linux/vmalloc.h>
@@ -229,10 +239,10 @@
#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-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-rc3/arch/arm/Kconfig 2006-01-04 21:59:59 +0100
-@@ -756,6 +756,8 @@ source "arch/arm/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.16/arch/arm/Kconfig linux-2.6.16-vs2.1.1-rc15/arch/arm/Kconfig
+--- linux-2.6.16/arch/arm/Kconfig 2006-03-20 17:32:18 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/arm/Kconfig 2006-03-20 17:34:49 +0100
+@@ -827,6 +827,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -241,21 +251,21 @@
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-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-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
- .long sys_semtimedop
--/* vserver */ .long sys_ni_syscall
-+ .long sys_vserver
- .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-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-rc3/arch/arm/kernel/process.c 2006-02-12 14:28:46 +0100
+diff -NurpP --minimal linux-2.6.16/arch/arm/kernel/calls.S linux-2.6.16-vs2.1.1-rc15/arch/arm/kernel/calls.S
+--- linux-2.6.16/arch/arm/kernel/calls.S 2006-03-20 17:32:18 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/arm/kernel/calls.S 2006-03-20 17:34:49 +0100
+@@ -322,7 +322,7 @@
+ /* 310 */ CALL(sys_request_key)
+ CALL(sys_keyctl)
+ CALL(ABI(sys_semtimedop, sys_oabi_semtimedop))
+-/* vserver */ CALL(sys_ni_syscall)
++ CALL(sys_vserver)
+ CALL(sys_ioprio_set)
+ /* 315 */ CALL(sys_ioprio_get)
+ CALL(sys_inotify_init)
+diff -NurpP --minimal linux-2.6.16/arch/arm/kernel/process.c linux-2.6.16-vs2.1.1-rc15/arch/arm/kernel/process.c
+--- linux-2.6.16/arch/arm/kernel/process.c 2006-03-20 17:32:18 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/arm/kernel/process.c 2006-03-20 18:09:05 +0100
@@ -227,7 +227,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -266,7 +276,7 @@
__show_regs(regs);
__backtrace();
}
-@@ -449,7 +450,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+@@ -448,7 +449,8 @@ pid_t kernel_thread(int (*fn)(void *), v
regs.ARM_pc = (unsigned long)kernel_thread_helper;
regs.ARM_cpsr = SVC_MODE;
@@ -276,10 +286,10 @@
}
EXPORT_SYMBOL(kernel_thread);
-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-rc3/arch/arm26/Kconfig 2006-01-04 21:59:59 +0100
-@@ -232,6 +232,8 @@ source "drivers/usb/Kconfig"
+diff -NurpP --minimal linux-2.6.16/arch/arm26/Kconfig linux-2.6.16-vs2.1.1-rc15/arch/arm26/Kconfig
+--- linux-2.6.16/arch/arm26/Kconfig 2006-03-20 17:32:19 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/arm26/Kconfig 2006-03-20 17:34:49 +0100
+@@ -230,6 +230,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -288,9 +298,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-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-rc3/arch/arm26/kernel/calls.S 2006-01-04 21:59:59 +0100
+diff -NurpP --minimal linux-2.6.16/arch/arm26/kernel/calls.S linux-2.6.16-vs2.1.1-rc15/arch/arm26/kernel/calls.S
+--- linux-2.6.16/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/arm26/kernel/calls.S 2006-03-20 17:34:49 +0100
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -303,10 +313,10 @@
__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-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-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
+diff -NurpP --minimal linux-2.6.16/arch/arm26/kernel/process.c linux-2.6.16-vs2.1.1-rc15/arch/arm26/kernel/process.c
+--- linux-2.6.16/arch/arm26/kernel/process.c 2006-03-20 17:32:19 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/arm26/kernel/process.c 2006-03-20 18:09:05 +0100
+@@ -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;
@@ -316,25 +326,25 @@
}
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-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-rc3/arch/arm26/kernel/traps.c 2006-02-12 14:30:03 +0100
+diff -NurpP --minimal linux-2.6.16/arch/arm26/kernel/traps.c linux-2.6.16-vs2.1.1-rc15/arch/arm26/kernel/traps.c
+--- linux-2.6.16/arch/arm26/kernel/traps.c 2006-03-20 17:32:19 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/arm26/kernel/traps.c 2006-03-20 17:34:49 +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());
show_regs(regs);
- printk("Process %s (pid: %d, stack limit = 0x%p)\n",
-- current->comm, current->pid, tsk->thread_info + 1);
+- 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, tsk->thread_info + 1);
++ 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.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-rc3/arch/cris/Kconfig 2006-01-04 21:59:59 +0100
-@@ -177,6 +177,8 @@ source "drivers/usb/Kconfig"
+diff -NurpP --minimal linux-2.6.16/arch/cris/Kconfig linux-2.6.16-vs2.1.1-rc15/arch/cris/Kconfig
+--- linux-2.6.16/arch/cris/Kconfig 2006-03-20 17:32:19 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/cris/Kconfig 2006-03-20 17:34:49 +0100
+@@ -173,6 +173,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -343,9 +353,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-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-rc3/arch/cris/arch-v10/kernel/process.c 2006-01-04 21:59:59 +0100
+diff -NurpP --minimal linux-2.6.16/arch/cris/arch-v10/kernel/process.c linux-2.6.16-vs2.1.1-rc15/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.16/arch/cris/arch-v10/kernel/process.c 2006-03-20 17:32:19 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/cris/arch-v10/kernel/process.c 2006-03-20 18:09:05 +0100
@@ -104,7 +104,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.dccr = 1 << I_DCCR_BITNR;
@@ -356,9 +366,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-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-rc3/arch/cris/arch-v32/kernel/process.c 2006-01-04 21:59:59 +0100
+diff -NurpP --minimal linux-2.6.16/arch/cris/arch-v32/kernel/process.c linux-2.6.16-vs2.1.1-rc15/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.16/arch/cris/arch-v32/kernel/process.c 2006-03-20 17:32:19 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/cris/arch-v32/kernel/process.c 2006-03-20 18:09:05 +0100
@@ -121,7 +121,8 @@ kernel_thread(int (*fn)(void *), void *
regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
@@ -369,9 +379,9 @@
}
/*
-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-rc3/arch/frv/kernel/kernel_thread.S 2006-01-04 21:59:59 +0100
+diff -NurpP --minimal linux-2.6.16/arch/frv/kernel/kernel_thread.S linux-2.6.16-vs2.1.1-rc15/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.16/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/frv/kernel/kernel_thread.S 2006-03-20 18:09:05 +0100
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -390,9 +400,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.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
+diff -NurpP --minimal linux-2.6.16/arch/frv/mm/mmu-context.c linux-2.6.16-vs2.1.1-rc15/arch/frv/mm/mmu-context.c
+--- linux-2.6.16/arch/frv/mm/mmu-context.c 2005-03-02 12:38:20 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/frv/mm/mmu-context.c 2006-03-20 18:09:05 +0100
@@ -11,6 +11,7 @@
#include <linux/sched.h>
@@ -401,9 +411,9 @@
#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-rc3/arch/h8300/Kconfig 2006-01-04 21:59:59 +0100
+diff -NurpP --minimal linux-2.6.16/arch/h8300/Kconfig linux-2.6.16-vs2.1.1-rc15/arch/h8300/Kconfig
+--- linux-2.6.16/arch/h8300/Kconfig 2006-03-20 17:32:20 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/h8300/Kconfig 2006-03-20 17:34:49 +0100
@@ -191,6 +191,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -413,10 +423,10 @@
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-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-rc3/arch/h8300/kernel/process.c 2006-01-04 21:59:59 +0100
-@@ -132,7 +132,7 @@ int kernel_thread(int (*fn)(void *), voi
+diff -NurpP --minimal linux-2.6.16/arch/h8300/kernel/process.c linux-2.6.16-vs2.1.1-rc15/arch/h8300/kernel/process.c
+--- linux-2.6.16/arch/h8300/kernel/process.c 2006-03-20 17:32:20 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/h8300/kernel/process.c 2006-03-20 18:09:05 +0100
+@@ -135,7 +135,7 @@ int kernel_thread(int (*fn)(void *), voi
fs = get_fs();
set_fs (KERNEL_DS);
@@ -425,57 +435,62 @@
__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-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-rc3/arch/i386/Kconfig 2006-01-04 21:59:59 +0100
-@@ -448,6 +448,46 @@ config HIGHMEM64G
+diff -NurpP --minimal linux-2.6.16/arch/i386/Kconfig linux-2.6.16-vs2.1.1-rc15/arch/i386/Kconfig
+--- linux-2.6.16/arch/i386/Kconfig 2006-03-20 17:32:20 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/i386/Kconfig 2006-03-20 17:34:49 +0100
+@@ -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
-+choice
-+ prompt "Memory Split User Space"
-+ default SPLIT_3GB
-+ help
-+ A different Userspace/Kernel split allows you to
-+ utilize up to alsmost 3GB of RAM without the requirement
-+ for HIGHMEM. It also increases the available lowmem.
-+
-+config SPLIT_3GB
-+ bool "3.0GB/1.0GB Kernel (Default)"
-+ help
-+ This is the default split of 3GB userspace to 1GB kernel
-+ space, which will result in about 860MB of lowmem.
-+
-+config SPLIT_25GB
-+ bool "2.5GB/1.5GB Kernel"
-+ help
-+ This split provides 2.5GB userspace and 1.5GB kernel
-+ space, which will result in about 1370MB of lowmem.
-+
-+config SPLIT_2GB
-+ bool "2.0GB/2.0GB Kernel"
-+ help
-+ This split provides 2GB userspace and 2GB kernel
-+ space, which will result in about 1880MB of lowmem.
-+
-+config SPLIT_15GB
-+ bool "1.5GB/2.5GB Kernel"
-+ help
-+ This split provides 1.5GB userspace and 2.5GB kernel
-+ space, which will result in about 2390MB of lowmem.
-+
-+config SPLIT_1GB
-+ bool "1.0GB/3.0GB Kernel"
-+ help
-+ This split provides 1GB userspace and 3GB kernel
-+ space, which will result in about 2900MB of lowmem.
-+
-+endchoice
-+
- config HIGHMEM
- bool
- depends on HIGHMEM64G || HIGHMEM4G
-@@ -1014,6 +1054,8 @@ endmenu
+ 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
source "arch/i386/Kconfig.debug"
@@ -484,9 +499,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-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-rc3/arch/i386/boot/compressed/misc.c 2006-01-04 21:59:59 +0100
+diff -NurpP --minimal linux-2.6.16/arch/i386/boot/compressed/misc.c linux-2.6.16-vs2.1.1-rc15/arch/i386/boot/compressed/misc.c
+--- linux-2.6.16/arch/i386/boot/compressed/misc.c 2006-03-20 17:32:20 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/i386/boot/compressed/misc.c 2006-03-20 17:34:49 +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");
@@ -507,10 +522,10 @@
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-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-rc3/arch/i386/kernel/process.c 2006-02-12 14:28:46 +0100
-@@ -290,8 +290,10 @@ void show_regs(struct pt_regs * regs)
+diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/process.c linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/process.c
+--- linux-2.6.16/arch/i386/kernel/process.c 2006-03-20 17:32:20 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/process.c 2006-03-20 18:09:05 +0100
+@@ -291,8 +291,10 @@ void show_regs(struct pt_regs * regs)
unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
printk("\n");
@@ -523,7 +538,7 @@
print_symbol("EIP is at %s\n", regs->eip);
if (user_mode(regs))
-@@ -351,7 +353,8 @@ int kernel_thread(int (*fn)(void *), voi
+@@ -352,7 +354,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.. */
@@ -533,10 +548,10 @@
}
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-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-rc3/arch/i386/kernel/setup.c 2006-01-04 21:59:59 +0100
-@@ -1184,8 +1184,8 @@ void __init setup_bootmem_allocator(void
+diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/setup.c linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/setup.c
+--- linux-2.6.16/arch/i386/kernel/setup.c 2006-03-20 17:32:20 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/setup.c 2006-03-20 17:34:49 +0100
+@@ -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.
*/
@@ -547,9 +562,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-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-rc3/arch/i386/kernel/sys_i386.c 2006-01-04 21:59:59 +0100
+diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/sys_i386.c linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/sys_i386.c
+--- linux-2.6.16/arch/i386/kernel/sys_i386.c 2004-08-14 12:56:23 +0200
++++ linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/sys_i386.c 2006-03-20 17:34:49 +0100
@@ -19,6 +19,7 @@
#include <linux/mman.h>
#include <linux/file.h>
@@ -597,10 +612,10 @@
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-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-rc3/arch/i386/kernel/syscall_table.S 2006-01-04 21:59:59 +0100
-@@ -273,7 +273,7 @@ ENTRY(sys_call_table)
+diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/syscall_table.S linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/syscall_table.S
+--- linux-2.6.16/arch/i386/kernel/syscall_table.S 2006-03-20 17:32:20 +0100
++++ linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/syscall_table.S 2006-03-20 17:34:49 +0100
+@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
.long sys_fadvise64_64
@@ -609,9 +624,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-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-rc3/arch/i386/kernel/traps.c 2006-02-12 14:31:40 +0100
+diff -NurpP --minimal linux-2.6.16/arch/i386/kernel/traps.c linux-2.6.16-vs2.1.1-rc15/arch/i386/kernel/traps.c
<<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.12&r2=1.1.2.13&f=u
More information about the pld-cvs-commit
mailing list