This is a note to let you know that I've just added the patch titled MIPS: Actually decode JALX in `__compute_return_epc_for_insn' to the 4.12-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mips-actually-decode-jalx-in-__compute_return_epc_for_insn.patch and it can be found in the queue-4.12 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From a9db101b735a9d49295326ae41f610f6da62b08c Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" <macro@xxxxxxxxxx> Date: Fri, 16 Jun 2017 00:06:19 +0100 Subject: MIPS: Actually decode JALX in `__compute_return_epc_for_insn' From: Maciej W. Rozycki <macro@xxxxxxxxxx> 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@xxxxxxxxxx> Cc: James Hogan <james.hogan@xxxxxxxxxx> Cc: linux-mips@xxxxxxxxxxxxxx Patchwork: https://patchwork.linux-mips.org/patch/16394/ Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/mips/kernel/branch.c | 1 + 1 file changed, 1 insertion(+) --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -556,6 +556,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: Patches currently in stable-queue which might be from macro@xxxxxxxxxx are queue-4.12/mips-send-sigill-for-bposge32-in-__compute_return_epc_for_insn.patch queue-4.12/mips-actually-decode-jalx-in-__compute_return_epc_for_insn.patch queue-4.12/mips-fix-a-typo-s-preset-present-in-r2-to-r6-emulation-error-message.patch queue-4.12/mips-fix-unaligned-pc-interpretation-in-compute_return_epc.patch queue-4.12/mips-rename-sigill_r6-to-sigill_r2r6-in-__compute_return_epc_for_insn.patch queue-4.12/mips-send-sigill-for-r6-branches-in-__compute_return_epc_for_insn.patch queue-4.12/mips-send-sigill-for-linked-branches-in-__compute_return_epc_for_insn.patch queue-4.12/mips-math-emu-prevent-wrong-isa-mode-instruction-emulation.patch