Commit 51327ada authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
parents 44951a60 986c011d

kernel/irq/manage.c

+6 −1
Original line number Diff line number Diff line
@@ -957,9 +957,14 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
 */

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);