diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-11 00:26:54 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-11 00:27:03 +0100 |
| commit | 51327ada7142ab520ed610a42572d1f4cbfbb2dc (patch) | |
| tree | 3dd587e6322073d0f8847ef92a835fd9fe456b49 /kernel/irq | |
| parent | genirq: Remove dead code (diff) | |
| parent | genirq: Call bus_lock/unlock functions in setup_irq() (diff) | |
| download | linux-51327ada7142ab520ed610a42572d1f4cbfbb2dc.tar.xz linux-51327ada7142ab520ed610a42572d1f4cbfbb2dc.zip | |
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>
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/manage.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index a06b9b6d6b57..47b2bf10afbc 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); |