diff options
| author | Jason Cooper | 2014-09-14 09:53:54 +0200 |
|---|---|---|
| committer | Jason Cooper | 2014-09-14 09:53:54 +0200 |
| commit | 468a903c0e5147e3f93187f0b808a3ef957fd00e (patch) | |
| tree | 63542d05b1c0f730ec1ad5f915dc4eb3c015e616 /drivers/irqchip/irq-gic.c | |
| parent | Merge branch 'irqchip/gic' into irqchip/core (diff) | |
| parent | openrisc: Get rid of handle_IRQ (diff) | |
| download | kernel-qcow2-linux-468a903c0e5147e3f93187f0b808a3ef957fd00e.tar.gz kernel-qcow2-linux-468a903c0e5147e3f93187f0b808a3ef957fd00e.tar.xz kernel-qcow2-linux-468a903c0e5147e3f93187f0b808a3ef957fd00e.zip | |
Merge branch 'irqchip/handle_domain' into irqchip/core
Diffstat (limited to 'drivers/irqchip/irq-gic.c')
| -rw-r--r-- | drivers/irqchip/irq-gic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 2500f6ba29e1..55aa6f62c77c 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -270,8 +270,7 @@ static void __exception_irq_entry gic_handle_irq(struct pt_regs *regs) irqnr = irqstat & GICC_IAR_INT_ID_MASK; if (likely(irqnr > 15 && irqnr < 1021)) { - irqnr = irq_find_mapping(gic->domain, irqnr); - handle_IRQ(irqnr, regs); + handle_domain_irq(gic->domain, irqnr, regs); continue; } if (irqnr < 16) { |