mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-02 15:21:03 +00:00
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>
This commit is contained in:
commit
51327ada71
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user