Merge branch 'irq/for-mips' into irq/core

Reason: irq/for-mips is provided for mips to make core independent
        progress. Merge it into irq/core to avoid conflicts

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 6 insertions, 1 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index a06b9b6d6b5..47b2bf10afb 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -957,9 +957,14 @@ out_thread:
  */
 int setup_irq(unsigned int irq, struct irqaction *act)
 {
+        int retval;
         struct irq_desc *desc = irq_to_desc(irq);
 
-        return __setup_irq(irq, desc, act);
+        chip_bus_lock(desc);
+        retval = __setup_irq(irq, desc, act);
+        chip_bus_sync_unlock(desc);
+
+        return retval;
 }
 EXPORT_SYMBOL_GPL(setup_irq);