Author: baggins Date: Thu Nov 23 18:16:27 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- patch-2.6.18.3-vs2.1.1.2.diff
---- Files affected:
SOURCES:
linux-2.6-vs2.1.patch (1.1.2.43 -> 1.1.2.44)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.43
SOURCES/linux-2.6-vs2.1.patch:1.1.2.44
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.43 Mon Nov 20 14:27:22 2006
+++ SOURCES/linux-2.6-vs2.1.patch Thu Nov 23 19:16:20 2006
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.18.2/Documentation/vserver/debug.txt
linux-2.6.18.2-vs2.1.1/Documentation/vserver/debug.txt
---- linux-2.6.18.2/Documentation/vserver/debug.txt 1970-01-01 01:00:00
+0100
-+++ linux-2.6.18.2-vs2.1.1/Documentation/vserver/debug.txt 2006-11-03
17:26:38 +0100
+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
@@ -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.2/arch/alpha/Kconfig
linux-2.6.18.2-vs2.1.1/arch/alpha/Kconfig
---- linux-2.6.18.2/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/alpha/Kconfig 2006-09-20 17:01:44 +0200
+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
@@ -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.2/arch/alpha/kernel/asm-offsets.c
linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.18.2/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10
+0100
-+++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/asm-offsets.c 2006-09-25
15:40:02 +0200
+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
@@ -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.2/arch/alpha/kernel/entry.S
linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/entry.S
---- linux-2.6.18.2/arch/alpha/kernel/entry.S 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/entry.S 2006-09-25 15:40:02
+0200
+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
@@ -644,7 +644,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
@@ -223,37 +223,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/irq.c
linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/irq.c
---- linux-2.6.18.2/arch/alpha/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/irq.c 2006-10-25 03:39:09
+0200
-@@ -26,6 +26,7 @@
- #include <linux/seq_file.h>
- #include <linux/profile.h>
- #include <linux/bitops.h>
-+#include <linux/vs_context.h>
-
- #include <asm/system.h>
- #include <asm/io.h>
-@@ -140,6 +141,7 @@ handle_irq(int irq, struct pt_regs * reg
- * handled by some other CPU. (or is disabled)
- */
- static unsigned int illegal_count=0;
-+ struct vx_info_save vxis;
-
- if ((unsigned) irq > ACTUAL_NR_IRQS && illegal_count < MAX_ILLEGAL_IRQS
) {
- irq_err_count++;
-@@ -157,6 +159,8 @@ handle_irq(int irq, struct pt_regs * reg
- * at IPL 0.
- */
- local_irq_disable();
-+ __enter_vx_admin(&vxis);
- __do_IRQ(irq, regs);
-+ __leave_vx_admin(&vxis);
- irq_exit();
- }
-diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/osf_sys.c
linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/osf_sys.c
---- linux-2.6.18.2/arch/alpha/kernel/osf_sys.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/osf_sys.c 2006-09-25 15:40:02
+0200
+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>
@@ -362,9 +334,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/ptrace.c
linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/ptrace.c
---- linux-2.6.18.2/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/ptrace.c 2006-10-06 23:10:42
+0200
+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
goto out_notsk;
}
@@ -377,9 +349,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/semaphore.c
linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/semaphore.c
---- linux-2.6.18.2/arch/alpha/kernel/semaphore.c 2004-08-14 12:55:32
+0200
-+++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/semaphore.c 2006-10-28
19:27:34 +0200
+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
@@ -68,8 +68,8 @@ __down_failed(struct semaphore *sem)
DECLARE_WAITQUEUE(wait, tsk);
@@ -413,9 +385,9 @@
#endif
tsk->state = TASK_INTERRUPTIBLE;
-diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/systbls.S
linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/systbls.S
---- linux-2.6.18.2/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/systbls.S 2006-09-20 17:01:44
+0200
+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:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -425,9 +397,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.2/arch/alpha/kernel/traps.c
linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/traps.c
---- linux-2.6.18.2/arch/alpha/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/traps.c 2006-09-25 15:40:02
+0200
+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
@@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -438,9 +410,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.2/arch/alpha/mm/init.c
linux-2.6.18.2-vs2.1.1/arch/alpha/mm/init.c
---- linux-2.6.18.2/arch/alpha/mm/init.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/alpha/mm/init.c 2006-09-20 17:01:44
+0200
+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
@@ -20,6 +20,7 @@
#include <linux/init.h>
#include <linux/bootmem.h> /* max_low_pfn */
@@ -449,9 +421,9 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.18.2/arch/arm/Kconfig
linux-2.6.18.2-vs2.1.1/arch/arm/Kconfig
---- linux-2.6.18.2/arch/arm/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/arm/Kconfig 2006-09-20 17:01:44 +0200
+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"
source "arch/arm/Kconfig.debug"
@@ -461,9 +433,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/arm/kernel/calls.S
linux-2.6.18.2-vs2.1.1/arch/arm/kernel/calls.S
---- linux-2.6.18.2/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
-+++ linux-2.6.18.2-vs2.1.1/arch/arm/kernel/calls.S 2006-09-20 17:01:44
+0200
+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
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -473,9 +445,43 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.18.2/arch/arm/kernel/process.c
linux-2.6.18.2-vs2.1.1/arch/arm/kernel/process.c
---- linux-2.6.18.2/arch/arm/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/arm/kernel/process.c 2006-09-25 15:40:02
+0200
+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)
void show_regs(struct pt_regs * regs)
{
@@ -496,9 +502,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.18.2/arch/arm/kernel/traps.c
linux-2.6.18.2-vs2.1.1/arch/arm/kernel/traps.c
---- linux-2.6.18.2/arch/arm/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/arm/kernel/traps.c 2006-10-28 19:27:58
+0200
+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
@@ -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();
@@ -510,9 +516,9 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.18.2/arch/arm26/Kconfig
linux-2.6.18.2-vs2.1.1/arch/arm26/Kconfig
---- linux-2.6.18.2/arch/arm26/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/arm26/Kconfig 2006-09-20 17:01:44 +0200
+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
@@ -234,6 +234,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -522,9 +528,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/arm26/kernel/calls.S
linux-2.6.18.2-vs2.1.1/arch/arm26/kernel/calls.S
---- linux-2.6.18.2/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.18.2-vs2.1.1/arch/arm26/kernel/calls.S 2006-09-20 17:01:44
+0200
+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
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -537,9 +543,38 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.18.2/arch/arm26/kernel/process.c
linux-2.6.18.2-vs2.1.1/arch/arm26/kernel/process.c
---- linux-2.6.18.2/arch/arm26/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/arm26/kernel/process.c 2006-09-25 15:40:02
+0200
+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
@@ -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;
@@ -550,9 +585,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.18.2/arch/arm26/kernel/traps.c
linux-2.6.18.2-vs2.1.1/arch/arm26/kernel/traps.c
---- linux-2.6.18.2/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/arm26/kernel/traps.c 2006-09-20 17:01:44
+0200
+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
@@ -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());
@@ -565,9 +600,9 @@
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.18.2/arch/cris/Kconfig
linux-2.6.18.2-vs2.1.1/arch/cris/Kconfig
---- linux-2.6.18.2/arch/cris/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/cris/Kconfig 2006-09-20 17:01:44 +0200
+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
@@ -185,6 +185,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -577,9 +612,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/cris/arch-v10/kernel/process.c
linux-2.6.18.2-vs2.1.1/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.18.2/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57
+0200
-+++ linux-2.6.18.2-vs2.1.1/arch/cris/arch-v10/kernel/process.c 2006-09-25
15:40:02 +0200
+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
@@ -103,7 +103,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.dccr = 1 << I_DCCR_BITNR;
@@ -590,9 +625,9 @@
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.18.2/arch/cris/arch-v32/kernel/process.c
linux-2.6.18.2-vs2.1.1/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.18.2/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57
+0200
-+++ linux-2.6.18.2-vs2.1.1/arch/cris/arch-v32/kernel/process.c 2006-09-25
15:40:02 +0200
+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
@@ -120,7 +120,8 @@ kernel_thread(int (*fn)(void *), void *
regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
@@ -603,38 +638,20 @@
}
/*
-diff -NurpP --minimal linux-2.6.18.2/arch/cris/kernel/irq.c
linux-2.6.18.2-vs2.1.1/arch/cris/kernel/irq.c
---- linux-2.6.18.2/arch/cris/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.1.1/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:
+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
+@@ -92,6 +92,7 @@ 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.2/arch/frv/kernel/irq.c
linux-2.6.18.2-vs2.1.1/arch/frv/kernel/irq.c
---- linux-2.6.18.2/arch/frv/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/frv/kernel/irq.c 2006-10-13 20:52:40
+0200
+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>
@@ -662,9 +679,9 @@
__clr_MASK(level);
-diff -NurpP --minimal linux-2.6.18.2/arch/frv/kernel/kernel_thread.S
linux-2.6.18.2-vs2.1.1/arch/frv/kernel/kernel_thread.S
---- linux-2.6.18.2/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20
+0100
-+++ linux-2.6.18.2-vs2.1.1/arch/frv/kernel/kernel_thread.S 2006-09-25
15:40:02 +0200
+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
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -683,9 +700,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.2/arch/h8300/Kconfig
linux-2.6.18.2-vs2.1.1/arch/h8300/Kconfig
---- linux-2.6.18.2/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/h8300/Kconfig 2006-09-20 17:01:44 +0200
+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
@@ -199,6 +199,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -695,9 +712,39 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/h8300/kernel/process.c
linux-2.6.18.2-vs2.1.1/arch/h8300/kernel/process.c
---- linux-2.6.18.2/arch/h8300/kernel/process.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/h8300/kernel/process.c 2006-09-25 15:40:02
+0200
+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
@@ -134,7 +134,7 @@ int kernel_thread(int (*fn)(void *), voi
fs = get_fs();
@@ -707,9 +754,41 @@
__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.2/arch/i386/Kconfig
linux-2.6.18.2-vs2.1.1/arch/i386/Kconfig
---- linux-2.6.18.2/arch/i386/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/i386/Kconfig 2006-09-20 17:01:44 +0200
+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)
+
+ asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)
+ {
++ struct vx_info_save vxis;
++
+ irq_enter();
+ /* ISR clear */
+ /* compatible i386 */
++ __enter_vx_admin(&vxis);
+ if (vec >= EXT_IRQ0 && vec <= EXT_IRQ15)
+ *(volatile unsigned short *)ISR &= ~(1 << (vec - EXT_IRQ0));
+ if (vec < NR_IRQS) {
+@@ -276,6 +280,7 @@ asmlinkage void process_int(unsigned lon
+ } else {
+ BUG();
+ }
++ __leave_vx_admin(&vxis);
+ irq_exit();
+ }
+
+diff -NurpP --minimal linux-2.6.18.3/arch/i386/Kconfig
linux-2.6.18.3-vs2.1.1.2/arch/i386/Kconfig
+--- linux-2.6.18.3/arch/i386/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.1.1.2/arch/i386/Kconfig 2006-09-20 17:01:44 +0200
@@ -1142,6 +1142,8 @@ endmenu
source "arch/i386/Kconfig.debug"
@@ -719,9 +798,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/irq.c
linux-2.6.18.2-vs2.1.1/arch/i386/kernel/irq.c
---- linux-2.6.18.2/arch/i386/kernel/irq.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/i386/kernel/irq.c 2006-10-13 20:52:50
+0200
+diff -NurpP --minimal linux-2.6.18.3/arch/i386/kernel/irq.c
linux-2.6.18.3-vs2.1.1.2/arch/i386/kernel/irq.c
+--- linux-2.6.18.3/arch/i386/kernel/irq.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.1.1.2/arch/i386/kernel/irq.c 2006-10-13 20:52:50
+0200
@@ -18,6 +18,7 @@
#include <linux/notifier.h>
#include <linux/cpu.h>
@@ -755,9 +834,9 @@
irq_exit();
-diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/process.c
linux-2.6.18.2-vs2.1.1/arch/i386/kernel/process.c
---- linux-2.6.18.2/arch/i386/kernel/process.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/i386/kernel/process.c 2006-09-25 15:40:02
+0200
+diff -NurpP --minimal linux-2.6.18.3/arch/i386/kernel/process.c
linux-2.6.18.3-vs2.1.1.2/arch/i386/kernel/process.c
+--- linux-2.6.18.3/arch/i386/kernel/process.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.1.1.2/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;
@@ -781,9 +860,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/sys_i386.c
linux-2.6.18.2-vs2.1.1/arch/i386/kernel/sys_i386.c
---- linux-2.6.18.2/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/i386/kernel/sys_i386.c 2006-09-20 17:01:44
+0200
+diff -NurpP --minimal linux-2.6.18.3/arch/i386/kernel/sys_i386.c
linux-2.6.18.3-vs2.1.1.2/arch/i386/kernel/sys_i386.c
+--- linux-2.6.18.3/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53 +0200
++++ linux-2.6.18.3-vs2.1.1.2/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>
@@ -831,9 +910,9 @@
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/syscall_table.S
linux-2.6.18.2-vs2.1.1/arch/i386/kernel/syscall_table.S
---- linux-2.6.18.2/arch/i386/kernel/syscall_table.S 2006-09-20 16:57:58
+0200
-+++ linux-2.6.18.2-vs2.1.1/arch/i386/kernel/syscall_table.S 2006-09-20
17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.3/arch/i386/kernel/syscall_table.S
linux-2.6.18.3-vs2.1.1.2/arch/i386/kernel/syscall_table.S
+--- linux-2.6.18.3/arch/i386/kernel/syscall_table.S 2006-09-20 16:57:58
+0200
++++ linux-2.6.18.3-vs2.1.1.2/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
@@ -843,9 +922,9 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/sysenter.c
linux-2.6.18.2-vs2.1.1/arch/i386/kernel/sysenter.c
---- linux-2.6.18.2/arch/i386/kernel/sysenter.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.2-vs2.1.1/arch/i386/kernel/sysenter.c 2006-09-20 21:46:26
+0200
+diff -NurpP --minimal linux-2.6.18.3/arch/i386/kernel/sysenter.c
linux-2.6.18.3-vs2.1.1.2/arch/i386/kernel/sysenter.c
+--- linux-2.6.18.3/arch/i386/kernel/sysenter.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.3-vs2.1.1.2/arch/i386/kernel/sysenter.c 2006-09-20
21:46:26 +0200
@@ -17,6 +17,7 @@
#include <linux/elf.h>
#include <linux/mm.h>
@@ -863,9 +942,9 @@
up_fail:
up_write(&mm->mmap_sem);
return ret;
-diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/traps.c
linux-2.6.18.2-vs2.1.1/arch/i386/kernel/traps.c
---- linux-2.6.18.2/arch/i386/kernel/traps.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.43&r2=1.1.2.44&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
