[Xen-devel] [PATCH] Re: Xen panics with 2.6.32.11

["Jan Beulich" <JBeulich@xxxxxxxxxx>]

>>> Jeremy Fitzhardinge <jeremy@xxxxxxxx> 07.04.10 00:13 >>>
>Current xen-unstable crashes when booting xen/stable-2.6.32.x 
>(2.6.32.11).  I haven't
>verified it yet, but I guess this is Bastian's patch (537451477469).  Or 
>could it be Jan's 4f796e29987c?

Mine, plus the debug=y one (at least I tested it before that one went
in, which is why I didn't notice any problem). Fix below.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -2163,12 +2163,12 @@ int io_apic_set_pci_routing (int ioapic,
     io_apic_write(ioapic, 0x11+2*pin, *(((int *)&entry)+1));
     io_apic_write(ioapic, 0x10+2*pin, *(((int *)&entry)+0));
     set_native_irq_info(irq, TARGET_CPUS);
-    spin_unlock_irqrestore(&ioapic_lock, flags);
+    spin_unlock(&ioapic_lock);
 
     spin_lock(&desc->lock);
     if (!(desc->status & (IRQ_DISABLED | IRQ_GUEST)))
         desc->handler->startup(irq);
-    spin_unlock(&desc->lock);
+    spin_unlock_irqrestore(&desc->lock, flags);
 
     return 0;
 }




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel