| From | Willy Tarreau <> | Subject | [PATCH 3.10 036/139] MIPS: Actually decode JALX in `__compute_return_epc_for_insn' | Date | Wed, 1 Nov 2017 22:17:36 +0100 |
| |
From: "Maciej W. Rozycki" <macro@imgtec.com>
commit a9db101b735a9d49295326ae41f610f6da62b08c upstream.
Complement commit fb6883e5809c ("MIPS: microMIPS: Support handling of delay slots.") and actually decode the regular MIPS JALX major instruction opcode, the handling of which has been added with the said commit for EPC calculation in `__compute_return_epc_for_insn'.
Fixes: fb6883e5809c ("MIPS: microMIPS: Support handling of delay slots.") Signed-off-by: Maciej W. Rozycki <macro@imgtec.com> Cc: James Hogan <james.hogan@imgtec.com> Cc: linux-mips@linux-mips.org Cc: stable@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/16394/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Willy Tarreau <w@1wt.eu> --- arch/mips/kernel/branch.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index 9250996..63b942f 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -297,6 +297,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, /* * These are unconditional and in j_format. */ + case jalx_op: case jal_op: regs->regs[31] = regs->cp0_epc + 8; case j_op: -- 2.8.0.rc2.1.gbe9624a
|