Author: mguevara Date: Tue Dec 12 14:20:12 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- 2.6.19 ready
- based on
http://ftp.linux-vserver.org/pub/kernel/vs2.1/patch-2.6.19-vs2.1.1.5.diff.bz2
(same as http://vserver.13thfloor.at/Experimental/patch-2.6.19-vs2.1.1.5.diff)
---- Files affected:
SOURCES:
linux-2.6-vs2.1.patch (1.1.2.44 -> 1.1.2.45)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.44
SOURCES/linux-2.6-vs2.1.patch:1.1.2.45
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.44 Thu Nov 23 19:16:20 2006
+++ SOURCES/linux-2.6-vs2.1.patch Tue Dec 12 15:20:03 2006
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.18.3/Documentation/vserver/debug.txt
linux-2.6.18.3-vs2.1.1.2/Documentation/vserver/debug.txt
---- linux-2.6.18.3/Documentation/vserver/debug.txt 1970-01-01 01:00:00
+0100
-+++ linux-2.6.18.3-vs2.1.1.2/Documentation/vserver/debug.txt 2006-11-03
17:26:38 +0100
+diff -NurpP --minimal linux-2.6.19/Documentation/vserver/debug.txt
linux-2.6.19-vs2.1.1.5/Documentation/vserver/debug.txt
+--- linux-2.6.19/Documentation/vserver/debug.txt 1970-01-01 01:00:00
+0100
++++ linux-2.6.19-vs2.1.1.5/Documentation/vserver/debug.txt 2006-11-08
04:57:48 +0100
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,9 +156,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.18.3/arch/alpha/Kconfig
linux-2.6.18.3-vs2.1.1.2/arch/alpha/Kconfig
---- linux-2.6.18.3/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/alpha/Kconfig 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.19/arch/alpha/Kconfig
linux-2.6.19-vs2.1.1.5/arch/alpha/Kconfig
+--- linux-2.6.19/arch/alpha/Kconfig 2006-11-30 21:18:23 +0100
++++ linux-2.6.19-vs2.1.1.5/arch/alpha/Kconfig 2006-11-08 04:57:40 +0100
@@ -632,6 +632,8 @@ source "arch/alpha/oprofile/Kconfig"
source "arch/alpha/Kconfig.debug"
@@ -168,9 +168,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.3/arch/alpha/kernel/asm-offsets.c
linux-2.6.18.3-vs2.1.1.2/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.18.3/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10
+0100
-+++ linux-2.6.18.3-vs2.1.1.2/arch/alpha/kernel/asm-offsets.c 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.19/arch/alpha/kernel/asm-offsets.c
linux-2.6.19-vs2.1.1.5/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.19/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10
+0100
++++ linux-2.6.19-vs2.1.1.5/arch/alpha/kernel/asm-offsets.c 2006-11-08
04:57:50 +0100
@@ -36,6 +36,7 @@ void foo(void)
DEFINE(PT_PTRACED, PT_PTRACED);
DEFINE(CLONE_VM, CLONE_VM);
@@ -179,9 +179,9 @@
DEFINE(SIGCHLD, SIGCHLD);
BLANK();
-diff -NurpP --minimal linux-2.6.18.3/arch/alpha/kernel/entry.S
linux-2.6.18.3-vs2.1.1.2/arch/alpha/kernel/entry.S
---- linux-2.6.18.3/arch/alpha/kernel/entry.S 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/alpha/kernel/entry.S 2006-09-25 15:40:02
+0200
+diff -NurpP --minimal linux-2.6.19/arch/alpha/kernel/entry.S
linux-2.6.19-vs2.1.1.5/arch/alpha/kernel/entry.S
+--- linux-2.6.19/arch/alpha/kernel/entry.S 2006-11-30 21:18:23 +0100
++++ linux-2.6.19-vs2.1.1.5/arch/alpha/kernel/entry.S 2006-11-08 04:57:52
+0100
@@ -644,7 +644,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
@@ -223,109 +223,10 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.18.3/arch/alpha/kernel/osf_sys.c
linux-2.6.18.3-vs2.1.1.2/arch/alpha/kernel/osf_sys.c
---- linux-2.6.18.3/arch/alpha/kernel/osf_sys.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/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>
- #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,30 +612,30 @@ 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;
-
- offset = command-1;
-- 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)
-+ {
-+ 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;
-@@ -881,7 +886,7 @@ osf_gettimeofday(struct timeval32 __user
+diff -NurpP --minimal linux-2.6.19/arch/alpha/kernel/osf_sys.c
linux-2.6.19-vs2.1.1.5/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.19/arch/alpha/kernel/osf_sys.c 2006-11-30 21:18:23 +0100
++++ linux-2.6.19-vs2.1.1.5/arch/alpha/kernel/osf_sys.c 2006-12-02 01:37:05
+0100
+@@ -885,7 +885,7 @@ osf_gettimeofday(struct timeval32 __user
{
if (tv) {
struct timeval ktv;
@@ -334,14 +235,22 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.18.3/arch/alpha/kernel/ptrace.c
linux-2.6.18.3-vs2.1.1.2/arch/alpha/kernel/ptrace.c
---- linux-2.6.18.3/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/alpha/kernel/ptrace.c 2006-10-06
23:10:42 +0200
-@@ -283,6 +283,11 @@ do_sys_ptrace(long request, long pid, lo
+diff -NurpP --minimal linux-2.6.19/arch/alpha/kernel/ptrace.c
linux-2.6.19-vs2.1.1.5/arch/alpha/kernel/ptrace.c
+--- linux-2.6.19/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
++++ linux-2.6.19-vs2.1.1.5/arch/alpha/kernel/ptrace.c 2006-11-30 18:53:18
+0100
+@@ -15,6 +15,7 @@
+ #include <linux/slab.h>
+ #include <linux/security.h>
+ #include <linux/signal.h>
++#include <linux/vs_base.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/pgtable.h>
+@@ -283,6 +284,11 @@ do_sys_ptrace(long request, long pid, lo
goto out_notsk;
}
-+ if (!vx_check(vx_task_xid(child), VX_WATCH_P|VX_IDENT)) {
++ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT)) {
+ ret = -EPERM;
+ goto out;
+ }
@@ -349,9 +258,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -NurpP --minimal linux-2.6.18.3/arch/alpha/kernel/semaphore.c
linux-2.6.18.3-vs2.1.1.2/arch/alpha/kernel/semaphore.c
---- linux-2.6.18.3/arch/alpha/kernel/semaphore.c 2004-08-14 12:55:32
+0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/alpha/kernel/semaphore.c 2006-10-28
19:27:34 +0200
+diff -NurpP --minimal linux-2.6.19/arch/alpha/kernel/semaphore.c
linux-2.6.19-vs2.1.1.5/arch/alpha/kernel/semaphore.c
+--- linux-2.6.19/arch/alpha/kernel/semaphore.c 2004-08-14 12:55:32 +0200
++++ linux-2.6.19-vs2.1.1.5/arch/alpha/kernel/semaphore.c 2006-11-08
04:57:42 +0100
@@ -68,8 +68,8 @@ __down_failed(struct semaphore *sem)
DECLARE_WAITQUEUE(wait, tsk);
@@ -385,10 +294,10 @@
#endif
tsk->state = TASK_INTERRUPTIBLE;
-diff -NurpP --minimal linux-2.6.18.3/arch/alpha/kernel/systbls.S
linux-2.6.18.3-vs2.1.1.2/arch/alpha/kernel/systbls.S
---- linux-2.6.18.3/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/alpha/kernel/systbls.S 2006-09-20
17:01:44 +0200
-@@ -447,7 +447,7 @@ sys_call_table:
+diff -NurpP --minimal linux-2.6.19/arch/alpha/kernel/systbls.S
linux-2.6.19-vs2.1.1.5/arch/alpha/kernel/systbls.S
+--- linux-2.6.19/arch/alpha/kernel/systbls.S 2006-11-30 21:18:23 +0100
++++ linux-2.6.19-vs2.1.1.5/arch/alpha/kernel/systbls.S 2006-11-08 04:57:41
+0100
+@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
.quad sys_fstat64
@@ -397,9 +306,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.18.3/arch/alpha/kernel/traps.c
linux-2.6.18.3-vs2.1.1.2/arch/alpha/kernel/traps.c
---- linux-2.6.18.3/arch/alpha/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/alpha/kernel/traps.c 2006-09-25 15:40:02
+0200
+diff -NurpP --minimal linux-2.6.19/arch/alpha/kernel/traps.c
linux-2.6.19-vs2.1.1.5/arch/alpha/kernel/traps.c
+--- linux-2.6.19/arch/alpha/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.19-vs2.1.1.5/arch/alpha/kernel/traps.c 2006-11-08 04:57:42
+0100
@@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -410,9 +319,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.18.3/arch/alpha/mm/init.c
linux-2.6.18.3-vs2.1.1.2/arch/alpha/mm/init.c
---- linux-2.6.18.3/arch/alpha/mm/init.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/alpha/mm/init.c 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.19/arch/alpha/mm/init.c
linux-2.6.19-vs2.1.1.5/arch/alpha/mm/init.c
+--- linux-2.6.19/arch/alpha/mm/init.c 2006-11-30 21:18:23 +0100
++++ linux-2.6.19-vs2.1.1.5/arch/alpha/mm/init.c 2006-11-08 04:57:39
+0100
@@ -20,6 +20,7 @@
#include <linux/init.h>
#include <linux/bootmem.h> /* max_low_pfn */
@@ -421,10 +330,10 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.18.3/arch/arm/Kconfig
linux-2.6.18.3-vs2.1.1.2/arch/arm/Kconfig
---- linux-2.6.18.3/arch/arm/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/arm/Kconfig 2006-09-20 17:01:44 +0200
-@@ -907,6 +907,8 @@ source "arch/arm/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.19/arch/arm/Kconfig
linux-2.6.19-vs2.1.1.5/arch/arm/Kconfig
+--- linux-2.6.19/arch/arm/Kconfig 2006-11-30 21:18:24 +0100
++++ linux-2.6.19-vs2.1.1.5/arch/arm/Kconfig 2006-11-30 20:55:45 +0100
+@@ -935,6 +935,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -433,9 +342,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.3/arch/arm/kernel/calls.S
linux-2.6.18.3-vs2.1.1.2/arch/arm/kernel/calls.S
---- linux-2.6.18.3/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
-+++ linux-2.6.18.3-vs2.1.1.2/arch/arm/kernel/calls.S 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.19/arch/arm/kernel/calls.S
linux-2.6.19-vs2.1.1.5/arch/arm/kernel/calls.S
+--- linux-2.6.19/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
++++ linux-2.6.19-vs2.1.1.5/arch/arm/kernel/calls.S 2006-11-08 04:57:41
+0100
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -445,44 +354,10 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.18.3/arch/arm/kernel/irq.c
linux-2.6.18.3-vs2.1.1.2/arch/arm/kernel/irq.c
---- linux-2.6.18.3/arch/arm/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/arm/kernel/irq.c 2006-11-19 19:52:27
+0100
-@@ -37,6 +37,7 @@
- #include <linux/list.h>
- #include <linux/kallsyms.h>
- #include <linux/proc_fs.h>
-+#include <linux/vs_context.h>
-
- #include <asm/system.h>
- #include <asm/mach/time.h>
-@@ -112,6 +113,7 @@ static struct irq_desc bad_irq_desc = {
- asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)
- {
- struct irqdesc *desc = irq_desc + irq;
-+ struct vx_info_save vxis;
-
- /*
- * Some hardware gives randomly wrong interrupts. Rather
-@@ -121,12 +123,12 @@ asmlinkage void asm_do_IRQ(unsigned int
- desc = &bad_irq_desc;
-
- irq_enter();
--
-+ __enter_vx_admin(&vxis);
- desc_handle_irq(irq, desc, regs);
-
- /* AT91 specific workaround */
- irq_finish(irq);
--
-+ __leave_vx_admin(&vxis);
- irq_exit();
- }
-
-diff -NurpP --minimal linux-2.6.18.3/arch/arm/kernel/process.c
linux-2.6.18.3-vs2.1.1.2/arch/arm/kernel/process.c
---- linux-2.6.18.3/arch/arm/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/arm/kernel/process.c 2006-09-25 15:40:02
+0200
-@@ -236,7 +236,8 @@ void __show_regs(struct pt_regs *regs)
+diff -NurpP --minimal linux-2.6.19/arch/arm/kernel/process.c
linux-2.6.19-vs2.1.1.5/arch/arm/kernel/process.c
+--- linux-2.6.19/arch/arm/kernel/process.c 2006-11-30 21:18:24 +0100
++++ linux-2.6.19-vs2.1.1.5/arch/arm/kernel/process.c 2006-11-08 04:57:50
+0100
+@@ -246,7 +246,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
printk("\n");
@@ -492,7 +367,7 @@
__show_regs(regs);
__backtrace();
}
-@@ -459,7 +460,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+@@ -469,7 +470,8 @@ pid_t kernel_thread(int (*fn)(void *), v
regs.ARM_pc = (unsigned long)kernel_thread_helper;
regs.ARM_cpsr = SVC_MODE;
@@ -502,9 +377,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.18.3/arch/arm/kernel/traps.c
linux-2.6.18.3-vs2.1.1.2/arch/arm/kernel/traps.c
---- linux-2.6.18.3/arch/arm/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/arm/kernel/traps.c 2006-10-28 19:27:58
+0200
+diff -NurpP --minimal linux-2.6.19/arch/arm/kernel/traps.c
linux-2.6.19-vs2.1.1.5/arch/arm/kernel/traps.c
+--- linux-2.6.19/arch/arm/kernel/traps.c 2006-11-30 21:18:24 +0100
++++ linux-2.6.19-vs2.1.1.5/arch/arm/kernel/traps.c 2006-11-08 04:57:42
+0100
@@ -205,8 +205,8 @@ static void __die(const char *str, int e
printk("Internal error: %s: %x [#%d]\n", str, err, ++die_counter);
print_modules();
@@ -516,9 +391,9 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.18.3/arch/arm26/Kconfig
linux-2.6.18.3-vs2.1.1.2/arch/arm26/Kconfig
---- linux-2.6.18.3/arch/arm26/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/arm26/Kconfig 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.19/arch/arm26/Kconfig
linux-2.6.19-vs2.1.1.5/arch/arm26/Kconfig
+--- linux-2.6.19/arch/arm26/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.19-vs2.1.1.5/arch/arm26/Kconfig 2006-11-08 04:57:40 +0100
@@ -234,6 +234,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -528,9 +403,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.3/arch/arm26/kernel/calls.S
linux-2.6.18.3-vs2.1.1.2/arch/arm26/kernel/calls.S
---- linux-2.6.18.3/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.18.3-vs2.1.1.2/arch/arm26/kernel/calls.S 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.19/arch/arm26/kernel/calls.S
linux-2.6.19-vs2.1.1.5/arch/arm26/kernel/calls.S
+--- linux-2.6.19/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
++++ linux-2.6.19-vs2.1.1.5/arch/arm26/kernel/calls.S 2006-11-08 04:57:41
+0100
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -543,38 +418,9 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.18.3/arch/arm26/kernel/irq.c
linux-2.6.18.3-vs2.1.1.2/arch/arm26/kernel/irq.c
---- linux-2.6.18.3/arch/arm26/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/arm26/kernel/irq.c 2006-11-21 02:43:52
+0100
-@@ -31,6 +31,7 @@
- #include <linux/init.h>
- #include <linux/seq_file.h>
- #include <linux/errno.h>
-+#include <linux/vs_context.h>
-
- #include <asm/irq.h>
- #include <asm/system.h>
-@@ -331,6 +332,7 @@ do_level_IRQ(unsigned int irq, struct ir
- asmlinkage void asm_do_IRQ(int irq, struct pt_regs *regs)
- {
- struct irqdesc *desc = irq_desc + irq;
-+ struct vx_info_save vxis;
-
- /*
- * Some hardware gives randomly wrong interrupts. Rather
-@@ -341,7 +343,9 @@ asmlinkage void asm_do_IRQ(int irq, stru
-
- irq_enter();
- spin_lock(&irq_controller_lock);
-+ __enter_vx_admin(&vxis);
- desc->handle(irq, desc, regs);
-+ __leave_vx_admin(&vxis);
- spin_unlock(&irq_controller_lock);
- irq_exit();
- }
-diff -NurpP --minimal linux-2.6.18.3/arch/arm26/kernel/process.c
linux-2.6.18.3-vs2.1.1.2/arch/arm26/kernel/process.c
---- linux-2.6.18.3/arch/arm26/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/arm26/kernel/process.c 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.19/arch/arm26/kernel/process.c
linux-2.6.19-vs2.1.1.5/arch/arm26/kernel/process.c
+--- linux-2.6.19/arch/arm26/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.19-vs2.1.1.5/arch/arm26/kernel/process.c 2006-11-08 04:57:50
+0100
@@ -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;
@@ -585,9 +431,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.18.3/arch/arm26/kernel/traps.c
linux-2.6.18.3-vs2.1.1.2/arch/arm26/kernel/traps.c
---- linux-2.6.18.3/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/arm26/kernel/traps.c 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.19/arch/arm26/kernel/traps.c
linux-2.6.19-vs2.1.1.5/arch/arm26/kernel/traps.c
+--- linux-2.6.19/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.19-vs2.1.1.5/arch/arm26/kernel/traps.c 2006-11-08 04:57:42
+0100
@@ -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());
@@ -600,9 +446,9 @@
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.18.3/arch/cris/Kconfig
linux-2.6.18.3-vs2.1.1.2/arch/cris/Kconfig
---- linux-2.6.18.3/arch/cris/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/cris/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.19/arch/cris/Kconfig
linux-2.6.19-vs2.1.1.5/arch/cris/Kconfig
+--- linux-2.6.19/arch/cris/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.19-vs2.1.1.5/arch/cris/Kconfig 2006-11-08 04:57:40 +0100
@@ -185,6 +185,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -612,9 +458,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.3/arch/cris/arch-v10/kernel/process.c
linux-2.6.18.3-vs2.1.1.2/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.18.3/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57
+0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/cris/arch-v10/kernel/process.c
2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.19/arch/cris/arch-v10/kernel/process.c
linux-2.6.19-vs2.1.1.5/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.19/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57
+0200
++++ linux-2.6.19-vs2.1.1.5/arch/cris/arch-v10/kernel/process.c 2006-11-08
04:57:50 +0100
@@ -103,7 +103,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.dccr = 1 << I_DCCR_BITNR;
@@ -625,9 +471,9 @@
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.18.3/arch/cris/arch-v32/kernel/process.c
linux-2.6.18.3-vs2.1.1.2/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.18.3/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57
+0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/cris/arch-v32/kernel/process.c
2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.19/arch/cris/arch-v32/kernel/process.c
linux-2.6.19-vs2.1.1.5/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.19/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57
+0200
++++ linux-2.6.19-vs2.1.1.5/arch/cris/arch-v32/kernel/process.c 2006-11-08
04:57:50 +0100
@@ -120,7 +120,8 @@ kernel_thread(int (*fn)(void *), void *
regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
@@ -638,9 +484,9 @@
}
/*
-diff -NurpP --minimal linux-2.6.18.3/arch/cris/kernel/irq.c
linux-2.6.18.3-vs2.1.1.2/arch/cris/kernel/irq.c
---- linux-2.6.18.3/arch/cris/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/cris/kernel/irq.c 2006-11-19 19:52:27
+0100
+diff -NurpP --minimal linux-2.6.19/arch/cris/kernel/irq.c
linux-2.6.19-vs2.1.1.5/arch/cris/kernel/irq.c
+--- linux-2.6.19/arch/cris/kernel/irq.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.19-vs2.1.1.5/arch/cris/kernel/irq.c 2006-11-30 18:26:05
+0100
@@ -92,6 +92,7 @@ skip:
asmlinkage void do_IRQ(int irq, struct pt_regs * regs)
{
@@ -649,39 +495,9 @@
irq_enter();
sp = rdsp();
if (unlikely((sp & (PAGE_SIZE - 1)) < (PAGE_SIZE/8))) {
-diff -NurpP --minimal linux-2.6.18.3/arch/frv/kernel/irq.c
linux-2.6.18.3-vs2.1.1.2/arch/frv/kernel/irq.c
---- linux-2.6.18.3/arch/frv/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/frv/kernel/irq.c 2006-10-13 20:52:40
+0200
-@@ -32,6 +32,7 @@
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
- #include <linux/module.h>
-+#include <linux/vs_context.h>
-
- #include <asm/atomic.h>
- #include <asm/io.h>
-@@ -282,6 +283,7 @@ EXPORT_SYMBOL(enable_irq);
- asmlinkage void do_IRQ(void)
- {
- struct irq_source *source;
-+ struct vx_info_save vxis;
- int level, cpu;
-
- irq_enter();
-@@ -298,8 +300,10 @@ asmlinkage void do_IRQ(void)
-
- kstat_this_cpu.irqs[level]++;
-
-+ __enter_vx_admin(&vxis);
- for (source = frv_irq_levels[level].sources; source; source =
source->next)
- source->doirq(source);
-+ __leave_vx_admin(&vxis);
-
- __clr_MASK(level);
-
-diff -NurpP --minimal linux-2.6.18.3/arch/frv/kernel/kernel_thread.S
linux-2.6.18.3-vs2.1.1.2/arch/frv/kernel/kernel_thread.S
---- linux-2.6.18.3/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20
+0100
-+++ linux-2.6.18.3-vs2.1.1.2/arch/frv/kernel/kernel_thread.S 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.19/arch/frv/kernel/kernel_thread.S
linux-2.6.19-vs2.1.1.5/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.19/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20
+0100
++++ linux-2.6.19-vs2.1.1.5/arch/frv/kernel/kernel_thread.S 2006-11-08
04:57:50 +0100
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -700,9 +516,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.18.3/arch/h8300/Kconfig
linux-2.6.18.3-vs2.1.1.2/arch/h8300/Kconfig
---- linux-2.6.18.3/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/h8300/Kconfig 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.19/arch/h8300/Kconfig
linux-2.6.19-vs2.1.1.5/arch/h8300/Kconfig
+--- linux-2.6.19/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
++++ linux-2.6.19-vs2.1.1.5/arch/h8300/Kconfig 2006-11-08 04:57:40 +0100
@@ -199,6 +199,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -712,39 +528,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.3/arch/h8300/kernel/ints.c
linux-2.6.18.3-vs2.1.1.2/arch/h8300/kernel/ints.c
---- linux-2.6.18.3/arch/h8300/kernel/ints.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/h8300/kernel/ints.c 2006-11-19 19:52:27
+0100
-@@ -23,6 +23,7 @@
- #include <linux/random.h>
- #include <linux/bootmem.h>
- #include <linux/hardirq.h>
-+#include <linux/vs_context.h>
-
- #include <asm/system.h>
- #include <asm/irq.h>
-@@ -216,7 +217,10 @@ void disable_irq(unsigned int irq)
-
- asmlinkage void process_int(int irq, struct pt_regs *fp)
- {
-+ struct vx_info_save vxis;
-+
- irq_enter();
-+ __enter_vx_admin(&vxis);
- h8300_clear_isr(irq);
- if (irq >= NR_TRAPS && irq < NR_IRQS) {
- if (irq_list[irq]) {
-@@ -228,6 +232,7 @@ asmlinkage void process_int(int irq, str
- } else {
- BUG();
- }
-+ __leave_vx_admin(&vxis);
- irq_exit();
- }
-
-diff -NurpP --minimal linux-2.6.18.3/arch/h8300/kernel/process.c
linux-2.6.18.3-vs2.1.1.2/arch/h8300/kernel/process.c
---- linux-2.6.18.3/arch/h8300/kernel/process.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/h8300/kernel/process.c 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.19/arch/h8300/kernel/process.c
linux-2.6.19-vs2.1.1.5/arch/h8300/kernel/process.c
+--- linux-2.6.19/arch/h8300/kernel/process.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.19-vs2.1.1.5/arch/h8300/kernel/process.c 2006-11-08 04:57:50
+0100
@@ -134,7 +134,7 @@ int kernel_thread(int (*fn)(void *), voi
fs = get_fs();
@@ -754,42 +540,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.18.3/arch/h8300/platform/h8s/ints.c
linux-2.6.18.3-vs2.1.1.2/arch/h8300/platform/h8s/ints.c
---- linux-2.6.18.3/arch/h8300/platform/h8s/ints.c 2006-09-20 16:57:58
+0200
-+++ linux-2.6.18.3-vs2.1.1.2/arch/h8300/platform/h8s/ints.c 2006-11-19
19:52:27 +0100
-@@ -23,6 +23,7 @@
- #include <linux/bootmem.h>
- #include <linux/random.h>
- #include <linux/hardirq.h>
-+#include <linux/vs_context.h>
-
- #include <asm/system.h>
- #include <asm/irq.h>
-@@ -261,9 +262,12 @@ void disable_irq(unsigned int irq)
<<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.44&r2=1.1.2.45&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
