Author: baggins Date: Mon Sep 25 23:26:40 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- up to 2.6.18-vs2.1.1-rc35-t1
---- Files affected:
SOURCES:
linux-2.6-vs2.1.patch (1.1.2.33 -> 1.1.2.34)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.33
SOURCES/linux-2.6-vs2.1.patch:1.1.2.34
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.33 Tue Sep 12 20:51:03 2006
+++ SOURCES/linux-2.6-vs2.1.patch Tue Sep 26 01:26:33 2006
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.17.11/Documentation/vserver/debug.txt
linux-2.6.17.11-vs2.1.1-rc31/Documentation/vserver/debug.txt
---- linux-2.6.17.11/Documentation/vserver/debug.txt 1970-01-01 01:00:00
+0100
-+++ linux-2.6.17.11-vs2.1.1-rc31/Documentation/vserver/debug.txt
2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.18/Documentation/vserver/debug.txt
linux-2.6.18-vs2.1.1-rc35-t1/Documentation/vserver/debug.txt
+--- linux-2.6.18/Documentation/vserver/debug.txt 1970-01-01 01:00:00
+0100
++++ linux-2.6.18-vs2.1.1-rc35-t1/Documentation/vserver/debug.txt
2006-09-25 15:40:02 +0200
@@ -0,0 +1,108 @@
+
+debug_cvirt:
@@ -110,9 +110,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.17.11/arch/alpha/Kconfig
linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/Kconfig
---- linux-2.6.17.11/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/Kconfig 2006-07-09 17:06:47
+0200
+diff -NurpP --minimal linux-2.6.18/arch/alpha/Kconfig
linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/Kconfig
+--- linux-2.6.18/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/Kconfig 2006-09-20 17:01:44
+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.17.11/arch/alpha/kernel/asm-offsets.c
linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.17.11/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10
+0100
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/asm-offsets.c
2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.18/arch/alpha/kernel/asm-offsets.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.18/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10
+0100
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/kernel/asm-offsets.c
2006-09-25 15:40:02 +0200
@@ -36,6 +36,7 @@ void foo(void)
DEFINE(PT_PTRACED, PT_PTRACED);
DEFINE(CLONE_VM, CLONE_VM);
@@ -133,10 +133,10 @@
DEFINE(SIGCHLD, SIGCHLD);
BLANK();
-diff -NurpP --minimal linux-2.6.17.11/arch/alpha/kernel/entry.S
linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/entry.S
---- linux-2.6.17.11/arch/alpha/kernel/entry.S 2006-04-09 13:49:39 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/entry.S 2006-07-09
17:06:47 +0200
-@@ -645,7 +645,7 @@ kernel_thread:
+diff -NurpP --minimal linux-2.6.18/arch/alpha/kernel/entry.S
linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/kernel/entry.S
+--- linux-2.6.18/arch/alpha/kernel/entry.S 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/kernel/entry.S 2006-09-25
15:40:02 +0200
+@@ -644,7 +644,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
/* Shuffle FLAGS to the front; add CLONE_VM. */
@@ -145,7 +145,7 @@
or $18, $1, $16
bsr $26, sys_clone
-@@ -874,24 +874,15 @@ sys_getxgid:
+@@ -873,24 +873,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
sys_getxpid:
@@ -177,9 +177,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.17.11/arch/alpha/kernel/osf_sys.c
linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/osf_sys.c
---- linux-2.6.17.11/arch/alpha/kernel/osf_sys.c 2006-06-18 04:51:38
+0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/osf_sys.c 2006-07-09
17:06:47 +0200
+diff -NurpP --minimal linux-2.6.18/arch/alpha/kernel/osf_sys.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.18/arch/alpha/kernel/osf_sys.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/kernel/osf_sys.c 2006-09-25
15:40:02 +0200
@@ -38,6 +38,7 @@
#include <linux/uio.h>
#include <linux/vfs.h>
@@ -255,13 +255,13 @@
long len, err = -EINVAL;
offset = command-1;
-- if (offset >= sizeof(sysinfo_table)/sizeof(char *)) {
+- if (offset >= ARRAY_SIZE(sysinfo_table)) {
+ if (offset >= 9) {
/* Digital UNIX has a few unpublished interfaces here */
printk("sysinfo(%d)", command);
goto out;
}
-
+
down_read(&uts_sem);
- res = sysinfo_table[offset];
+ switch (offset)
@@ -288,9 +288,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.17.11/arch/alpha/kernel/ptrace.c
linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/ptrace.c
---- linux-2.6.17.11/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/ptrace.c 2006-08-06
06:00:35 +0200
+diff -NurpP --minimal linux-2.6.18/arch/alpha/kernel/ptrace.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/kernel/ptrace.c
+--- linux-2.6.18/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/kernel/ptrace.c 2006-09-25
15:40:02 +0200
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -311,9 +311,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -NurpP --minimal linux-2.6.17.11/arch/alpha/kernel/systbls.S
linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/systbls.S
---- linux-2.6.17.11/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49
+0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/systbls.S 2006-07-09
17:06:47 +0200
+diff -NurpP --minimal linux-2.6.18/arch/alpha/kernel/systbls.S
linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/kernel/systbls.S
+--- linux-2.6.18/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/kernel/systbls.S 2006-09-20
17:01:44 +0200
@@ -447,7 +447,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -323,10 +323,10 @@
.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.17.11/arch/alpha/kernel/traps.c
linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/traps.c
---- linux-2.6.17.11/arch/alpha/kernel/traps.c 2005-10-28 20:49:08 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/kernel/traps.c 2006-07-09
17:06:47 +0200
-@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
+diff -NurpP --minimal linux-2.6.18/arch/alpha/kernel/traps.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/kernel/traps.c
+--- linux-2.6.18/arch/alpha/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/kernel/traps.c 2006-09-25
15:40:02 +0200
+@@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
#endif
@@ -336,10 +336,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.17.11/arch/alpha/mm/init.c
linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/mm/init.c
---- linux-2.6.17.11/arch/alpha/mm/init.c 2006-06-18 04:51:38 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/alpha/mm/init.c 2006-07-09 17:06:47
+0200
-@@ -21,6 +21,7 @@
+diff -NurpP --minimal linux-2.6.18/arch/alpha/mm/init.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/mm/init.c
+--- linux-2.6.18/arch/alpha/mm/init.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/alpha/mm/init.c 2006-09-20 17:01:44
+0200
+@@ -20,6 +20,7 @@
#include <linux/init.h>
#include <linux/bootmem.h> /* max_low_pfn */
#include <linux/vmalloc.h>
@@ -347,10 +347,10 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.17.11/arch/arm/Kconfig
linux-2.6.17.11-vs2.1.1-rc31/arch/arm/Kconfig
---- linux-2.6.17.11/arch/arm/Kconfig 2006-06-18 04:51:38 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/arm/Kconfig 2006-07-09 17:06:47
+0200
-@@ -873,6 +873,8 @@ source "arch/arm/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.18/arch/arm/Kconfig
linux-2.6.18-vs2.1.1-rc35-t1/arch/arm/Kconfig
+--- linux-2.6.18/arch/arm/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/arm/Kconfig 2006-09-20 17:01:44
+0200
+@@ -907,6 +907,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -359,9 +359,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/arm/kernel/calls.S
linux-2.6.17.11-vs2.1.1-rc31/arch/arm/kernel/calls.S
---- linux-2.6.17.11/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/arm/kernel/calls.S 2006-07-09
17:06:47 +0200
+diff -NurpP --minimal linux-2.6.18/arch/arm/kernel/calls.S
linux-2.6.18-vs2.1.1-rc35-t1/arch/arm/kernel/calls.S
+--- linux-2.6.18/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/arm/kernel/calls.S 2006-09-20
17:01:44 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -371,10 +371,10 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.17.11/arch/arm/kernel/process.c
linux-2.6.17.11-vs2.1.1-rc31/arch/arm/kernel/process.c
---- linux-2.6.17.11/arch/arm/kernel/process.c 2006-06-18 04:51:42 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/arm/kernel/process.c 2006-07-09
17:06:47 +0200
-@@ -227,7 +227,8 @@ void __show_regs(struct pt_regs *regs)
+diff -NurpP --minimal linux-2.6.18/arch/arm/kernel/process.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/arm/kernel/process.c
+--- linux-2.6.18/arch/arm/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/arm/kernel/process.c 2006-09-25
15:40:02 +0200
+@@ -236,7 +236,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
printk("\n");
@@ -384,7 +384,7 @@
__show_regs(regs);
__backtrace();
}
-@@ -461,7 +462,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+@@ -459,7 +460,8 @@ pid_t kernel_thread(int (*fn)(void *), v
regs.ARM_pc = (unsigned long)kernel_thread_helper;
regs.ARM_cpsr = SVC_MODE;
@@ -394,9 +394,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.17.11/arch/arm26/Kconfig
linux-2.6.17.11-vs2.1.1-rc31/arch/arm26/Kconfig
---- linux-2.6.17.11/arch/arm26/Kconfig 2006-06-18 04:51:48 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/arm26/Kconfig 2006-07-09 17:06:47
+0200
+diff -NurpP --minimal linux-2.6.18/arch/arm26/Kconfig
linux-2.6.18-vs2.1.1-rc35-t1/arch/arm26/Kconfig
+--- linux-2.6.18/arch/arm26/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/arm26/Kconfig 2006-09-20 17:01:44
+0200
@@ -234,6 +234,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -406,9 +406,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/arm26/kernel/calls.S
linux-2.6.17.11-vs2.1.1-rc31/arch/arm26/kernel/calls.S
---- linux-2.6.17.11/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/arm26/kernel/calls.S 2006-07-09
17:06:47 +0200
+diff -NurpP --minimal linux-2.6.18/arch/arm26/kernel/calls.S
linux-2.6.18-vs2.1.1-rc35-t1/arch/arm26/kernel/calls.S
+--- linux-2.6.18/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/arm26/kernel/calls.S 2006-09-20
17:01:44 +0200
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -421,10 +421,10 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.17.11/arch/arm26/kernel/process.c
linux-2.6.17.11-vs2.1.1-rc31/arch/arm26/kernel/process.c
---- linux-2.6.17.11/arch/arm26/kernel/process.c 2006-01-18 06:07:51
+0100
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/arm26/kernel/process.c 2006-07-09
17:06:47 +0200
-@@ -366,7 +366,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+diff -NurpP --minimal linux-2.6.18/arch/arm26/kernel/process.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/arm26/kernel/process.c
+--- linux-2.6.18/arch/arm26/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/arm26/kernel/process.c 2006-09-25
15:40:02 +0200
+@@ -365,7 +365,8 @@ pid_t kernel_thread(int (*fn)(void *), v
regs.ARM_r3 = (unsigned long)do_exit;
regs.ARM_pc = (unsigned long)kernel_thread_helper | MODE_SVC26;
@@ -434,10 +434,10 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.17.11/arch/arm26/kernel/traps.c
linux-2.6.17.11-vs2.1.1-rc31/arch/arm26/kernel/traps.c
---- linux-2.6.17.11/arch/arm26/kernel/traps.c 2006-06-18 04:51:48 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/arm26/kernel/traps.c 2006-07-09
17:06:47 +0200
-@@ -186,8 +186,9 @@ NORET_TYPE void die(const char *str, str
+diff -NurpP --minimal linux-2.6.18/arch/arm26/kernel/traps.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/arm26/kernel/traps.c
+--- linux-2.6.18/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/arm26/kernel/traps.c 2006-09-20
17:01:44 +0200
+@@ -185,8 +185,9 @@ NORET_TYPE void die(const char *str, str
printk("Internal error: %s: %x\n", str, err);
printk("CPU: %d\n", smp_processor_id());
show_regs(regs);
@@ -449,10 +449,10 @@
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.17.11/arch/cris/Kconfig
linux-2.6.17.11-vs2.1.1-rc31/arch/cris/Kconfig
---- linux-2.6.17.11/arch/cris/Kconfig 2006-06-18 04:51:48 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/cris/Kconfig 2006-07-09 17:06:47
+0200
-@@ -181,6 +181,8 @@ source "drivers/usb/Kconfig"
+diff -NurpP --minimal linux-2.6.18/arch/cris/Kconfig
linux-2.6.18-vs2.1.1-rc35-t1/arch/cris/Kconfig
+--- linux-2.6.18/arch/cris/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/cris/Kconfig 2006-09-20 17:01:44
+0200
+@@ -185,6 +185,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -461,10 +461,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/cris/arch-v10/kernel/process.c
linux-2.6.17.11-vs2.1.1-rc31/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.17.11/arch/cris/arch-v10/kernel/process.c 2006-01-18
06:07:51 +0100
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/cris/arch-v10/kernel/process.c
2006-07-09 17:06:47 +0200
-@@ -104,7 +104,8 @@ int kernel_thread(int (*fn)(void *), voi
+diff -NurpP --minimal linux-2.6.18/arch/cris/arch-v10/kernel/process.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.18/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57
+0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/cris/arch-v10/kernel/process.c
2006-09-25 15:40:02 +0200
+@@ -103,7 +103,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.dccr = 1 << I_DCCR_BITNR;
/* Ok, create the new process.. */
@@ -474,10 +474,10 @@
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.17.11/arch/cris/arch-v32/kernel/process.c
linux-2.6.17.11-vs2.1.1-rc31/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.17.11/arch/cris/arch-v32/kernel/process.c 2006-01-18
06:07:51 +0100
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/cris/arch-v32/kernel/process.c
2006-07-09 17:06:47 +0200
-@@ -121,7 +121,8 @@ kernel_thread(int (*fn)(void *), void *
+diff -NurpP --minimal linux-2.6.18/arch/cris/arch-v32/kernel/process.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.18/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57
+0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/cris/arch-v32/kernel/process.c
2006-09-25 15:40:02 +0200
+@@ -120,7 +120,8 @@ kernel_thread(int (*fn)(void *), void *
regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
/* Create the new process. */
@@ -487,9 +487,9 @@
}
/*
-diff -NurpP --minimal linux-2.6.17.11/arch/frv/kernel/kernel_thread.S
linux-2.6.17.11-vs2.1.1-rc31/arch/frv/kernel/kernel_thread.S
---- linux-2.6.17.11/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20
+0100
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/frv/kernel/kernel_thread.S
2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.18/arch/frv/kernel/kernel_thread.S
linux-2.6.18-vs2.1.1-rc35-t1/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.18/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20
+0100
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/frv/kernel/kernel_thread.S
2006-09-25 15:40:02 +0200
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -508,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.17.11/arch/frv/mm/mmu-context.c
linux-2.6.17.11-vs2.1.1-rc31/arch/frv/mm/mmu-context.c
---- linux-2.6.17.11/arch/frv/mm/mmu-context.c 2006-06-18 04:51:49 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/frv/mm/mmu-context.c 2006-07-09
17:06:47 +0200
+diff -NurpP --minimal linux-2.6.18/arch/frv/mm/mmu-context.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/frv/mm/mmu-context.c
+--- linux-2.6.18/arch/frv/mm/mmu-context.c 2006-06-18 04:51:49 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/frv/mm/mmu-context.c 2006-09-25
15:40:02 +0200
@@ -11,6 +11,7 @@
#include <linux/sched.h>
@@ -519,9 +519,9 @@
#include <asm/tlbflush.h>
#define NR_CXN 4096
-diff -NurpP --minimal linux-2.6.17.11/arch/h8300/Kconfig
linux-2.6.17.11-vs2.1.1-rc31/arch/h8300/Kconfig
---- linux-2.6.17.11/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/h8300/Kconfig 2006-07-09 17:06:47
+0200
+diff -NurpP --minimal linux-2.6.18/arch/h8300/Kconfig
linux-2.6.18-vs2.1.1-rc35-t1/arch/h8300/Kconfig
+--- linux-2.6.18/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/h8300/Kconfig 2006-09-20 17:01:44
+0200
@@ -199,6 +199,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -531,10 +531,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/h8300/kernel/process.c
linux-2.6.17.11-vs2.1.1-rc31/arch/h8300/kernel/process.c
---- linux-2.6.17.11/arch/h8300/kernel/process.c 2006-06-18 04:51:49
+0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/h8300/kernel/process.c 2006-07-09
17:06:47 +0200
-@@ -135,7 +135,7 @@ int kernel_thread(int (*fn)(void *), voi
+diff -NurpP --minimal linux-2.6.18/arch/h8300/kernel/process.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/h8300/kernel/process.c
+--- linux-2.6.18/arch/h8300/kernel/process.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/h8300/kernel/process.c 2006-09-25
15:40:02 +0200
+@@ -134,7 +134,7 @@ int kernel_thread(int (*fn)(void *), voi
fs = get_fs();
set_fs (KERNEL_DS);
@@ -543,10 +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.17.11/arch/i386/Kconfig
linux-2.6.17.11-vs2.1.1-rc31/arch/i386/Kconfig
---- linux-2.6.17.11/arch/i386/Kconfig 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/i386/Kconfig 2006-07-26 21:36:47
+0200
-@@ -1088,6 +1088,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.18/arch/i386/Kconfig
linux-2.6.18-vs2.1.1-rc35-t1/arch/i386/Kconfig
+--- linux-2.6.18/arch/i386/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/i386/Kconfig 2006-09-20 17:01:44
+0200
+@@ -1142,6 +1142,8 @@ endmenu
source "arch/i386/Kconfig.debug"
@@ -555,10 +555,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/i386/kernel/process.c
linux-2.6.17.11-vs2.1.1-rc31/arch/i386/kernel/process.c
---- linux-2.6.17.11/arch/i386/kernel/process.c 2006-06-18 04:51:53 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/i386/kernel/process.c 2006-07-09
17:06:47 +0200
-@@ -290,8 +290,10 @@ void show_regs(struct pt_regs * regs)
+diff -NurpP --minimal linux-2.6.18/arch/i386/kernel/process.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/i386/kernel/process.c
+--- linux-2.6.18/arch/i386/kernel/process.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/i386/kernel/process.c 2006-09-25
15:40:02 +0200
+@@ -289,8 +289,10 @@ void show_regs(struct pt_regs * regs)
unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
printk("\n");
@@ -571,7 +571,7 @@
print_symbol("EIP is at %s\n", regs->eip);
if (user_mode_vm(regs))
-@@ -351,7 +353,8 @@ int kernel_thread(int (*fn)(void *), voi
+@@ -350,7 +352,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.. */
@@ -581,9 +581,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.17.11/arch/i386/kernel/sys_i386.c
linux-2.6.17.11-vs2.1.1-rc31/arch/i386/kernel/sys_i386.c
---- linux-2.6.17.11/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53
+0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/i386/kernel/sys_i386.c 2006-07-09
17:06:47 +0200
+diff -NurpP --minimal linux-2.6.18/arch/i386/kernel/sys_i386.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/i386/kernel/sys_i386.c
+--- linux-2.6.18/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/i386/kernel/sys_i386.c 2006-09-20
17:01:44 +0200
@@ -19,6 +19,7 @@
#include <linux/mman.h>
#include <linux/file.h>
@@ -631,9 +631,9 @@
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.17.11/arch/i386/kernel/syscall_table.S
linux-2.6.17.11-vs2.1.1-rc31/arch/i386/kernel/syscall_table.S
---- linux-2.6.17.11/arch/i386/kernel/syscall_table.S 2006-06-18 04:51:53
+0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/i386/kernel/syscall_table.S
2006-07-09 17:06:47 +0200
+diff -NurpP --minimal linux-2.6.18/arch/i386/kernel/syscall_table.S
linux-2.6.18-vs2.1.1-rc35-t1/arch/i386/kernel/syscall_table.S
+--- linux-2.6.18/arch/i386/kernel/syscall_table.S 2006-09-20 16:57:58
+0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/i386/kernel/syscall_table.S
2006-09-20 17:01:44 +0200
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -643,9 +643,29 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.17.11/arch/i386/kernel/traps.c
linux-2.6.17.11-vs2.1.1-rc31/arch/i386/kernel/traps.c
---- linux-2.6.17.11/arch/i386/kernel/traps.c 2006-06-18 04:51:53 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/i386/kernel/traps.c 2006-08-17
01:24:55 +0200
+diff -NurpP --minimal linux-2.6.18/arch/i386/kernel/sysenter.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/i386/kernel/sysenter.c
+--- linux-2.6.18/arch/i386/kernel/sysenter.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/i386/kernel/sysenter.c 2006-09-20
21:46:26 +0200
+@@ -17,6 +17,7 @@
+ #include <linux/elf.h>
+ #include <linux/mm.h>
+ #include <linux/module.h>
++#include <linux/vs_memory.h>
+
+ #include <asm/cpufeature.h>
+ #include <asm/msr.h>
+@@ -156,7 +157,7 @@ int arch_setup_additional_pages(struct l
+ current->mm->context.vdso = (void *)addr;
+ current_thread_info()->sysenter_return =
+ (void *)VDSO_SYM(&SYSENTER_RETURN);
+- mm->total_vm++;
++ vx_vmpages_inc(mm);
+ up_fail:
+ up_write(&mm->mmap_sem);
+ return ret;
+diff -NurpP --minimal linux-2.6.18/arch/i386/kernel/traps.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/i386/kernel/traps.c
+--- linux-2.6.18/arch/i386/kernel/traps.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/i386/kernel/traps.c 2006-09-25
15:40:02 +0200
@@ -53,6 +53,8 @@
#include <asm/kdebug.h>
@@ -655,19 +675,18 @@
#include "mach_traps.h"
-@@ -268,8 +270,9 @@ void show_registers(struct pt_regs *regs
+@@ -304,8 +306,8 @@ 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);
-- printk(KERN_EMERG "Process %s (pid: %d, threadinfo=%p task=%p)",
-- current->comm, current->pid, current_thread_info(), current);
-+ printk(KERN_EMERG "Process %s (pid: %d[#%u], threadinfo=%p task=%p)",
-+ current->comm, current->pid, current->xid,
-+ current_thread_info(), current);
+- printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",
+- TASK_COMM_LEN, current->comm, current->pid,
++ printk(KERN_EMERG "Process %.*s (pid: %d[#%u], ti=%p task=%p
task.ti=%p)",
++ TASK_COMM_LEN, current->comm, current->pid, current->xid,
+ current_thread_info(), current, current->thread_info);
/*
* When in-kernel, we also print out the stack and code at the
- * time of the fault..
-@@ -351,6 +354,8 @@ void die(const char * str, struct pt_reg
+@@ -388,6 +390,8 @@ void die(const char * str, struct pt_reg
oops_enter();
@@ -676,7 +695,7 @@
if (die.lock_owner != raw_smp_processor_id()) {
console_verbose();
spin_lock_irqsave(&die.lock, flags);
-@@ -387,9 +392,9 @@ void die(const char * str, struct pt_reg
+@@ -424,9 +428,9 @@ void die(const char * str, struct pt_reg
if (nl)
printk("\n");
if (notify_die(DIE_OOPS, str, regs, err,
@@ -688,10 +707,10 @@
/* Executive summary in case the oops scrolled away */
esp = (unsigned long) (®s->esp);
savesegment(ss, ss);
-diff -NurpP --minimal linux-2.6.17.11/arch/ia64/Kconfig
linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/Kconfig
---- linux-2.6.17.11/arch/ia64/Kconfig 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/Kconfig 2006-07-26 21:36:47
+0200
-@@ -506,6 +506,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.18/arch/ia64/Kconfig
linux-2.6.18-vs2.1.1-rc35-t1/arch/ia64/Kconfig
+--- linux-2.6.18/arch/ia64/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/ia64/Kconfig 2006-09-20 17:01:44
+0200
+@@ -525,6 +525,8 @@ endmenu
source "arch/ia64/Kconfig.debug"
@@ -700,10 +719,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/ia64/ia32/binfmt_elf32.c
linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.17.11/arch/ia64/ia32/binfmt_elf32.c 2006-06-18 04:51:55
+0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/ia32/binfmt_elf32.c 2006-07-09
17:06:47 +0200
-@@ -239,7 +239,8 @@ ia32_setup_arg_pages (struct linux_binpr
+diff -NurpP --minimal linux-2.6.18/arch/ia64/ia32/binfmt_elf32.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.18/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/ia64/ia32/binfmt_elf32.c 2006-09-20
17:01:44 +0200
+@@ -238,7 +238,8 @@ ia32_setup_arg_pages (struct linux_binpr
kmem_cache_free(vm_area_cachep, mpnt);
return ret;
}
@@ -713,9 +732,9 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.17.11/arch/ia64/ia32/ia32_entry.S
linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.17.11/arch/ia64/ia32/ia32_entry.S 2006-06-18 04:51:55
+0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/ia32/ia32_entry.S 2006-07-09
17:06:47 +0200
+diff -NurpP --minimal linux-2.6.18/arch/ia64/ia32/ia32_entry.S
linux-2.6.18-vs2.1.1-rc35-t1/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.18/arch/ia64/ia32/ia32_entry.S 2006-06-18 04:51:55 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/ia64/ia32/ia32_entry.S 2006-09-20
17:01:44 +0200
@@ -483,7 +483,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -725,10 +744,10 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.17.11/arch/ia64/ia32/sys_ia32.c
linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/ia32/sys_ia32.c
---- linux-2.6.17.11/arch/ia64/ia32/sys_ia32.c 2006-06-18 04:51:55 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/ia32/sys_ia32.c 2006-07-09
17:06:47 +0200
-@@ -51,6 +51,7 @@
+diff -NurpP --minimal linux-2.6.18/arch/ia64/ia32/sys_ia32.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/ia64/ia32/sys_ia32.c
+--- linux-2.6.18/arch/ia64/ia32/sys_ia32.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/ia64/ia32/sys_ia32.c 2006-09-25
15:40:02 +0200
+@@ -50,6 +50,7 @@
#include <linux/compat.h>
#include <linux/vfs.h>
#include <linux/mman.h>
@@ -736,7 +755,7 @@
#include <linux/mutex.h>
#include <asm/intrinsics.h>
-@@ -1178,7 +1179,7 @@ sys32_gettimeofday (struct compat_timeva
+@@ -1177,7 +1178,7 @@ sys32_gettimeofday (struct compat_timeva
{
if (tv) {
struct timeval ktv;
@@ -745,10 +764,10 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.17.11/arch/ia64/kernel/asm-offsets.c
linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/asm-offsets.c
---- linux-2.6.17.11/arch/ia64/kernel/asm-offsets.c 2005-10-28 20:49:10
+0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/asm-offsets.c
2006-07-09 17:06:47 +0200
-@@ -192,6 +192,7 @@ void foo(void)
+diff -NurpP --minimal linux-2.6.18/arch/ia64/kernel/asm-offsets.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/ia64/kernel/asm-offsets.c
+--- linux-2.6.18/arch/ia64/kernel/asm-offsets.c 2006-09-20 16:57:58
+0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/ia64/kernel/asm-offsets.c
2006-09-25 15:40:02 +0200
+@@ -191,6 +191,7 @@ void foo(void)
/* for assembly files which can't include sched.h: */
DEFINE(IA64_CLONE_VFORK, CLONE_VFORK);
DEFINE(IA64_CLONE_VM, CLONE_VM);
@@ -756,10 +775,10 @@
BLANK();
DEFINE(IA64_CPUINFO_NSEC_PER_CYC_OFFSET,
-diff -NurpP --minimal linux-2.6.17.11/arch/ia64/kernel/entry.S
linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/entry.S
---- linux-2.6.17.11/arch/ia64/kernel/entry.S 2006-06-18 04:51:55 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/entry.S 2006-07-09
17:06:47 +0200
-@@ -1577,7 +1577,7 @@ sys_call_table:
+diff -NurpP --minimal linux-2.6.18/arch/ia64/kernel/entry.S
linux-2.6.18-vs2.1.1-rc35-t1/arch/ia64/kernel/entry.S
+--- linux-2.6.18/arch/ia64/kernel/entry.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.1.1-rc35-t1/arch/ia64/kernel/entry.S 2006-09-20
17:01:44 +0200
+@@ -1576,7 +1576,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_ni_syscall // reserved for kexec_load
@@ -768,10 +787,10 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.17.11/arch/ia64/kernel/perfmon.c
linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/perfmon.c
---- linux-2.6.17.11/arch/ia64/kernel/perfmon.c 2006-06-18 04:51:56 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31/arch/ia64/kernel/perfmon.c 2006-07-09
17:06:47 +0200
-@@ -41,6 +41,8 @@
+diff -NurpP --minimal linux-2.6.18/arch/ia64/kernel/perfmon.c
linux-2.6.18-vs2.1.1-rc35-t1/arch/ia64/kernel/perfmon.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.33&r2=1.1.2.34&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
