3.16.49-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: "Maciej W. Rozycki" <[email protected]> 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 <[email protected]> Cc: James Hogan <[email protected]> Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/16394/ Signed-off-by: Ralf Baechle <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> --- arch/mips/kernel/branch.c | 1 + 1 file changed, 1 insertion(+) --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -493,6 +493,7 @@ int __compute_return_epc_for_insn(struct /* * These are unconditional and in j_format. */ + case jalx_op: case jal_op: regs->regs[31] = regs->cp0_epc + 8; case j_op:
