diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-09-14 03:53:54 -0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-09-14 03:53:54 -0400 |
| commit | 468a903c0e5147e3f93187f0b808a3ef957fd00e (patch) | |
| tree | 63542d05b1c0f730ec1ad5f915dc4eb3c015e616 /drivers/irqchip/irq-gic.c | |
| parent | ce92bfe88ba38e76371feb93307125fac3f800f0 (diff) | |
| parent | 087fe000f086c933f831044cbd0e69b4e140f38c (diff) | |
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) | |||
| 270 | irqnr = irqstat & GICC_IAR_INT_ID_MASK; | 270 | irqnr = irqstat & GICC_IAR_INT_ID_MASK; |
| 271 | 271 | ||
| 272 | if (likely(irqnr > 15 && irqnr < 1021)) { | 272 | if (likely(irqnr > 15 && irqnr < 1021)) { |
| 273 | irqnr = irq_find_mapping(gic->domain, irqnr); | 273 | handle_domain_irq(gic->domain, irqnr, regs); |
| 274 | handle_IRQ(irqnr, regs); | ||
| 275 | continue; | 274 | continue; |
| 276 | } | 275 | } |
| 277 | if (irqnr < 16) { | 276 | if (irqnr < 16) { |