MIPS R6 removed the BGTZL instruction so do not try to emulate it if the R2-to-R6 emulator is not present. Signed-off-by: Markos Chandras <markos.chandras@xxxxxxxxxx> --- arch/mips/kernel/branch.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index bed4716117f8..ba68c005aeab 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -621,6 +621,9 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, case bgtz_op: case bgtzl_op: + if (NO_R6EMU && insn.i_format.opcode == bgtzl_op) + /* not emulating the branch likely for R6 */ + break; /* rt field assumed to be zero */ if ((long)regs->regs[insn.i_format.rs] > 0) { epc = epc + 4 + (insn.i_format.simmediate << 2); -- 2.2.0