Merge branches 'irq/genirq', 'irq/sparseirq' and 'irq/urgent' into irq/core

[~andy/linux] / arch / arm / kernel / irq.c

diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index a285e4a636a64ff5d1ab23da361c6e786339672b..7296f041628663f2c88258b90f2e411d99d3a4aa 100644 (file)
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -101,7 +101,7 @@ unlock:
 /* Handle bad interrupts */
 static struct irq_desc bad_irq_desc = {
        .handle_irq = handle_bad_irq,
-       .lock = SPIN_LOCK_UNLOCKED
+       .lock = __SPIN_LOCK_UNLOCKED(bad_irq_desc.lock),
 };
 
 /*