diff options
| author | Maciej W. Rozycki <macro@imgtec.com> | 2017-06-16 00:06:19 +0100 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-11-06 15:19:57 +0100 |
| commit | c1b12b6c11a8013929bfaf8656b1a16b880ae3d9 (patch) | |
| tree | d4f23f2f9b07e294b3db3c621431dbcf0d71f14d | |
| parent | e0a8dfe7461a12a909208751023d61ad8e0c48c0 (diff) | |
MIPS: Actually decode JALX in `__compute_return_epc_for_insn'
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 # 3.9+
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>
| -rw-r--r-- | arch/mips/kernel/branch.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index 925099628..63b942f61 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: |