diff options
| author | Maciej W. Rozycki <macro@imgtec.com> | 2017-06-15 23:06:19 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-27 22:08:04 (GMT) |
| commit | 434c9f2e3b4667859a705b48d53f23f5f629ecf1 (patch) | |
| tree | f6bdb285c95cb0ebc0fc2756167931dab4243f52 /arch/mips | |
| parent | f8c331cbc937d849d93dc9f3f7cdc31d5fbac58e (diff) | |
| download | linux-434c9f2e3b4667859a705b48d53f23f5f629ecf1.tar.xz | |
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
Patchwork: https://patchwork.linux-mips.org/patch/16394/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips')
| -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 c86b66b..62806db 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -556,6 +556,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: |