[Xen-changelog] [xen-unstable] Fix bug in 21089:4f796e29987c

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1271090214 -3600
# Node ID 7eeb131880b20a33e7675cc1726ae312a489be2d
# Parent  b65a41dc6c6a2e2341ae778d8386a08d502bbfa4
Fix bug in 21089:4f796e29987c

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/arch/x86/io_apic.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r b65a41dc6c6a -r 7eeb131880b2 xen/arch/x86/io_apic.c
--- a/xen/arch/x86/io_apic.c    Mon Apr 12 17:36:10 2010 +0100
+++ b/xen/arch/x86/io_apic.c    Mon Apr 12 17:36:54 2010 +0100
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog