Author: waldi
Date: Fri Dec 15 18:46:23 2006
New Revision: 8014
Modified:
dists/sid/linux-2.6/debian/patches/features/all/xen/vserver-update.patch
Log:
debian/patches/features/all/xen/vserver-update.patch: Sync with xen patch.
Modified:
dists/sid/linux-2.6/debian/patches/features/all/xen/vserver-update.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/vserver-update.patch
(original)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/vserver-update.patch
Fri Dec 15 18:46:23 2006
@@ -1,42 +1,17 @@
diff -ur source-amd64-xen/arch/i386/kernel/irq-xen.c
source-amd64-xen-vserver-patch/arch/i386/kernel/irq-xen.c
---- source-amd64-xen/arch/i386/kernel/irq-xen.c 2006-11-06
11:57:48.000000000 +0100
-+++ source-amd64-xen-vserver-patch/arch/i386/kernel/irq-xen.c 2006-11-06
12:06:08.000000000 +0100
-@@ -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 @@
- {
- /* 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 @@
+--- source-amd64-xen/arch/i386/kernel/irq-xen.c 2006-12-15
18:44:42.000000000 +0100
++++ source-amd64-xen-vserver-patch/arch/i386/kernel/irq-xen.c 2006-12-15
18:45:43.000000000 +0100
+@@ -81,7 +81,6 @@
}
}
#endif
-
-+ __enter_vx_admin(&vxis);
#ifdef CONFIG_4KSTACKS
curctx = (union irq_ctx *) current_thread_info();
-@@ -120,6 +122,7 @@
- } else
- #endif
- __do_IRQ(irq, regs);
-+ __leave_vx_admin(&vxis);
-
- irq_exit();
-
diff -ur source-amd64-xen/arch/i386/kernel/traps-xen.c
source-amd64-xen-vserver-patch/arch/i386/kernel/traps-xen.c
---- source-amd64-xen/arch/i386/kernel/traps-xen.c 2006-11-06
11:57:48.000000000 +0100
-+++ source-amd64-xen-vserver-patch/arch/i386/kernel/traps-xen.c
2006-11-06 12:06:08.000000000 +0100
+--- source-amd64-xen/arch/i386/kernel/traps-xen.c 2006-12-15
18:44:42.000000000 +0100
++++ source-amd64-xen-vserver-patch/arch/i386/kernel/traps-xen.c
2006-12-15 18:45:43.000000000 +0100
@@ -53,6 +53,7 @@
#include <asm/kdebug.h>
@@ -45,7 +20,7 @@
#include "mach_traps.h"
-@@ -309,8 +310,8 @@
+@@ -310,8 +311,8 @@
regs->esi, regs->edi, regs->ebp, esp);
printk(KERN_EMERG "ds: %04x es: %04x ss: %04x\n",
regs->xds & 0xffff, regs->xes & 0xffff, ss);
@@ -56,7 +31,7 @@
current_thread_info(), current, current->thread_info);
/*
* When in-kernel, we also print out the stack and code at the
-@@ -392,6 +393,8 @@
+@@ -393,6 +394,8 @@
oops_enter();
@@ -65,7 +40,7 @@
if (die.lock_owner != raw_smp_processor_id()) {
console_verbose();
spin_lock_irqsave(&die.lock, flags);
-@@ -428,9 +431,9 @@
+@@ -429,9 +432,9 @@
if (nl)
printk("\n");
if (notify_die(DIE_OOPS, str, regs, err,
@@ -78,8 +53,8 @@
esp = (unsigned long) (®s->esp);
savesegment(ss, ss);
diff -ur source-amd64-xen/arch/x86_64/ia32/ia32entry-xen.S
source-amd64-xen-vserver-patch/arch/x86_64/ia32/ia32entry-xen.S
---- source-amd64-xen/arch/x86_64/ia32/ia32entry-xen.S 2006-11-06
11:57:48.000000000 +0100
-+++ source-amd64-xen-vserver-patch/arch/x86_64/ia32/ia32entry-xen.S
2006-11-06 12:06:08.000000000 +0100
+--- source-amd64-xen/arch/x86_64/ia32/ia32entry-xen.S 2006-12-15
18:44:42.000000000 +0100
++++ source-amd64-xen-vserver-patch/arch/x86_64/ia32/ia32entry-xen.S
2006-12-15 18:45:43.000000000 +0100
@@ -695,7 +695,7 @@
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
@@ -90,8 +65,8 @@
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
diff -ur source-amd64-xen/arch/x86_64/ia32/syscall32-xen.c
source-amd64-xen-vserver-patch/arch/x86_64/ia32/syscall32-xen.c
---- source-amd64-xen/arch/x86_64/ia32/syscall32-xen.c 2006-11-06
11:57:48.000000000 +0100
-+++ source-amd64-xen-vserver-patch/arch/x86_64/ia32/syscall32-xen.c
2006-11-06 12:06:08.000000000 +0100
+--- source-amd64-xen/arch/x86_64/ia32/syscall32-xen.c 2006-12-15
18:44:42.000000000 +0100
++++ source-amd64-xen-vserver-patch/arch/x86_64/ia32/syscall32-xen.c
2006-12-15 18:45:43.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/stringify.h>
@@ -109,39 +84,10 @@
up_write(&mm->mmap_sem);
return 0;
}
-diff -ur source-amd64-xen/arch/x86_64/kernel/irq-xen.c
source-amd64-xen-vserver-patch/arch/x86_64/kernel/irq-xen.c
---- source-amd64-xen/arch/x86_64/kernel/irq-xen.c 2006-11-06
11:57:48.000000000 +0100
-+++ source-amd64-xen-vserver-patch/arch/x86_64/kernel/irq-xen.c
2006-11-06 12:06:08.000000000 +0100
-@@ -15,6 +15,7 @@
- #include <linux/seq_file.h>
- #include <linux/module.h>
- #include <linux/delay.h>
-+#include <linux/vs_context.h>
- #include <asm/uaccess.h>
- #include <asm/io_apic.h>
- #include <asm/idle.h>
-@@ -117,6 +118,7 @@
- {
- /* high bit used in ret_from_ code */
- unsigned irq = ~regs->orig_rax;
-+ struct vx_info_save vxis;
-
- if (unlikely(irq >= NR_IRQS)) {
- printk(KERN_EMERG "%s: cannot handle IRQ %d\n",
-@@ -130,7 +132,9 @@
- #ifdef CONFIG_DEBUG_STACKOVERFLOW
- stack_overflow_check(regs);
- #endif
-+ __enter_vx_admin(&vxis);
- __do_IRQ(irq, regs);
-+ __leave_vx_admin(&vxis);
- irq_exit();
-
- return 1;
diff -ur source-amd64-xen/arch/x86_64/kernel/traps-xen.c
source-amd64-xen-vserver-patch/arch/x86_64/kernel/traps-xen.c
---- source-amd64-xen/arch/x86_64/kernel/traps-xen.c 2006-11-06
11:57:48.000000000 +0100
-+++ source-amd64-xen-vserver-patch/arch/x86_64/kernel/traps-xen.c
2006-11-06 12:06:08.000000000 +0100
-@@ -436,8 +436,9 @@
+--- source-amd64-xen/arch/x86_64/kernel/traps-xen.c 2006-12-15
18:44:42.000000000 +0100
++++ source-amd64-xen-vserver-patch/arch/x86_64/kernel/traps-xen.c
2006-12-15 18:45:43.000000000 +0100
+@@ -435,8 +435,9 @@
printk("CPU %d ", cpu);
__show_regs(regs);
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
