summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMarc Zyngier <maz@misterjones.org>2009-11-05 08:10:10 +0100
committerEric Miao <eric.y.miao@gmail.com>2009-11-13 16:25:46 +0800
commitb2b36316626f0d6b92c3675a2aa2726efc71d146 (patch)
tree582b2e2f75cbb4fdaf759e6c9eca9f7aee7319f7 /arch
parent156171c71a0dc4bce12b4408bb1591f8fe32dc1a (diff)
downloadlinux-3.10-b2b36316626f0d6b92c3675a2aa2726efc71d146.tar.gz
linux-3.10-b2b36316626f0d6b92c3675a2aa2726efc71d146.tar.bz2
linux-3.10-b2b36316626f0d6b92c3675a2aa2726efc71d146.zip
[ARM] pxa: fix interrupts number calculation when CONFIG_PXA_HAVE_ISA_IRQS=y
Commit d2c37068429b29d6549cf3486fc84b836689e122 ([ARM] pxa: initialize default interrupt priority and use ICHP for IRQ handling) broke ISA interrupt support on pxa27x/3xx. In such a case, PXA_IRQ(0) != 0, and the IRQ number computed from ICHP must be offset by PXA_IRQ(0). Tested on an Arcom Zeus (pxa270), with both CONFIG_PXA_HAVE_ISA_IRQS enabled and disabled. Signed-off-by: Marc Zyngier <maz@misterjones.org> Tested-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/include/mach/entry-macro.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/entry-macro.S b/arch/arm/mach-pxa/include/mach/entry-macro.S
index 241880608ac..a73bc86a3c2 100644
--- a/arch/arm/mach-pxa/include/mach/entry-macro.S
+++ b/arch/arm/mach-pxa/include/mach/entry-macro.S
@@ -46,5 +46,6 @@
beq 1001f
bic \irqstat, \irqstat, #0x80000000
mov \irqnr, \irqstat, lsr #16
+ add \irqnr, \irqnr, #(PXA_IRQ(0))
1001:
.endm