diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2015-11-22 22:44:19 -0500 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2015-11-25 15:01:00 +0000 |
| commit | 4d2ec7e206ae03a51dfbdedc120ce88d403ec926 (patch) | |
| tree | 676fdcdfb7689fb0f5c5b7af31001df508b54763 /arch/arm/mach-orion5x | |
| parent | c1c90728efa49eab81ae816718d84116a22b790e (diff) | |
| download | linux-stable-4d2ec7e206ae03a51dfbdedc120ce88d403ec926.tar.gz linux-stable-4d2ec7e206ae03a51dfbdedc120ce88d403ec926.tar.bz2 linux-stable-4d2ec7e206ae03a51dfbdedc120ce88d403ec926.zip | |
ARM: orion5x: Fix legacy get_irqnr_and_base
Commit 5be9fc23cd ("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: 5d6bed2a9c went in to v4.2, but was backported to v3.18]
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Fixes: 5be9fc23cd ("ARM: orion5x: fix legacy orion5x IRQ numbers")
Cc: <stable@vger.kernel.org> # v3.18+
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-orion5x')
| -rw-r--r-- | arch/arm/mach-orion5x/include/mach/entry-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/include/mach/entry-macro.S b/arch/arm/mach-orion5x/include/mach/entry-macro.S index 79eb502a1e64..73919a36b577 100644 --- a/arch/arm/mach-orion5x/include/mach/entry-macro.S +++ b/arch/arm/mach-orion5x/include/mach/entry-macro.S @@ -21,5 +21,5 @@ @ find cause bits that are unmasked ands \irqstat, \irqstat, \tmp @ clear Z flag if any clzne \irqnr, \irqstat @ calc irqnr - rsbne \irqnr, \irqnr, #31 + rsbne \irqnr, \irqnr, #32 .endm |