Fix bug in 21089:4f796e29987c

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 0b4275d03dffdf42ca33630e9a71a1e7b41db573..2c5f03d0d2c8e64b98357099b7b2166e801dad31 100644 (file)
--- 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, int pin, int irq, int edge_level, int a
     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;
 }