Skip to content

Commit 4d2ec7e

Browse files
Nicolas PitreJason Cooper
authored andcommitted
ARM: orion5x: Fix legacy get_irqnr_and_base
Commit 5be9fc2 ("ARM: orion5x: fix legacy orion5x IRQ numbers") shifted IRQ numbers by one but didn't update the get_irqnr_and_base macro accordingly. This macro is involved when CONFIG_MULTI_IRQ_HANDLER is not defined. [jac: 5d6bed2 went in to v4.2, but was backported to v3.18] Signed-off-by: Nicolas Pitre <nico@linaro.org> Fixes: 5be9fc2 ("ARM: orion5x: fix legacy orion5x IRQ numbers") Cc: <stable@vger.kernel.org> # v3.18+ Signed-off-by: Jason Cooper <jason@lakedaemon.net>
1 parent c1c9072 commit 4d2ec7e

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/arm/mach-orion5x/include/mach/entry-macro.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
@ find cause bits that are unmasked
2222
ands \irqstat, \irqstat, \tmp @ clear Z flag if any
2323
clzne \irqnr, \irqstat @ calc irqnr
24-
rsbne \irqnr, \irqnr, #31
24+
rsbne \irqnr, \irqnr, #32
2525
.endm

0 commit comments

Comments
 (0)