|
@@ -1369,26 +1369,12 @@ asmlinkage void do_cpu(struct pt_regs *regs)
|
|
|
if (unlikely(compute_return_epc(regs) < 0))
|
|
|
break;
|
|
|
|
|
|
- if (get_isa16_mode(regs->cp0_epc)) {
|
|
|
- unsigned short mmop[2] = { 0 };
|
|
|
-
|
|
|
- if (unlikely(get_user(mmop[0], epc) < 0))
|
|
|
- status = SIGSEGV;
|
|
|
- if (unlikely(get_user(mmop[1], epc) < 0))
|
|
|
- status = SIGSEGV;
|
|
|
- opcode = (mmop[0] << 16) | mmop[1];
|
|
|
-
|
|
|
- if (status < 0)
|
|
|
- status = simulate_rdhwr_mm(regs, opcode);
|
|
|
- } else {
|
|
|
+ if (!get_isa16_mode(regs->cp0_epc)) {
|
|
|
if (unlikely(get_user(opcode, epc) < 0))
|
|
|
status = SIGSEGV;
|
|
|
|
|
|
if (!cpu_has_llsc && status < 0)
|
|
|
status = simulate_llsc(regs, opcode);
|
|
|
-
|
|
|
- if (status < 0)
|
|
|
- status = simulate_rdhwr_normal(regs, opcode);
|
|
|
}
|
|
|
|
|
|
if (status < 0)
|