[PATCH] x86_64: fix vector_lock deadlock in io_apic.c

[linux-2.6-omap-h63xx.git] / arch / x86_64 / kernel / io_apic.c

diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index 38a3ff30bde1a9404c080f79f234142899976236..519cd4e6f9e79c5fbad517d5adde793555641c78 100644 (file)
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -836,14 +836,15 @@ u8 irq_vector[NR_IRQ_VECTORS] __read_mostly = { FIRST_DEVICE_VECTOR , 0 };
 int assign_irq_vector(int irq)
 {
        static int current_vector = FIRST_DEVICE_VECTOR, offset = 0;
+       unsigned long flags;
        int vector;
 
        BUG_ON(irq != AUTO_ASSIGN && (unsigned)irq >= NR_IRQ_VECTORS);
 
-       spin_lock(&vector_lock);
+       spin_lock_irqsave(&vector_lock, flags);
 
        if (irq != AUTO_ASSIGN && IO_APIC_VECTOR(irq) > 0) {
-               spin_unlock(&vector_lock);
+               spin_unlock_irqrestore(&vector_lock, flags);
                return IO_APIC_VECTOR(irq);
        }
 next:
@@ -862,7 +863,7 @@ next:
        if (irq != AUTO_ASSIGN)
                IO_APIC_VECTOR(irq) = vector;
 
-       spin_unlock(&vector_lock);
+       spin_unlock_irqrestore(&vector_lock, flags);
 
        return vector;
 }