diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-05-27 19:38:09 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-05-27 19:38:09 +0200 |
| commit | c0ffa793994a7a69c37a96dabf38323eae1dffa6 (patch) | |
| tree | 070efc4cc6a123cf0d76cd95c82ff19c77c66f8b /drivers/irqchip/irq-gic.c | |
| parent | a257954bb38ab23dbf93df812b4b2c01cae29d8b (diff) | |
| parent | c8dfe94bc7a14c6a644ce55ef77b7a81505c696f (diff) | |
Merge tag 'irqchip-3.16' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v3.16 collected by Jason Cooper:
- irq-gic: Use a mask field
- irq-armada-370-xp: Move the DT binding docs to the irqchip directory
- irq-brcmstb-l2: New driver for Broadcom Set Top Box Level-2
Diffstat (limited to 'drivers/irqchip/irq-gic.c')
| -rw-r--r-- | drivers/irqchip/irq-gic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 57d165e026f..7e11c9d6ae8 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -291,7 +291,7 @@ static void __exception_irq_entry gic_handle_irq(struct pt_regs *regs) do { irqstat = readl_relaxed(cpu_base + GIC_CPU_INTACK); - irqnr = irqstat & ~0x1c00; + irqnr = irqstat & GICC_IAR_INT_ID_MASK; if (likely(irqnr > 15 && irqnr < 1021)) { irqnr = irq_find_mapping(gic->domain, irqnr); |