diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-01-22 21:56:04 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-01-22 21:56:04 +0100 |
| commit | b6628210ac5b2e73e8adb0bd7d3a057b7111ab08 (patch) | |
| tree | d64d7c04906151584762c102251e4c5eafa28968 /drivers/irqchip | |
| parent | 397e7b515785cad6e10b29f3001fd80c3f519bb8 (diff) | |
| parent | c7f7bd4a136e4b02dd2a66bf95aec545bd93e8db (diff) | |
| download | linux-b6628210ac5b2e73e8adb0bd7d3a057b7111ab08.tar.bz2 | |
Merge tag 'mvebu-irqchip-fixes-3.13' of git://git.infradead.org/linux-mvebu into irq/core
mvebu irqchip fixes for v3.13
- armada-370-xp
- fix races is MSI and IPI
Diffstat (limited to 'drivers/irqchip')
| -rw-r--r-- | drivers/irqchip/irq-armada-370-xp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 433cc8568dec..3fac063b4a78 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -381,7 +381,7 @@ armada_370_xp_handle_irq(struct pt_regs *regs) ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS) & PCI_MSI_DOORBELL_MASK; - writel(~PCI_MSI_DOORBELL_MASK, per_cpu_int_base + + writel(~msimask, per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS); for (msinr = PCI_MSI_DOORBELL_START; @@ -407,7 +407,7 @@ armada_370_xp_handle_irq(struct pt_regs *regs) ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS) & IPI_DOORBELL_MASK; - writel(~IPI_DOORBELL_MASK, per_cpu_int_base + + writel(~ipimask, per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS); /* Handle all pending doorbells */ |