[PATCH RFC 49/67] MIPS: kernel: branch: Prevent BLEZL emulation for MIPS R6
From: Markos Chandras <hidden>
Date: 2014-12-18 15:24:58
Subsystem:
mips, the rest · Maintainers:
Thomas Bogendoerfer, Linus Torvalds
MIPS R6 removed the BLEZL instruction so do not try to emulate it if the R2-to-R6 emulator is not present. Signed-off-by: Markos Chandras <redacted> --- arch/mips/kernel/branch.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c
index 979aa489754c..bed4716117f8 100644
--- a/arch/mips/kernel/branch.c
+++ b/arch/mips/kernel/branch.c@@ -604,6 +604,11 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, case blez_op: /* not really i_format */ case blezl_op: + if (NO_R6EMU && insn.i_format.opcode == blezl_op) { + /* not emulating the branch likely for R6 */ + ret = -SIGILL; + 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