SOURCES (LINUX_2_6): linux-2.6-vs2.1.patch - updated to 2.1.0.4
baggins
baggins at pld-linux.org
Tue Jan 10 18:36:07 CET 2006
Author: baggins Date: Tue Jan 10 17:36:07 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated to 2.1.0.4
---- Files affected:
SOURCES:
linux-2.6-vs2.1.patch (1.1.2.3 -> 1.1.2.4)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.3 SOURCES/linux-2.6-vs2.1.patch:1.1.2.4
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.3 Fri Dec 2 18:37:51 2005
+++ SOURCES/linux-2.6-vs2.1.patch Tue Jan 10 18:36:02 2006
@@ -1,9 +1,6 @@
-Applied fixes:
- delta-vroot-fix03.diff
-
-diff -NurpP --minimal linux-2.6.14.2/Documentation/vserver/debug.txt linux-2.6.14.2-vs2.1.0-rc8/Documentation/vserver/debug.txt
---- linux-2.6.14.2/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
-+++ linux-2.6.14.2-vs2.1.0-rc8/Documentation/vserver/debug.txt 2005-10-29 03:19:03 +0200
+diff -NurpP --minimal linux-2.6.15/Documentation/vserver/debug.txt linux-2.6.15-vs2.1.0.4/Documentation/vserver/debug.txt
+--- linux-2.6.15/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
++++ linux-2.6.15-vs2.1.0.4/Documentation/vserver/debug.txt 2006-01-04 21:59:59 +0100
@@ -0,0 +1,106 @@
+
+debug_cvirt:
@@ -111,9 +108,9 @@
+ 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.14.2/arch/alpha/Kconfig linux-2.6.14.2-vs2.1.0-rc8/arch/alpha/Kconfig
---- linux-2.6.14.2/arch/alpha/Kconfig 2005-10-28 20:49:08 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/alpha/Kconfig 2005-10-29 03:28:54 +0200
+diff -NurpP --minimal linux-2.6.15/arch/alpha/Kconfig linux-2.6.15-vs2.1.0.4/arch/alpha/Kconfig
+--- linux-2.6.15/arch/alpha/Kconfig 2005-10-28 20:49:08 +0200
++++ linux-2.6.15-vs2.1.0.4/arch/alpha/Kconfig 2006-01-04 21:59:59 +0100
@@ -609,6 +609,8 @@ source "arch/alpha/oprofile/Kconfig"
source "arch/alpha/Kconfig.debug"
@@ -123,9 +120,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.14.2/arch/alpha/kernel/asm-offsets.c linux-2.6.14.2-vs2.1.0-rc8/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.14.2/arch/alpha/kernel/asm-offsets.c 2004-08-14 12:56:24 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/alpha/kernel/asm-offsets.c 2005-10-29 04:15:18 +0200
+diff -NurpP --minimal linux-2.6.15/arch/alpha/kernel/asm-offsets.c linux-2.6.15-vs2.1.0.4/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.15/arch/alpha/kernel/asm-offsets.c 2004-08-14 12:56:24 +0200
++++ linux-2.6.15-vs2.1.0.4/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);
@@ -134,9 +131,9 @@
DEFINE(SIGCHLD, SIGCHLD);
BLANK();
-diff -NurpP --minimal linux-2.6.14.2/arch/alpha/kernel/entry.S linux-2.6.14.2-vs2.1.0-rc8/arch/alpha/kernel/entry.S
---- linux-2.6.14.2/arch/alpha/kernel/entry.S 2005-10-28 20:49:08 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/alpha/kernel/entry.S 2005-10-29 04:06:52 +0200
+diff -NurpP --minimal linux-2.6.15/arch/alpha/kernel/entry.S linux-2.6.15-vs2.1.0.4/arch/alpha/kernel/entry.S
+--- linux-2.6.15/arch/alpha/kernel/entry.S 2005-10-28 20:49:08 +0200
++++ linux-2.6.15-vs2.1.0.4/arch/alpha/kernel/entry.S 2006-01-04 21:59:59 +0100
@@ -645,7 +645,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
@@ -176,9 +173,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.14.2/arch/alpha/kernel/ptrace.c linux-2.6.14.2-vs2.1.0-rc8/arch/alpha/kernel/ptrace.c
---- linux-2.6.14.2/arch/alpha/kernel/ptrace.c 2005-06-22 02:37:51 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/alpha/kernel/ptrace.c 2005-10-29 03:33:25 +0200
+diff -NurpP --minimal linux-2.6.15/arch/alpha/kernel/ptrace.c linux-2.6.15-vs2.1.0.4/arch/alpha/kernel/ptrace.c
+--- linux-2.6.15/arch/alpha/kernel/ptrace.c 2005-06-22 02:37:51 +0200
++++ linux-2.6.15-vs2.1.0.4/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)
@@ -188,9 +185,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
-diff -NurpP --minimal linux-2.6.14.2/arch/alpha/kernel/systbls.S linux-2.6.14.2-vs2.1.0-rc8/arch/alpha/kernel/systbls.S
---- linux-2.6.14.2/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/alpha/kernel/systbls.S 2005-10-29 03:19:01 +0200
+diff -NurpP --minimal linux-2.6.15/arch/alpha/kernel/systbls.S linux-2.6.15-vs2.1.0.4/arch/alpha/kernel/systbls.S
+--- linux-2.6.15/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
++++ linux-2.6.15-vs2.1.0.4/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
@@ -200,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.14.2/arch/alpha/mm/init.c linux-2.6.14.2-vs2.1.0-rc8/arch/alpha/mm/init.c
---- linux-2.6.14.2/arch/alpha/mm/init.c 2005-03-02 12:38:18 +0100
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/alpha/mm/init.c 2005-10-29 03:20:33 +0200
+diff -NurpP --minimal linux-2.6.15/arch/alpha/mm/init.c linux-2.6.15-vs2.1.0.4/arch/alpha/mm/init.c
+--- linux-2.6.15/arch/alpha/mm/init.c 2005-03-02 12:38:18 +0100
++++ linux-2.6.15-vs2.1.0.4/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 */
@@ -211,10 +208,10 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.14.2/arch/arm/Kconfig linux-2.6.14.2-vs2.1.0-rc8/arch/arm/Kconfig
---- linux-2.6.14.2/arch/arm/Kconfig 2005-10-28 20:49:08 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/arm/Kconfig 2005-10-29 03:28:54 +0200
-@@ -739,6 +739,8 @@ source "arch/arm/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.15/arch/arm/Kconfig linux-2.6.15-vs2.1.0.4/arch/arm/Kconfig
+--- linux-2.6.15/arch/arm/Kconfig 2006-01-03 17:29:06 +0100
++++ linux-2.6.15-vs2.1.0.4/arch/arm/Kconfig 2006-01-04 21:59:59 +0100
+@@ -756,6 +756,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -223,9 +220,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.14.2/arch/arm/kernel/calls.S linux-2.6.14.2-vs2.1.0-rc8/arch/arm/kernel/calls.S
---- linux-2.6.14.2/arch/arm/kernel/calls.S 2005-10-28 20:49:08 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/arm/kernel/calls.S 2005-10-29 03:19:01 +0200
+diff -NurpP --minimal linux-2.6.15/arch/arm/kernel/calls.S linux-2.6.15-vs2.1.0.4/arch/arm/kernel/calls.S
+--- linux-2.6.15/arch/arm/kernel/calls.S 2006-01-03 17:29:06 +0100
++++ linux-2.6.15-vs2.1.0.4/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
@@ -235,10 +232,10 @@
.long sys_ioprio_set
/* 315 */ .long sys_ioprio_get
.long sys_inotify_init
-diff -NurpP --minimal linux-2.6.14.2/arch/arm/kernel/process.c linux-2.6.14.2-vs2.1.0-rc8/arch/arm/kernel/process.c
---- linux-2.6.14.2/arch/arm/kernel/process.c 2005-08-29 22:24:50 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/arm/kernel/process.c 2005-10-29 03:44:35 +0200
-@@ -436,7 +436,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+diff -NurpP --minimal linux-2.6.15/arch/arm/kernel/process.c linux-2.6.15-vs2.1.0.4/arch/arm/kernel/process.c
+--- linux-2.6.15/arch/arm/kernel/process.c 2006-01-03 17:29:06 +0100
++++ linux-2.6.15-vs2.1.0.4/arch/arm/kernel/process.c 2006-01-04 21:59:59 +0100
+@@ -449,7 +449,8 @@ pid_t kernel_thread(int (*fn)(void *), v
regs.ARM_pc = (unsigned long)kernel_thread_helper;
regs.ARM_cpsr = SVC_MODE;
@@ -248,21 +245,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.14.2/arch/arm/kernel/ptrace.c linux-2.6.14.2-vs2.1.0-rc8/arch/arm/kernel/ptrace.c
---- linux-2.6.14.2/arch/arm/kernel/ptrace.c 2005-06-22 02:37:52 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/arm/kernel/ptrace.c 2005-10-29 03:33:25 +0200
-@@ -809,6 +809,8 @@ asmlinkage int sys_ptrace(long request,
- read_unlock(&tasklist_lock);
- if (!child)
- goto out;
-+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
-+ goto out_tsk;
-
- ret = -EPERM;
- if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.14.2/arch/arm26/Kconfig linux-2.6.14.2-vs2.1.0-rc8/arch/arm26/Kconfig
---- linux-2.6.14.2/arch/arm26/Kconfig 2005-10-28 20:49:09 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/arm26/Kconfig 2005-10-29 03:28:54 +0200
+diff -NurpP --minimal linux-2.6.15/arch/arm26/Kconfig linux-2.6.15-vs2.1.0.4/arch/arm26/Kconfig
+--- linux-2.6.15/arch/arm26/Kconfig 2005-10-28 20:49:09 +0200
++++ linux-2.6.15-vs2.1.0.4/arch/arm26/Kconfig 2006-01-04 21:59:59 +0100
@@ -232,6 +232,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -272,9 +257,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.14.2/arch/arm26/kernel/calls.S linux-2.6.14.2-vs2.1.0-rc8/arch/arm26/kernel/calls.S
---- linux-2.6.14.2/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/arm26/kernel/calls.S 2005-10-29 03:19:01 +0200
+diff -NurpP --minimal linux-2.6.15/arch/arm26/kernel/calls.S linux-2.6.15-vs2.1.0.4/arch/arm26/kernel/calls.S
+--- linux-2.6.15/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
++++ linux-2.6.15-vs2.1.0.4/arch/arm26/kernel/calls.S 2006-01-04 21:59:59 +0100
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -287,10 +272,10 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.14.2/arch/arm26/kernel/process.c linux-2.6.14.2-vs2.1.0-rc8/arch/arm26/kernel/process.c
---- linux-2.6.14.2/arch/arm26/kernel/process.c 2005-08-29 22:24:51 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/arm26/kernel/process.c 2005-10-29 04:06:52 +0200
-@@ -369,7 +369,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+diff -NurpP --minimal linux-2.6.15/arch/arm26/kernel/process.c linux-2.6.15-vs2.1.0.4/arch/arm26/kernel/process.c
+--- linux-2.6.15/arch/arm26/kernel/process.c 2006-01-03 17:29:08 +0100
++++ linux-2.6.15-vs2.1.0.4/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;
@@ -300,21 +285,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.14.2/arch/arm26/kernel/ptrace.c linux-2.6.14.2-vs2.1.0-rc8/arch/arm26/kernel/ptrace.c
---- linux-2.6.14.2/arch/arm26/kernel/ptrace.c 2005-06-22 02:37:53 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/arm26/kernel/ptrace.c 2005-10-29 03:33:25 +0200
-@@ -692,6 +692,8 @@ asmlinkage int sys_ptrace(long request,
- read_unlock(&tasklist_lock);
- if (!child)
- goto out;
-+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
-+ goto out_tsk;
-
- ret = -EPERM;
- if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.14.2/arch/cris/Kconfig linux-2.6.14.2-vs2.1.0-rc8/arch/cris/Kconfig
---- linux-2.6.14.2/arch/cris/Kconfig 2005-08-29 22:24:51 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/cris/Kconfig 2005-10-29 03:28:54 +0200
+diff -NurpP --minimal linux-2.6.15/arch/cris/Kconfig linux-2.6.15-vs2.1.0.4/arch/cris/Kconfig
+--- linux-2.6.15/arch/cris/Kconfig 2005-08-29 22:24:51 +0200
++++ linux-2.6.15-vs2.1.0.4/arch/cris/Kconfig 2006-01-04 21:59:59 +0100
@@ -177,6 +177,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -324,9 +297,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.14.2/arch/cris/arch-v10/kernel/process.c linux-2.6.14.2-vs2.1.0-rc8/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.14.2/arch/cris/arch-v10/kernel/process.c 2005-08-29 22:24:51 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/cris/arch-v10/kernel/process.c 2005-10-29 04:22:54 +0200
+diff -NurpP --minimal linux-2.6.15/arch/cris/arch-v10/kernel/process.c linux-2.6.15-vs2.1.0.4/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.15/arch/cris/arch-v10/kernel/process.c 2005-08-29 22:24:51 +0200
++++ linux-2.6.15-vs2.1.0.4/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;
@@ -337,9 +310,9 @@
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.14.2/arch/cris/arch-v32/kernel/process.c linux-2.6.14.2-vs2.1.0-rc8/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.14.2/arch/cris/arch-v32/kernel/process.c 2005-08-29 22:24:51 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/cris/arch-v32/kernel/process.c 2005-10-29 04:06:52 +0200
+diff -NurpP --minimal linux-2.6.15/arch/cris/arch-v32/kernel/process.c linux-2.6.15-vs2.1.0.4/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.15/arch/cris/arch-v32/kernel/process.c 2005-08-29 22:24:51 +0200
++++ linux-2.6.15-vs2.1.0.4/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);
@@ -350,9 +323,9 @@
}
/*
-diff -NurpP --minimal linux-2.6.14.2/arch/frv/kernel/kernel_thread.S linux-2.6.14.2-vs2.1.0-rc8/arch/frv/kernel/kernel_thread.S
---- linux-2.6.14.2/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/frv/kernel/kernel_thread.S 2005-10-29 04:33:06 +0200
+diff -NurpP --minimal linux-2.6.15/arch/frv/kernel/kernel_thread.S linux-2.6.15-vs2.1.0.4/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.15/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
++++ linux-2.6.15-vs2.1.0.4/arch/frv/kernel/kernel_thread.S 2006-01-04 21:59:59 +0100
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -371,9 +344,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.14.2/arch/h8300/Kconfig linux-2.6.14.2-vs2.1.0-rc8/arch/h8300/Kconfig
---- linux-2.6.14.2/arch/h8300/Kconfig 2005-08-29 22:24:52 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/h8300/Kconfig 2005-10-29 03:28:54 +0200
+diff -NurpP --minimal linux-2.6.15/arch/h8300/Kconfig linux-2.6.15-vs2.1.0.4/arch/h8300/Kconfig
+--- linux-2.6.15/arch/h8300/Kconfig 2005-08-29 22:24:52 +0200
++++ linux-2.6.15-vs2.1.0.4/arch/h8300/Kconfig 2006-01-04 21:59:59 +0100
@@ -191,6 +191,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -383,10 +356,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.14.2/arch/h8300/kernel/process.c linux-2.6.14.2-vs2.1.0-rc8/arch/h8300/kernel/process.c
---- linux-2.6.14.2/arch/h8300/kernel/process.c 2005-08-29 22:24:52 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/h8300/kernel/process.c 2005-10-29 04:22:54 +0200
-@@ -130,7 +130,7 @@ int kernel_thread(int (*fn)(void *), voi
+diff -NurpP --minimal linux-2.6.15/arch/h8300/kernel/process.c linux-2.6.15-vs2.1.0.4/arch/h8300/kernel/process.c
+--- linux-2.6.15/arch/h8300/kernel/process.c 2006-01-03 17:29:08 +0100
++++ linux-2.6.15-vs2.1.0.4/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();
set_fs (KERNEL_DS);
@@ -395,22 +368,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.14.2/arch/h8300/kernel/ptrace.c linux-2.6.14.2-vs2.1.0-rc8/arch/h8300/kernel/ptrace.c
---- linux-2.6.14.2/arch/h8300/kernel/ptrace.c 2005-06-22 02:37:53 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/h8300/kernel/ptrace.c 2005-10-29 03:33:25 +0200
-@@ -81,6 +81,8 @@ asmlinkage int sys_ptrace(long request,
- read_unlock(&tasklist_lock);
- if (!child)
- goto out;
-+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
-+ goto out_tsk;
-
- ret = -EPERM;
- if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.14.2/arch/i386/Kconfig linux-2.6.14.2-vs2.1.0-rc8/arch/i386/Kconfig
---- linux-2.6.14.2/arch/i386/Kconfig 2005-10-28 20:49:09 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/i386/Kconfig 2005-10-29 03:28:54 +0200
-@@ -746,6 +746,46 @@ config HIGHMEM64G
+diff -NurpP --minimal linux-2.6.15/arch/i386/Kconfig linux-2.6.15-vs2.1.0.4/arch/i386/Kconfig
+--- linux-2.6.15/arch/i386/Kconfig 2006-01-03 17:29:08 +0100
++++ linux-2.6.15-vs2.1.0.4/arch/i386/Kconfig 2006-01-04 21:59:59 +0100
+@@ -448,6 +448,46 @@ config HIGHMEM64G
endchoice
@@ -457,7 +418,7 @@
config HIGHMEM
bool
depends on HIGHMEM64G || HIGHMEM4G
-@@ -1299,6 +1339,8 @@ source "arch/i386/oprofile/Kconfig"
+@@ -1014,6 +1054,8 @@ endmenu
source "arch/i386/Kconfig.debug"
@@ -466,9 +427,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.14.2/arch/i386/boot/compressed/misc.c linux-2.6.14.2-vs2.1.0-rc8/arch/i386/boot/compressed/misc.c
---- linux-2.6.14.2/arch/i386/boot/compressed/misc.c 2005-08-29 22:24:52 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/i386/boot/compressed/misc.c 2005-10-29 04:43:33 +0200
+diff -NurpP --minimal linux-2.6.15/arch/i386/boot/compressed/misc.c linux-2.6.15-vs2.1.0.4/arch/i386/boot/compressed/misc.c
+--- linux-2.6.15/arch/i386/boot/compressed/misc.c 2005-08-29 22:24:52 +0200
++++ linux-2.6.15-vs2.1.0.4/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");
@@ -489,10 +450,10 @@
mv->hcount = 0; /* say: we need not to move high_buffer */
}
else mv->hcount = -1;
-diff -NurpP --minimal linux-2.6.14.2/arch/i386/kernel/process.c linux-2.6.14.2-vs2.1.0-rc8/arch/i386/kernel/process.c
---- linux-2.6.14.2/arch/i386/kernel/process.c 2005-10-28 20:49:10 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/i386/kernel/process.c 2005-10-29 04:43:33 +0200
-@@ -357,7 +357,8 @@ int kernel_thread(int (*fn)(void *), voi
+diff -NurpP --minimal linux-2.6.15/arch/i386/kernel/process.c linux-2.6.15-vs2.1.0.4/arch/i386/kernel/process.c
+--- linux-2.6.15/arch/i386/kernel/process.c 2006-01-03 17:29:09 +0100
++++ linux-2.6.15-vs2.1.0.4/arch/i386/kernel/process.c 2006-01-04 21:59:59 +0100
+@@ -351,7 +351,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.. */
@@ -502,22 +463,10 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.14.2/arch/i386/kernel/ptrace.c linux-2.6.14.2-vs2.1.0-rc8/arch/i386/kernel/ptrace.c
---- linux-2.6.14.2/arch/i386/kernel/ptrace.c 2005-10-28 20:49:10 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/i386/kernel/ptrace.c 2005-10-29 03:33:25 +0200
-@@ -383,6 +383,8 @@ asmlinkage int sys_ptrace(long request,
- read_unlock(&tasklist_lock);
- if (!child)
- goto out;
-+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
-+ goto out_tsk;
-
- ret = -EPERM;
- if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.14.2/arch/i386/kernel/setup.c linux-2.6.14.2-vs2.1.0-rc8/arch/i386/kernel/setup.c
---- linux-2.6.14.2/arch/i386/kernel/setup.c 2005-10-28 20:49:10 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/i386/kernel/setup.c 2005-10-29 04:43:33 +0200
-@@ -1176,8 +1176,8 @@ void __init setup_bootmem_allocator(void
+diff -NurpP --minimal linux-2.6.15/arch/i386/kernel/setup.c linux-2.6.15-vs2.1.0.4/arch/i386/kernel/setup.c
+--- linux-2.6.15/arch/i386/kernel/setup.c 2006-01-03 17:29:09 +0100
++++ linux-2.6.15-vs2.1.0.4/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 +477,9 @@
/*
* reserve physical page 0 - it's a special BIOS page on many boxes,
-diff -NurpP --minimal linux-2.6.14.2/arch/i386/kernel/sys_i386.c linux-2.6.14.2-vs2.1.0-rc8/arch/i386/kernel/sys_i386.c
---- linux-2.6.14.2/arch/i386/kernel/sys_i386.c 2004-08-14 12:56:23 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/i386/kernel/sys_i386.c 2005-10-29 03:20:33 +0200
+diff -NurpP --minimal linux-2.6.15/arch/i386/kernel/sys_i386.c linux-2.6.15-vs2.1.0.4/arch/i386/kernel/sys_i386.c
+--- linux-2.6.15/arch/i386/kernel/sys_i386.c 2004-08-14 12:56:23 +0200
++++ linux-2.6.15-vs2.1.0.4/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 +527,9 @@
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.14.2/arch/i386/kernel/syscall_table.S linux-2.6.14.2-vs2.1.0-rc8/arch/i386/kernel/syscall_table.S
---- linux-2.6.14.2/arch/i386/kernel/syscall_table.S 2005-08-29 22:24:52 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/i386/kernel/syscall_table.S 2005-10-29 03:19:01 +0200
+diff -NurpP --minimal linux-2.6.15/arch/i386/kernel/syscall_table.S linux-2.6.15-vs2.1.0.4/arch/i386/kernel/syscall_table.S
+--- linux-2.6.15/arch/i386/kernel/syscall_table.S 2005-08-29 22:24:52 +0200
++++ linux-2.6.15-vs2.1.0.4/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 +539,9 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.14.2/arch/i386/kernel/traps.c linux-2.6.14.2-vs2.1.0-rc8/arch/i386/kernel/traps.c
---- linux-2.6.14.2/arch/i386/kernel/traps.c 2005-10-28 20:49:10 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/i386/kernel/traps.c 2005-10-29 03:20:33 +0200
+diff -NurpP --minimal linux-2.6.15/arch/i386/kernel/traps.c linux-2.6.15-vs2.1.0.4/arch/i386/kernel/traps.c
+--- linux-2.6.15/arch/i386/kernel/traps.c 2006-01-03 17:29:09 +0100
++++ linux-2.6.15-vs2.1.0.4/arch/i386/kernel/traps.c 2006-01-04 21:59:59 +0100
@@ -53,6 +53,7 @@
#include <asm/kdebug.h>
@@ -621,10 +570,10 @@
} else
printk(KERN_ERR "Recursive die() failure, output suppressed\n");
-diff -NurpP --minimal linux-2.6.14.2/arch/ia64/Kconfig linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/Kconfig
---- linux-2.6.14.2/arch/ia64/Kconfig 2005-10-28 20:49:10 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/Kconfig 2005-10-29 03:28:54 +0200
-@@ -408,6 +408,8 @@ source "arch/ia64/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.15/arch/ia64/Kconfig linux-2.6.15-vs2.1.0.4/arch/ia64/Kconfig
+--- linux-2.6.15/arch/ia64/Kconfig 2006-01-03 17:29:09 +0100
++++ linux-2.6.15-vs2.1.0.4/arch/ia64/Kconfig 2006-01-04 21:59:59 +0100
+@@ -461,6 +461,8 @@ endmenu
source "arch/ia64/Kconfig.debug"
@@ -633,9 +582,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.14.2/arch/ia64/ia32/binfmt_elf32.c linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.14.2/arch/ia64/ia32/binfmt_elf32.c 2005-10-28 20:49:10 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/ia32/binfmt_elf32.c 2005-10-29 04:33:06 +0200
+diff -NurpP --minimal linux-2.6.15/arch/ia64/ia32/binfmt_elf32.c linux-2.6.15-vs2.1.0.4/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.15/arch/ia64/ia32/binfmt_elf32.c 2006-01-03 17:29:09 +0100
++++ linux-2.6.15-vs2.1.0.4/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)
@@ -655,9 +604,9 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.14.2/arch/ia64/ia32/ia32_entry.S linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.14.2/arch/ia64/ia32/ia32_entry.S 2005-10-28 20:49:10 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/ia32/ia32_entry.S 2005-10-29 03:19:01 +0200
+diff -NurpP --minimal linux-2.6.15/arch/ia64/ia32/ia32_entry.S linux-2.6.15-vs2.1.0.4/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.15/arch/ia64/ia32/ia32_entry.S 2005-10-28 20:49:10 +0200
++++ linux-2.6.15-vs2.1.0.4/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
@@ -667,9 +616,9 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.14.2/arch/ia64/kernel/asm-offsets.c linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/kernel/asm-offsets.c
---- linux-2.6.14.2/arch/ia64/kernel/asm-offsets.c 2005-10-28 20:49:10 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/kernel/asm-offsets.c 2005-10-29 04:43:33 +0200
+diff -NurpP --minimal linux-2.6.15/arch/ia64/kernel/asm-offsets.c linux-2.6.15-vs2.1.0.4/arch/ia64/kernel/asm-offsets.c
+--- linux-2.6.15/arch/ia64/kernel/asm-offsets.c 2005-10-28 20:49:10 +0200
++++ linux-2.6.15-vs2.1.0.4/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);
@@ -678,9 +627,9 @@
BLANK();
DEFINE(IA64_CPUINFO_NSEC_PER_CYC_OFFSET,
-diff -NurpP --minimal linux-2.6.14.2/arch/ia64/kernel/entry.S linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/kernel/entry.S
---- linux-2.6.14.2/arch/ia64/kernel/entry.S 2005-10-28 20:49:10 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/kernel/entry.S 2005-10-29 03:19:01 +0200
+diff -NurpP --minimal linux-2.6.15/arch/ia64/kernel/entry.S linux-2.6.15-vs2.1.0.4/arch/ia64/kernel/entry.S
+--- linux-2.6.15/arch/ia64/kernel/entry.S 2005-10-28 20:49:10 +0200
++++ linux-2.6.15-vs2.1.0.4/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
@@ -690,9 +639,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.14.2/arch/ia64/kernel/perfmon.c linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/kernel/perfmon.c
---- linux-2.6.14.2/arch/ia64/kernel/perfmon.c 2005-10-28 20:49:11 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/kernel/perfmon.c 2005-10-29 04:33:06 +0200
+diff -NurpP --minimal linux-2.6.15/arch/ia64/kernel/perfmon.c linux-2.6.15-vs2.1.0.4/arch/ia64/kernel/perfmon.c
+--- linux-2.6.15/arch/ia64/kernel/perfmon.c 2006-01-03 17:29:09 +0100
++++ linux-2.6.15-vs2.1.0.4/arch/ia64/kernel/perfmon.c 2006-01-04 21:59:59 +0100
@@ -39,6 +39,8 @@
#include <linux/mount.h>
#include <linux/bitops.h>
@@ -708,13 +657,13 @@
- mm->total_vm += size >> PAGE_SHIFT;
+ vx_vmpages_add(mm, size >> PAGE_SHIFT);
- vm_stat_account(vma);
+ 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.14.2/arch/ia64/kernel/process.c linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/kernel/process.c
---- linux-2.6.14.2/arch/ia64/kernel/process.c 2005-08-29 22:24:53 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/kernel/process.c 2005-10-29 04:06:52 +0200
-@@ -683,7 +683,8 @@ kernel_thread (int (*fn)(void *), void *
+diff -NurpP --minimal linux-2.6.15/arch/ia64/kernel/process.c linux-2.6.15-vs2.1.0.4/arch/ia64/kernel/process.c
+--- linux-2.6.15/arch/ia64/kernel/process.c 2006-01-03 17:29:09 +0100
++++ linux-2.6.15-vs2.1.0.4/arch/ia64/kernel/process.c 2006-01-04 21:59:59 +0100
+@@ -692,7 +692,8 @@ kernel_thread (int (*fn)(void *), void *
regs.sw.ar_fpsr = regs.pt.ar_fpsr = ia64_getreg(_IA64_REG_AR_FPSR);
regs.sw.ar_bspstore = (unsigned long) current + IA64_RBS_OFFSET;
regs.sw.pr = (1 << PRED_KERNEL_STACK);
@@ -724,10 +673,10 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.14.2/arch/ia64/kernel/ptrace.c linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/kernel/ptrace.c
---- linux-2.6.14.2/arch/ia64/kernel/ptrace.c 2005-08-29 22:24:53 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/kernel/ptrace.c 2005-10-29 03:33:25 +0200
-@@ -1456,6 +1456,9 @@ sys_ptrace (long request, pid_t pid, uns
+diff -NurpP --minimal linux-2.6.15/arch/ia64/kernel/ptrace.c linux-2.6.15-vs2.1.0.4/arch/ia64/kernel/ptrace.c
+--- linux-2.6.15/arch/ia64/kernel/ptrace.c 2006-01-03 17:29:09 +0100
++++ linux-2.6.15-vs2.1.0.4/arch/ia64/kernel/ptrace.c 2006-01-04 21:59:59 +0100
+@@ -1450,6 +1450,9 @@ sys_ptrace (long request, pid_t pid, uns
read_unlock(&tasklist_lock);
if (!child)
goto out;
@@ -737,9 +686,9 @@
ret = -EPERM;
if (pid == 1) /* no messing around with init! */
goto out_tsk;
-diff -NurpP --minimal linux-2.6.14.2/arch/ia64/mm/fault.c linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/mm/fault.c
---- linux-2.6.14.2/arch/ia64/mm/fault.c 2005-10-28 20:49:11 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/ia64/mm/fault.c 2005-10-29 04:33:06 +0200
+diff -NurpP --minimal linux-2.6.15/arch/ia64/mm/fault.c linux-2.6.15-vs2.1.0.4/arch/ia64/mm/fault.c
+--- linux-2.6.15/arch/ia64/mm/fault.c 2006-01-03 17:29:09 +0100
++++ linux-2.6.15-vs2.1.0.4/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>
@@ -748,31 +697,10 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -35,12 +36,17 @@ expand_backing_store (struct vm_area_str
-
- grow = PAGE_SIZE >> PAGE_SHIFT;
- if (address - vma->vm_start > current->signal->rlim[RLIMIT_STACK].rlim_cur
-- || (((vma->vm_mm->total_vm + grow) << PAGE_SHIFT) > current->signal->rlim[RLIMIT_AS].rlim_cur))
-+ || (((vma->vm_mm->total_vm + grow) << PAGE_SHIFT) >
-+ current->signal->rlim[RLIMIT_AS].rlim_cur))
-+ return -ENOMEM;
-+ if (!vx_vmpages_avail(vma->vm_mm, grow) ||
-+ ((vma->vm_flags & VM_LOCKED) &&
-+ !vx_vmlocked_avail(vma->vm_mm, grow)))
- return -ENOMEM;
- vma->vm_end += PAGE_SIZE;
-- vma->vm_mm->total_vm += grow;
-+ vx_vmpages_add(vma->vm_mm, grow);
- if (vma->vm_flags & VM_LOCKED)
-- vma->vm_mm->locked_vm += grow;
-+ vx_vmlocked_add(vma->vm_mm, grow);
- __vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, grow);
- return 0;
- }
-diff -NurpP --minimal linux-2.6.14.2/arch/m32r/kernel/process.c linux-2.6.14.2-vs2.1.0-rc8/arch/m32r/kernel/process.c
---- linux-2.6.14.2/arch/m32r/kernel/process.c 2005-08-29 22:24:53 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/m32r/kernel/process.c 2005-10-29 03:19:01 +0200
-@@ -202,8 +202,8 @@ int kernel_thread(int (*fn)(void *), voi
+diff -NurpP --minimal linux-2.6.15/arch/m32r/kernel/process.c linux-2.6.15-vs2.1.0.4/arch/m32r/kernel/process.c
+--- linux-2.6.15/arch/m32r/kernel/process.c 2006-01-03 17:29:09 +0100
++++ linux-2.6.15-vs2.1.0.4/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;
/* Ok, create the new process. */
@@ -783,10 +711,10 @@
}
/*
-diff -NurpP --minimal linux-2.6.14.2/arch/m68k/Kconfig linux-2.6.14.2-vs2.1.0-rc8/arch/m68k/Kconfig
---- linux-2.6.14.2/arch/m68k/Kconfig 2005-10-28 20:49:11 +0200
-+++ linux-2.6.14.2-vs2.1.0-rc8/arch/m68k/Kconfig 2005-10-29 03:28:54 +0200
-@@ -672,6 +672,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.15/arch/m68k/Kconfig linux-2.6.15-vs2.1.0.4/arch/m68k/Kconfig
+--- linux-2.6.15/arch/m68k/Kconfig 2006-01-03 17:29:10 +0100
++++ linux-2.6.15-vs2.1.0.4/arch/m68k/Kconfig 2006-01-04 21:59:59 +0100
+@@ -650,6 +650,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -795,10 +723,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
<<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.3&r2=1.1.2.4&f=u
More information about the pld-cvs-commit
mailing list