Author: baggins Date: Fri May 26 15:11:30 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- vs2.1.1-rc21
---- Files affected:
SOURCES:
linux-2.6-vs2.1.patch (1.1.2.25 -> 1.1.2.26)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.25
SOURCES/linux-2.6-vs2.1.patch:1.1.2.26
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.25 Mon May 15 10:14:44 2006
+++ SOURCES/linux-2.6-vs2.1.patch Fri May 26 17:11:24 2006
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.16.13/Documentation/vserver/debug.txt
linux-2.6.16.13-vs2.1.1-rc19/Documentation/vserver/debug.txt
---- linux-2.6.16.13/Documentation/vserver/debug.txt 1970-01-01 01:00:00
+0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/Documentation/vserver/debug.txt
2006-04-26 19:06:59 +0200
+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
@@ -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.16.13/arch/alpha/Kconfig
linux-2.6.16.13-vs2.1.1-rc19/arch/alpha/Kconfig
---- linux-2.6.16.13/arch/alpha/Kconfig 2006-02-18 14:39:40 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/alpha/Kconfig 2006-04-26 19:06:59
+0200
+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"
source "arch/alpha/Kconfig.debug"
@@ -122,9 +122,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16.13/arch/alpha/kernel/asm-offsets.c
linux-2.6.16.13-vs2.1.1-rc19/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.16.13/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10
+0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/alpha/kernel/asm-offsets.c
2006-04-26 19:06:59 +0200
+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
@@ -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.13/arch/alpha/kernel/entry.S
linux-2.6.16.13-vs2.1.1-rc19/arch/alpha/kernel/entry.S
---- linux-2.6.16.13/arch/alpha/kernel/entry.S 2006-04-09 13:49:39 +0200
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/alpha/kernel/entry.S 2006-04-26
19:06:59 +0200
+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
@@ -645,7 +645,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
@@ -177,9 +177,105 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.16.13/arch/alpha/kernel/ptrace.c
linux-2.6.16.13-vs2.1.1-rc19/arch/alpha/kernel/ptrace.c
---- linux-2.6.16.13/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/alpha/kernel/ptrace.c 2006-04-28
05:07:10 +0200
+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
+@@ -38,6 +38,7 @@
+ #include <linux/uio.h>
+ #include <linux/vfs.h>
+ #include <linux/rcupdate.h>
++#include <linux/vs_cvirt.h>
+
+ #include <asm/fpu.h>
+ #include <asm/io.h>
+@@ -399,18 +400,20 @@ asmlinkage int
+ osf_utsname(char __user *name)
+ {
+ int error;
++ struct new_utsname *ptr;
+
+ down_read(&uts_sem);
++ ptr = vx_new_utsname();
+ error = -EFAULT;
+- if (copy_to_user(name + 0, system_utsname.sysname, 32))
++ if (copy_to_user(name + 0, ptr->sysname, 32))
+ goto out;
+- if (copy_to_user(name + 32, system_utsname.nodename, 32))
++ if (copy_to_user(name + 32, ptr->nodename, 32))
+ goto out;
+- if (copy_to_user(name + 64, system_utsname.release, 32))
++ if (copy_to_user(name + 64, ptr->release, 32))
+ goto out;
+- if (copy_to_user(name + 96, system_utsname.version, 32))
++ if (copy_to_user(name + 96, ptr->version, 32))
+ goto out;
+- if (copy_to_user(name + 128, system_utsname.machine, 32))
++ if (copy_to_user(name + 128, ptr->machine, 32))
+ goto out;
+
+ error = 0;
+@@ -439,6 +442,7 @@ osf_getdomainname(char __user *name, int
+ {
+ unsigned len;
+ int i;
++ char *domainname;
+
+ if (!access_ok(VERIFY_WRITE, name, namelen))
+ return -EFAULT;
+@@ -448,9 +452,10 @@ osf_getdomainname(char __user *name, int
+ len = 32;
+
+ down_read(&uts_sem);
++ domainname = vx_new_uts(domainname);
+ for (i = 0; i < len; ++i) {
+- __put_user(system_utsname.domainname[i], name + i);
+- if (system_utsname.domainname[i] == '\0')
++ __put_user(domainname[i], name + i);
++ if (domainname[i] == '\0')
+ break;
+ }
+ up_read(&uts_sem);
+@@ -607,17 +612,6 @@ osf_sigstack(struct sigstack __user *uss
+ asmlinkage long
+ osf_sysinfo(int command, char __user *buf, long count)
+ {
+- static char * sysinfo_table[] = {
+- system_utsname.sysname,
+- system_utsname.nodename,
+- system_utsname.release,
+- system_utsname.version,
+- system_utsname.machine,
+- "alpha", /* instruction set architecture */
+- "dummy", /* hardware serial number */
+- "dummy", /* hardware manufacturer */
+- "dummy", /* secure RPC domain */
+- };
+ unsigned long offset;
+ char *res;
+ long len, err = -EINVAL;
+@@ -630,7 +624,18 @@ osf_sysinfo(int command, char __user *bu
+ }
+
+ down_read(&uts_sem);
+- res = sysinfo_table[offset];
++ switch (offset)
++ {
++ case 0: res = vx_new_uts(sysname); break;
++ case 1: res = vx_new_uts(nodename); break;
++ case 2: res = vx_new_uts(release); break;
++ case 3: res = vx_new_uts(version); break;
++ case 4: res = vx_new_uts(machine); break;
++ case 5: res = "alpha"; break;
++ default:
++ res = "dummy";
++ break;
++ }
+ 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
goto out_notsk;
}
@@ -192,9 +288,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -NurpP --minimal linux-2.6.16.13/arch/alpha/kernel/systbls.S
linux-2.6.16.13-vs2.1.1-rc19/arch/alpha/kernel/systbls.S
---- linux-2.6.16.13/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49
+0200
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/alpha/kernel/systbls.S 2006-04-26
19:06:59 +0200
+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
@@ -447,7 +447,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -204,9 +300,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.13/arch/alpha/kernel/traps.c
linux-2.6.16.13-vs2.1.1-rc19/arch/alpha/kernel/traps.c
---- linux-2.6.16.13/arch/alpha/kernel/traps.c 2005-10-28 20:49:08 +0200
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/alpha/kernel/traps.c 2006-04-26
19:06:59 +0200
+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
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -217,9 +313,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.13/arch/alpha/mm/init.c
linux-2.6.16.13-vs2.1.1-rc19/arch/alpha/mm/init.c
---- linux-2.6.16.13/arch/alpha/mm/init.c 2006-02-18 14:39:40 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/alpha/mm/init.c 2006-04-26 19:06:59
+0200
+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
@@ -21,6 +21,7 @@
#include <linux/init.h>
#include <linux/bootmem.h> /* max_low_pfn */
@@ -228,9 +324,9 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.16.13/arch/arm/Kconfig
linux-2.6.16.13-vs2.1.1-rc19/arch/arm/Kconfig
---- linux-2.6.16.13/arch/arm/Kconfig 2006-04-09 13:49:39 +0200
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/arm/Kconfig 2006-04-26 19:06:59
+0200
+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"
source "arch/arm/Kconfig.debug"
@@ -240,9 +336,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16.13/arch/arm/kernel/calls.S
linux-2.6.16.13-vs2.1.1-rc19/arch/arm/kernel/calls.S
---- linux-2.6.16.13/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/arm/kernel/calls.S 2006-04-26
19:06:59 +0200
+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
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -252,9 +348,9 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.16.13/arch/arm/kernel/process.c
linux-2.6.16.13-vs2.1.1-rc19/arch/arm/kernel/process.c
---- linux-2.6.16.13/arch/arm/kernel/process.c 2006-04-09 13:49:40 +0200
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/arm/kernel/process.c 2006-04-26
19:06:59 +0200
+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
@@ -227,7 +227,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -275,9 +371,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.16.13/arch/arm26/Kconfig
linux-2.6.16.13-vs2.1.1-rc19/arch/arm26/Kconfig
---- linux-2.6.16.13/arch/arm26/Kconfig 2006-02-18 14:39:41 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/arm26/Kconfig 2006-04-26 19:06:59
+0200
+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"
source "arch/arm26/Kconfig.debug"
@@ -287,9 +383,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16.13/arch/arm26/kernel/calls.S
linux-2.6.16.13-vs2.1.1-rc19/arch/arm26/kernel/calls.S
---- linux-2.6.16.13/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/arm26/kernel/calls.S 2006-04-26
19:06:59 +0200
+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
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -302,9 +398,9 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.16.13/arch/arm26/kernel/process.c
linux-2.6.16.13-vs2.1.1-rc19/arch/arm26/kernel/process.c
---- linux-2.6.16.13/arch/arm26/kernel/process.c 2006-01-18 06:07:51
+0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/arm26/kernel/process.c 2006-04-26
19:06:59 +0200
+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
@@ -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;
@@ -315,9 +411,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.16.13/arch/arm26/kernel/traps.c
linux-2.6.16.13-vs2.1.1-rc19/arch/arm26/kernel/traps.c
---- linux-2.6.16.13/arch/arm26/kernel/traps.c 2006-01-18 06:07:51 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/arm26/kernel/traps.c 2006-04-26
19:06:59 +0200
+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
@@ -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());
@@ -330,9 +426,9 @@
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.16.13/arch/cris/Kconfig
linux-2.6.16.13-vs2.1.1-rc19/arch/cris/Kconfig
---- linux-2.6.16.13/arch/cris/Kconfig 2006-02-18 14:39:42 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/cris/Kconfig 2006-04-26 19:06:59
+0200
+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"
source "arch/cris/Kconfig.debug"
@@ -342,9 +438,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16.13/arch/cris/arch-v10/kernel/process.c
linux-2.6.16.13-vs2.1.1-rc19/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.16.13/arch/cris/arch-v10/kernel/process.c 2006-01-18
06:07:51 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/cris/arch-v10/kernel/process.c
2006-04-26 19:06:59 +0200
+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
@@ -104,7 +104,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.dccr = 1 << I_DCCR_BITNR;
@@ -355,9 +451,9 @@
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.16.13/arch/cris/arch-v32/kernel/process.c
linux-2.6.16.13-vs2.1.1-rc19/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.16.13/arch/cris/arch-v32/kernel/process.c 2006-01-18
06:07:51 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/cris/arch-v32/kernel/process.c
2006-04-26 19:06:59 +0200
+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
@@ -121,7 +121,8 @@ kernel_thread(int (*fn)(void *), void *
regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
@@ -368,9 +464,9 @@
}
/*
-diff -NurpP --minimal linux-2.6.16.13/arch/frv/kernel/kernel_thread.S
linux-2.6.16.13-vs2.1.1-rc19/arch/frv/kernel/kernel_thread.S
---- linux-2.6.16.13/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20
+0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/frv/kernel/kernel_thread.S
2006-04-26 19:06:59 +0200
+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
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -389,9 +485,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.13/arch/frv/mm/mmu-context.c
linux-2.6.16.13-vs2.1.1-rc19/arch/frv/mm/mmu-context.c
---- linux-2.6.16.13/arch/frv/mm/mmu-context.c 2005-03-02 12:38:20 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/frv/mm/mmu-context.c 2006-04-26
19:06:59 +0200
+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
@@ -11,6 +11,7 @@
#include <linux/sched.h>
@@ -400,9 +496,9 @@
#include <asm/tlbflush.h>
#define NR_CXN 4096
-diff -NurpP --minimal linux-2.6.16.13/arch/h8300/Kconfig
linux-2.6.16.13-vs2.1.1-rc19/arch/h8300/Kconfig
---- linux-2.6.16.13/arch/h8300/Kconfig 2006-02-18 14:39:42 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/h8300/Kconfig 2006-04-26 19:06:59
+0200
+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"
source "arch/h8300/Kconfig.debug"
@@ -412,9 +508,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16.13/arch/h8300/kernel/process.c
linux-2.6.16.13-vs2.1.1-rc19/arch/h8300/kernel/process.c
---- linux-2.6.16.13/arch/h8300/kernel/process.c 2006-04-09 13:49:41
+0200
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/h8300/kernel/process.c 2006-04-26
19:06:59 +0200
+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
@@ -135,7 +135,7 @@ int kernel_thread(int (*fn)(void *), voi
fs = get_fs();
@@ -424,9 +520,9 @@
__asm__("mov.l sp,er3\n\t"
"sub.l er2,er2\n\t"
"mov.l %2,er1\n\t"
-diff -NurpP --minimal linux-2.6.16.13/arch/i386/Kconfig
linux-2.6.16.13-vs2.1.1-rc19/arch/i386/Kconfig
---- linux-2.6.16.13/arch/i386/Kconfig 2006-04-09 13:49:41 +0200
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/i386/Kconfig 2006-04-26 19:06:59
+0200
+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.
@@ -488,9 +584,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16.13/arch/i386/boot/compressed/misc.c
linux-2.6.16.13-vs2.1.1-rc19/arch/i386/boot/compressed/misc.c
---- linux-2.6.16.13/arch/i386/boot/compressed/misc.c 2006-04-09 13:49:42
+0200
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/i386/boot/compressed/misc.c
2006-04-26 19:06:59 +0200
+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");
@@ -511,9 +607,9 @@
mv->hcount = 0; /* say: we need not to move high_buffer */
}
else mv->hcount = -1;
-diff -NurpP --minimal linux-2.6.16.13/arch/i386/kernel/process.c
linux-2.6.16.13-vs2.1.1-rc19/arch/i386/kernel/process.c
---- linux-2.6.16.13/arch/i386/kernel/process.c 2006-02-15 13:54:10 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/i386/kernel/process.c 2006-04-26
19:06:59 +0200
+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)
unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
@@ -537,9 +633,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.16.13/arch/i386/kernel/setup.c
linux-2.6.16.13-vs2.1.1-rc19/arch/i386/kernel/setup.c
---- linux-2.6.16.13/arch/i386/kernel/setup.c 2006-04-09 13:49:42 +0200
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/i386/kernel/setup.c 2006-04-26
19:06:59 +0200
+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.
@@ -551,9 +647,9 @@
/*
* reserve physical page 0 - it's a special BIOS page on many boxes,
-diff -NurpP --minimal linux-2.6.16.13/arch/i386/kernel/sys_i386.c
linux-2.6.16.13-vs2.1.1-rc19/arch/i386/kernel/sys_i386.c
---- linux-2.6.16.13/arch/i386/kernel/sys_i386.c 2004-08-14 12:56:23
+0200
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/i386/kernel/sys_i386.c 2006-04-26
19:06:59 +0200
+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
@@ -19,6 +19,7 @@
#include <linux/mman.h>
#include <linux/file.h>
@@ -601,9 +697,9 @@
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.16.13/arch/i386/kernel/syscall_table.S
linux-2.6.16.13-vs2.1.1-rc19/arch/i386/kernel/syscall_table.S
---- linux-2.6.16.13/arch/i386/kernel/syscall_table.S 2006-02-18 14:39:43
+0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/i386/kernel/syscall_table.S
2006-04-26 19:06:59 +0200
+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
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -613,9 +709,9 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.16.13/arch/i386/kernel/traps.c
linux-2.6.16.13-vs2.1.1-rc19/arch/i386/kernel/traps.c
---- linux-2.6.16.13/arch/i386/kernel/traps.c 2006-02-18 14:39:43 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/i386/kernel/traps.c 2006-04-26
19:06:59 +0200
+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
@@ -53,6 +53,8 @@
#include <asm/kdebug.h>
@@ -657,9 +753,9 @@
} else
printk(KERN_EMERG "Recursive die() failure, output
suppressed\n");
-diff -NurpP --minimal linux-2.6.16.13/arch/ia64/Kconfig
linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/Kconfig
---- linux-2.6.16.13/arch/ia64/Kconfig 2006-04-09 13:49:42 +0200
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/Kconfig 2006-04-26 19:06:59
+0200
+diff -NurpP --minimal linux-2.6.16.17/arch/ia64/Kconfig
linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/Kconfig
+--- linux-2.6.16.17/arch/ia64/Kconfig 2006-04-09 13:49:42 +0200
++++ linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/Kconfig 2006-04-26 19:06:59
+0200
@@ -464,6 +464,8 @@ endmenu
source "arch/ia64/Kconfig.debug"
@@ -669,9 +765,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.16.13/arch/ia64/ia32/binfmt_elf32.c
linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.16.13/arch/ia64/ia32/binfmt_elf32.c 2006-01-03 17:29:09
+0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/ia32/binfmt_elf32.c 2006-04-26
19:06:59 +0200
+diff -NurpP --minimal linux-2.6.16.17/arch/ia64/ia32/binfmt_elf32.c
linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.16.17/arch/ia64/ia32/binfmt_elf32.c 2006-01-03 17:29:09
+0100
++++ linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/ia32/binfmt_elf32.c 2006-04-26
19:06:59 +0200
@@ -236,7 +236,8 @@ ia32_setup_arg_pages (struct linux_binpr
kmem_cache_free(vm_area_cachep, mpnt);
return ret;
@@ -682,9 +778,9 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.16.13/arch/ia64/ia32/ia32_entry.S
linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.16.13/arch/ia64/ia32/ia32_entry.S 2006-04-09 13:49:42
+0200
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/ia32/ia32_entry.S 2006-04-26
19:06:59 +0200
+diff -NurpP --minimal linux-2.6.16.17/arch/ia64/ia32/ia32_entry.S
linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.16.17/arch/ia64/ia32/ia32_entry.S 2006-04-09 13:49:42
+0200
++++ linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/ia32/ia32_entry.S 2006-04-26
19:06:59 +0200
@@ -483,7 +483,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -694,9 +790,9 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.16.13/arch/ia64/kernel/asm-offsets.c
linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/kernel/asm-offsets.c
---- linux-2.6.16.13/arch/ia64/kernel/asm-offsets.c 2005-10-28 20:49:10
+0200
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/kernel/asm-offsets.c
2006-04-26 19:06:59 +0200
+diff -NurpP --minimal linux-2.6.16.17/arch/ia64/kernel/asm-offsets.c
linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/kernel/asm-offsets.c
+--- linux-2.6.16.17/arch/ia64/kernel/asm-offsets.c 2005-10-28 20:49:10
+0200
++++ linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/kernel/asm-offsets.c
2006-04-26 19:06:59 +0200
@@ -192,6 +192,7 @@ void foo(void)
/* for assembly files which can't include sched.h: */
DEFINE(IA64_CLONE_VFORK, CLONE_VFORK);
@@ -705,9 +801,9 @@
BLANK();
DEFINE(IA64_CPUINFO_NSEC_PER_CYC_OFFSET,
-diff -NurpP --minimal linux-2.6.16.13/arch/ia64/kernel/entry.S
linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/kernel/entry.S
---- linux-2.6.16.13/arch/ia64/kernel/entry.S 2006-02-18 14:39:43 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/kernel/entry.S 2006-04-26
19:06:59 +0200
+diff -NurpP --minimal linux-2.6.16.17/arch/ia64/kernel/entry.S
linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/kernel/entry.S
+--- linux-2.6.16.17/arch/ia64/kernel/entry.S 2006-02-18 14:39:43 +0100
++++ linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/kernel/entry.S 2006-04-26
19:06:59 +0200
@@ -1591,7 +1591,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -717,9 +813,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.16.13/arch/ia64/kernel/perfmon.c
linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/kernel/perfmon.c
---- linux-2.6.16.13/arch/ia64/kernel/perfmon.c 2006-02-18 14:39:43 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/kernel/perfmon.c 2006-04-26
19:06:59 +0200
+diff -NurpP --minimal linux-2.6.16.17/arch/ia64/kernel/perfmon.c
linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/kernel/perfmon.c
+--- linux-2.6.16.17/arch/ia64/kernel/perfmon.c 2006-02-18 14:39:43 +0100
++++ linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/kernel/perfmon.c 2006-04-26
19:06:59 +0200
@@ -41,6 +41,8 @@
#include <linux/capability.h>
#include <linux/rcupdate.h>
@@ -738,9 +834,9 @@
vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
vma_pages(vma));
up_write(&task->mm->mmap_sem);
-diff -NurpP --minimal linux-2.6.16.13/arch/ia64/kernel/process.c
linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/kernel/process.c
---- linux-2.6.16.13/arch/ia64/kernel/process.c 2006-01-18 06:07:53 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/kernel/process.c 2006-04-26
19:06:59 +0200
+diff -NurpP --minimal linux-2.6.16.17/arch/ia64/kernel/process.c
linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/kernel/process.c
+--- linux-2.6.16.17/arch/ia64/kernel/process.c 2006-01-18 06:07:53 +0100
++++ linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/kernel/process.c 2006-04-26
19:06:59 +0200
@@ -109,7 +109,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -761,9 +857,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.16.13/arch/ia64/kernel/ptrace.c
linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/kernel/ptrace.c
---- linux-2.6.16.13/arch/ia64/kernel/ptrace.c 2006-02-18 14:39:43 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/kernel/ptrace.c 2006-04-26
19:06:59 +0200
+diff -NurpP --minimal linux-2.6.16.17/arch/ia64/kernel/ptrace.c
linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/kernel/ptrace.c
+--- linux-2.6.16.17/arch/ia64/kernel/ptrace.c 2006-02-18 14:39:43 +0100
++++ linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/kernel/ptrace.c 2006-04-26
19:06:59 +0200
@@ -18,6 +18,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -782,9 +878,9 @@
ret = -EPERM;
if (pid == 1) /* no messing around with init! */
goto out_tsk;
-diff -NurpP --minimal linux-2.6.16.13/arch/ia64/kernel/signal.c
linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/kernel/signal.c
---- linux-2.6.16.13/arch/ia64/kernel/signal.c 2006-01-18 06:07:53 +0100
-+++ linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/kernel/signal.c 2006-04-26
19:06:59 +0200
+diff -NurpP --minimal linux-2.6.16.17/arch/ia64/kernel/signal.c
linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/kernel/signal.c
+--- linux-2.6.16.17/arch/ia64/kernel/signal.c 2006-01-18 06:07:53 +0100
++++ linux-2.6.16.17-vs2.1.1-rc21/arch/ia64/kernel/signal.c 2006-04-26
19:06:59 +0200
@@ -21,6 +21,7 @@
#include <linux/binfmts.h>
#include <linux/unistd.h>
@@ -793,9 +889,9 @@
#include <asm/ia32.h>
#include <asm/intrinsics.h>
-diff -NurpP --minimal linux-2.6.16.13/arch/ia64/kernel/traps.c
linux-2.6.16.13-vs2.1.1-rc19/arch/ia64/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.25&r2=1.1.2.26&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
