Author: baggins Date: Wed Oct 18 16:02:19 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- 2.6.18.1 vs2.1.1-rc41
---- Files affected:
SOURCES:
linux-2.6-vs2.1.patch (1.1.2.40 -> 1.1.2.41)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.40
SOURCES/linux-2.6-vs2.1.patch:1.1.2.41
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.40 Tue Oct 10 15:54:52 2006
+++ SOURCES/linux-2.6-vs2.1.patch Wed Oct 18 18:02:12 2006
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.18/Documentation/vserver/debug.txt
linux-2.6.18-vs2.1.1-rc38/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-rc38/Documentation/vserver/debug.txt 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.1/Documentation/vserver/debug.txt
linux-2.6.18.1-vs2.1.1-rc41/Documentation/vserver/debug.txt
+--- linux-2.6.18.1/Documentation/vserver/debug.txt 1970-01-01 01:00:00
+0100
++++ linux-2.6.18.1-vs2.1.1-rc41/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.18/arch/alpha/Kconfig
linux-2.6.18-vs2.1.1-rc38/arch/alpha/Kconfig
---- linux-2.6.18/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200
-+++ linux-2.6.18-vs2.1.1-rc38/arch/alpha/Kconfig 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.18.1/arch/alpha/Kconfig
linux-2.6.18.1-vs2.1.1-rc41/arch/alpha/Kconfig
+--- linux-2.6.18.1/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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.18/arch/alpha/kernel/asm-offsets.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/alpha/kernel/asm-offsets.c 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/asm-offsets.c
linux-2.6.18.1-vs2.1.1-rc41/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.18.1/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10
+0100
++++ linux-2.6.18.1-vs2.1.1-rc41/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,9 +133,9 @@
DEFINE(SIGCHLD, SIGCHLD);
BLANK();
-diff -NurpP --minimal linux-2.6.18/arch/alpha/kernel/entry.S
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/alpha/kernel/entry.S 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/entry.S
linux-2.6.18.1-vs2.1.1-rc41/arch/alpha/kernel/entry.S
+--- linux-2.6.18.1/arch/alpha/kernel/entry.S 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/alpha/kernel/entry.S 2006-09-25
15:40:02 +0200
@@ -644,7 +644,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
@@ -177,9 +177,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.18/arch/alpha/kernel/osf_sys.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/alpha/kernel/osf_sys.c 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/osf_sys.c
linux-2.6.18.1-vs2.1.1-rc41/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.18.1/arch/alpha/kernel/osf_sys.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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>
@@ -288,9 +288,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.18/arch/alpha/kernel/ptrace.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/alpha/kernel/ptrace.c 2006-10-06
23:10:42 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/ptrace.c
linux-2.6.18.1-vs2.1.1-rc41/arch/alpha/kernel/ptrace.c
+--- linux-2.6.18.1/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/alpha/kernel/ptrace.c 2006-10-06
23:10:42 +0200
@@ -283,6 +283,11 @@ do_sys_ptrace(long request, long pid, lo
goto out_notsk;
}
@@ -303,9 +303,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -NurpP --minimal linux-2.6.18/arch/alpha/kernel/systbls.S
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/alpha/kernel/systbls.S 2006-09-20
17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/systbls.S
linux-2.6.18.1-vs2.1.1-rc41/arch/alpha/kernel/systbls.S
+--- linux-2.6.18.1/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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
@@ -315,9 +315,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/arch/alpha/kernel/traps.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/alpha/kernel/traps.c 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/traps.c
linux-2.6.18.1-vs2.1.1-rc41/arch/alpha/kernel/traps.c
+--- linux-2.6.18.1/arch/alpha/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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());
@@ -328,9 +328,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/arch/alpha/mm/init.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/alpha/mm/init.c 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.18.1/arch/alpha/mm/init.c
linux-2.6.18.1-vs2.1.1-rc41/arch/alpha/mm/init.c
+--- linux-2.6.18.1/arch/alpha/mm/init.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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 */
@@ -339,9 +339,9 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.18/arch/arm/Kconfig
linux-2.6.18-vs2.1.1-rc38/arch/arm/Kconfig
---- linux-2.6.18/arch/arm/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18-vs2.1.1-rc38/arch/arm/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/arm/Kconfig
linux-2.6.18.1-vs2.1.1-rc41/arch/arm/Kconfig
+--- linux-2.6.18.1/arch/arm/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/arm/Kconfig 2006-09-20 17:01:44
+0200
@@ -907,6 +907,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -351,9 +351,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18/arch/arm/kernel/calls.S
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/arm/kernel/calls.S 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.18.1/arch/arm/kernel/calls.S
linux-2.6.18.1-vs2.1.1-rc41/arch/arm/kernel/calls.S
+--- linux-2.6.18.1/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/arm/kernel/calls.S 2006-09-20
17:01:44 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -363,9 +363,9 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.18/arch/arm/kernel/process.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/arm/kernel/process.c 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/arm/kernel/process.c
linux-2.6.18.1-vs2.1.1-rc41/arch/arm/kernel/process.c
+--- linux-2.6.18.1/arch/arm/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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)
{
@@ -386,9 +386,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.18/arch/arm26/Kconfig
linux-2.6.18-vs2.1.1-rc38/arch/arm26/Kconfig
---- linux-2.6.18/arch/arm26/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18-vs2.1.1-rc38/arch/arm26/Kconfig 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.18.1/arch/arm26/Kconfig
linux-2.6.18.1-vs2.1.1-rc41/arch/arm26/Kconfig
+--- linux-2.6.18.1/arch/arm26/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/arm26/Kconfig 2006-09-20 17:01:44
+0200
@@ -234,6 +234,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -398,9 +398,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18/arch/arm26/kernel/calls.S
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/arm26/kernel/calls.S 2006-09-20
17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/arm26/kernel/calls.S
linux-2.6.18.1-vs2.1.1-rc41/arch/arm26/kernel/calls.S
+--- linux-2.6.18.1/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/arm26/kernel/calls.S 2006-09-20
17:01:44 +0200
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -413,9 +413,9 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.18/arch/arm26/kernel/process.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/arm26/kernel/process.c 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/arm26/kernel/process.c
linux-2.6.18.1-vs2.1.1-rc41/arch/arm26/kernel/process.c
+--- linux-2.6.18.1/arch/arm26/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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;
@@ -426,9 +426,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.18/arch/arm26/kernel/traps.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/arm26/kernel/traps.c 2006-09-20
17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/arm26/kernel/traps.c
linux-2.6.18.1-vs2.1.1-rc41/arch/arm26/kernel/traps.c
+--- linux-2.6.18.1/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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());
@@ -441,9 +441,9 @@
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.18/arch/cris/Kconfig
linux-2.6.18-vs2.1.1-rc38/arch/cris/Kconfig
---- linux-2.6.18/arch/cris/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18-vs2.1.1-rc38/arch/cris/Kconfig 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.18.1/arch/cris/Kconfig
linux-2.6.18.1-vs2.1.1-rc41/arch/cris/Kconfig
+--- linux-2.6.18.1/arch/cris/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/cris/Kconfig 2006-09-20 17:01:44
+0200
@@ -185,6 +185,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -453,9 +453,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18/arch/cris/arch-v10/kernel/process.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/cris/arch-v10/kernel/process.c
2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/cris/arch-v10/kernel/process.c
linux-2.6.18.1-vs2.1.1-rc41/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.18.1/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57
+0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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;
@@ -466,9 +466,9 @@
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.18/arch/cris/arch-v32/kernel/process.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/cris/arch-v32/kernel/process.c
2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/cris/arch-v32/kernel/process.c
linux-2.6.18.1-vs2.1.1-rc41/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.18.1/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57
+0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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);
@@ -479,9 +479,68 @@
}
/*
-diff -NurpP --minimal linux-2.6.18/arch/frv/kernel/kernel_thread.S
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/frv/kernel/kernel_thread.S 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/cris/kernel/irq.c
linux-2.6.18.1-vs2.1.1-rc41/arch/cris/kernel/irq.c
+--- linux-2.6.18.1/arch/cris/kernel/irq.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/cris/kernel/irq.c 2006-10-13 20:52:32
+0200
+@@ -35,6 +35,7 @@
+ #include <linux/seq_file.h>
+ #include <linux/errno.h>
+ #include <linux/spinlock.h>
++#include <linux/vs_context.h>
+
+ #include <asm/io.h>
+
+@@ -92,13 +93,17 @@ skip:
+ asmlinkage void do_IRQ(int irq, struct pt_regs * regs)
+ {
+ unsigned long sp;
++ struct vx_info_save vxis;
++
+ irq_enter();
+ sp = rdsp();
+ if (unlikely((sp & (PAGE_SIZE - 1)) < (PAGE_SIZE/8))) {
+ printk("do_IRQ: stack overflow: %lX\n", sp);
+ show_stack(NULL, (unsigned long *)sp);
+ }
++ __enter_vx_admin(&vxis);
+ __do_IRQ(irq, regs);
++ __leave_vx_admin(&vxis);
+ irq_exit();
+ }
+
+diff -NurpP --minimal linux-2.6.18.1/arch/frv/kernel/irq.c
linux-2.6.18.1-vs2.1.1-rc41/arch/frv/kernel/irq.c
+--- linux-2.6.18.1/arch/frv/kernel/irq.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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.1/arch/frv/kernel/kernel_thread.S
linux-2.6.18.1-vs2.1.1-rc41/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.18.1/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20
+0100
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/frv/kernel/kernel_thread.S
2006-09-25 15:40:02 +0200
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -500,9 +559,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/arch/h8300/Kconfig
linux-2.6.18-vs2.1.1-rc38/arch/h8300/Kconfig
---- linux-2.6.18/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
-+++ linux-2.6.18-vs2.1.1-rc38/arch/h8300/Kconfig 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.18.1/arch/h8300/Kconfig
linux-2.6.18.1-vs2.1.1-rc41/arch/h8300/Kconfig
+--- linux-2.6.18.1/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/h8300/Kconfig 2006-09-20 17:01:44
+0200
@@ -199,6 +199,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -512,9 +571,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18/arch/h8300/kernel/process.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/h8300/kernel/process.c 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/h8300/kernel/process.c
linux-2.6.18.1-vs2.1.1-rc41/arch/h8300/kernel/process.c
+--- linux-2.6.18.1/arch/h8300/kernel/process.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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();
@@ -524,9 +583,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.18/arch/i386/Kconfig
linux-2.6.18-vs2.1.1-rc38/arch/i386/Kconfig
---- linux-2.6.18/arch/i386/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18-vs2.1.1-rc38/arch/i386/Kconfig 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.18.1/arch/i386/Kconfig
linux-2.6.18.1-vs2.1.1-rc41/arch/i386/Kconfig
+--- linux-2.6.18.1/arch/i386/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/i386/Kconfig 2006-09-20 17:01:44
+0200
@@ -1142,6 +1142,8 @@ endmenu
source "arch/i386/Kconfig.debug"
@@ -536,9 +595,45 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18/arch/i386/kernel/process.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/i386/kernel/process.c 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/irq.c
linux-2.6.18.1-vs2.1.1-rc41/arch/i386/kernel/irq.c
+--- linux-2.6.18.1/arch/i386/kernel/irq.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/i386/kernel/irq.c 2006-10-13 20:52:50
+0200
+@@ -18,6 +18,7 @@
+ #include <linux/notifier.h>
+ #include <linux/cpu.h>
+ #include <linux/delay.h>
++#include <linux/vs_context.h>
+
+ DEFINE_PER_CPU(irq_cpustat_t, irq_stat) ____cacheline_internodealigned_in_smp;
+ EXPORT_PER_CPU_SYMBOL(irq_stat);
+@@ -55,6 +56,7 @@ fastcall unsigned int do_IRQ(struct pt_r
+ {
+ /* high bit used in ret_from_ code */
+ int irq = ~regs->orig_eax;
++ struct vx_info_save vxis;
+ #ifdef CONFIG_4KSTACKS
+ union irq_ctx *curctx, *irqctx;
+ u32 *isp;
+@@ -81,7 +83,7 @@ fastcall unsigned int do_IRQ(struct pt_r
+ }
+ }
+ #endif
+-
++ __enter_vx_admin(&vxis);
+ #ifdef CONFIG_4KSTACKS
+
+ curctx = (union irq_ctx *) current_thread_info();
+@@ -120,6 +122,7 @@ fastcall unsigned int do_IRQ(struct pt_r
+ } else
+ #endif
+ __do_IRQ(irq, regs);
++ __leave_vx_admin(&vxis);
+
+ irq_exit();
+
+diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/process.c
linux-2.6.18.1-vs2.1.1-rc41/arch/i386/kernel/process.c
+--- linux-2.6.18.1/arch/i386/kernel/process.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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;
@@ -562,9 +657,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.18/arch/i386/kernel/sys_i386.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/i386/kernel/sys_i386.c 2006-09-20
17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/sys_i386.c
linux-2.6.18.1-vs2.1.1-rc41/arch/i386/kernel/sys_i386.c
+--- linux-2.6.18.1/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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>
@@ -612,9 +707,9 @@
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.18/arch/i386/kernel/syscall_table.S
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/i386/kernel/syscall_table.S 2006-09-20
17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/syscall_table.S
linux-2.6.18.1-vs2.1.1-rc41/arch/i386/kernel/syscall_table.S
+--- linux-2.6.18.1/arch/i386/kernel/syscall_table.S 2006-09-20 16:57:58
+0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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
@@ -624,9 +719,9 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.18/arch/i386/kernel/sysenter.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/i386/kernel/sysenter.c 2006-09-20
21:46:26 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/sysenter.c
linux-2.6.18.1-vs2.1.1-rc41/arch/i386/kernel/sysenter.c
+--- linux-2.6.18.1/arch/i386/kernel/sysenter.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/i386/kernel/sysenter.c 2006-09-20
21:46:26 +0200
@@ -17,6 +17,7 @@
#include <linux/elf.h>
#include <linux/mm.h>
@@ -644,9 +739,9 @@
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-rc38/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-rc38/arch/i386/kernel/traps.c 2006-09-25 15:40:02
+0200
+diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/traps.c
linux-2.6.18.1-vs2.1.1-rc41/arch/i386/kernel/traps.c
+--- linux-2.6.18.1/arch/i386/kernel/traps.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/i386/kernel/traps.c 2006-09-25
15:40:02 +0200
@@ -53,6 +53,8 @@
#include <asm/kdebug.h>
@@ -688,9 +783,9 @@
/* Executive summary in case the oops scrolled away */
esp = (unsigned long) (®s->esp);
savesegment(ss, ss);
-diff -NurpP --minimal linux-2.6.18/arch/ia64/Kconfig
linux-2.6.18-vs2.1.1-rc38/arch/ia64/Kconfig
---- linux-2.6.18/arch/ia64/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18-vs2.1.1-rc38/arch/ia64/Kconfig 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.18.1/arch/ia64/Kconfig
linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/Kconfig
+--- linux-2.6.18.1/arch/ia64/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/Kconfig 2006-09-20 17:01:44
+0200
@@ -525,6 +525,8 @@ endmenu
source "arch/ia64/Kconfig.debug"
@@ -700,9 +795,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18/arch/ia64/ia32/binfmt_elf32.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/ia64/ia32/binfmt_elf32.c 2006-09-20
17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/ia64/ia32/binfmt_elf32.c
linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.18.1/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 16:57:58
+0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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 +808,9 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.18/arch/ia64/ia32/ia32_entry.S
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/ia64/ia32/ia32_entry.S 2006-09-20
17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/ia64/ia32/ia32_entry.S
linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.18.1/arch/ia64/ia32/ia32_entry.S 2006-06-18 04:51:55 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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,9 +820,9 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.18/arch/ia64/ia32/sys_ia32.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/ia64/ia32/sys_ia32.c 2006-10-06
23:10:42 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/ia64/ia32/sys_ia32.c
linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/ia32/sys_ia32.c
+--- linux-2.6.18.1/arch/ia64/ia32/sys_ia32.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/ia32/sys_ia32.c 2006-10-06
23:10:42 +0200
@@ -1177,7 +1177,7 @@ sys32_gettimeofday (struct compat_timeva
{
if (tv) {
@@ -737,9 +832,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.18/arch/ia64/kernel/asm-offsets.c
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/ia64/kernel/asm-offsets.c 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/asm-offsets.c
linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/kernel/asm-offsets.c
+--- linux-2.6.18.1/arch/ia64/kernel/asm-offsets.c 2006-09-20 16:57:58
+0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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);
@@ -748,9 +843,9 @@
BLANK();
DEFINE(IA64_CPUINFO_NSEC_PER_CYC_OFFSET,
-diff -NurpP --minimal linux-2.6.18/arch/ia64/kernel/entry.S
linux-2.6.18-vs2.1.1-rc38/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-rc38/arch/ia64/kernel/entry.S 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/entry.S
linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/kernel/entry.S
+--- linux-2.6.18.1/arch/ia64/kernel/entry.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/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
@@ -760,9 +855,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.18/arch/ia64/kernel/perfmon.c
linux-2.6.18-vs2.1.1-rc38/arch/ia64/kernel/perfmon.c
---- linux-2.6.18/arch/ia64/kernel/perfmon.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18-vs2.1.1-rc38/arch/ia64/kernel/perfmon.c 2006-10-07
04:29:47 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/perfmon.c
linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/kernel/perfmon.c
+--- linux-2.6.18.1/arch/ia64/kernel/perfmon.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/kernel/perfmon.c 2006-10-07
04:29:47 +0200
@@ -40,6 +40,7 @@
#include <linux/capability.h>
#include <linux/rcupdate.h>
@@ -780,9 +875,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.18/arch/ia64/kernel/process.c
linux-2.6.18-vs2.1.1-rc38/arch/ia64/kernel/process.c
---- linux-2.6.18/arch/ia64/kernel/process.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18-vs2.1.1-rc38/arch/ia64/kernel/process.c 2006-09-25
15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/process.c
linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/kernel/process.c
+--- linux-2.6.18.1/arch/ia64/kernel/process.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/kernel/process.c 2006-09-25
15:40:02 +0200
@@ -107,7 +107,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -803,9 +898,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.18/arch/ia64/kernel/ptrace.c
linux-2.6.18-vs2.1.1-rc38/arch/ia64/kernel/ptrace.c
---- linux-2.6.18/arch/ia64/kernel/ptrace.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18-vs2.1.1-rc38/arch/ia64/kernel/ptrace.c 2006-10-07
04:29:47 +0200
+diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/ptrace.c
linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/kernel/ptrace.c
+--- linux-2.6.18.1/arch/ia64/kernel/ptrace.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/kernel/ptrace.c 2006-10-07
04:29:47 +0200
@@ -1442,6 +1442,9 @@ sys_ptrace (long request, pid_t pid, uns
read_unlock(&tasklist_lock);
if (!child)
@@ -816,9 +911,9 @@
ret = -EPERM;
if (pid == 1) /* no messing around with init! */
goto out_tsk;
-diff -NurpP --minimal linux-2.6.18/arch/ia64/kernel/traps.c
linux-2.6.18-vs2.1.1-rc38/arch/ia64/kernel/traps.c
---- linux-2.6.18/arch/ia64/kernel/traps.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18-vs2.1.1-rc38/arch/ia64/kernel/traps.c 2006-09-25 15:40:02
+0200
+diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/traps.c
linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/kernel/traps.c
+--- linux-2.6.18.1/arch/ia64/kernel/traps.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.1-vs2.1.1-rc41/arch/ia64/kernel/traps.c 2006-09-25
15:40:02 +0200
@@ -106,8 +106,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -843,9 +938,9 @@
}
exception = fp_emulate(fp_fault, bundle, ®s->cr_ipsr,
®s->ar_fpsr, &isr, ®s->pr,
-diff -NurpP --minimal linux-2.6.18/arch/ia64/mm/fault.c
linux-2.6.18-vs2.1.1-rc38/arch/ia64/mm/fault.c
---- linux-2.6.18/arch/ia64/mm/fault.c 2006-09-20 16:57:58 +0200
<<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.40&r2=1.1.2.41&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
