summaryrefslogtreecommitdiff
path: root/arch/mips/kernel/genex.S
diff options
context:
space:
mode:
authorMatt Redfearn <matt.redfearn@imgtec.com>2017-01-25 17:00:25 +0000
committerJames Hogan <james.hogan@imgtec.com>2017-02-13 18:58:39 +0000
commitc25f8064c1d5731a2ce5664def890140dcdd3e5c (patch)
tree2b57a262af12d409bf704692776dd29099a8e45e /arch/mips/kernel/genex.S
parent6e5b95cdbd0e9a87bc4b6ca173ae7f4f6a0f3e37 (diff)
MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch
Commit dda45f701c9d ("MIPS: Switch to the irq_stack in interrupts") changed both the normal and vectored interrupt handlers. Unfortunately the vectored version, "except_vec_vi_handler", was incorrectly modified to unconditionally jal to plat_irq_dispatch, rather than doing a jalr to the vectored handler that has been set up. This is ok for many platforms which set the vectored handler to plat_irq_dispatch anyway, but will cause problems with platforms that use other handlers. Fixes: dda45f701c9d ("MIPS: Switch to the irq_stack in interrupts") Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/15110/ Signed-off-by: James Hogan <james.hogan@imgtec.com>
Diffstat (limited to 'arch/mips/kernel/genex.S')
-rw-r--r--arch/mips/kernel/genex.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index 0a7ba4b2f687..7ec9612cb007 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -329,7 +329,7 @@ NESTED(except_vec_vi_handler, 0, sp)
PTR_ADD sp, t0, t1
2:
- jal plat_irq_dispatch
+ jalr v0
/* Restore sp */
move sp, s1