|
@@ -10,6 +10,7 @@
|
|
|
* Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com
|
|
|
* Copyright (C) 2002, 2003, 2004, 2005, 2007 Maciej W. Rozycki
|
|
|
* Copyright (C) 2000, 2001, 2012 MIPS Technologies, Inc. All rights reserved.
|
|
|
+ * Copyright (C) 2014, Imagination Technologies Ltd.
|
|
|
*/
|
|
|
#include <linux/bug.h>
|
|
|
#include <linux/compiler.h>
|
|
@@ -873,17 +874,19 @@ asmlinkage void do_bp(struct pt_regs *regs)
|
|
|
if ((__get_user(instr[0], (u16 __user *)msk_isa16_mode(epc)) ||
|
|
|
(__get_user(instr[1], (u16 __user *)msk_isa16_mode(epc + 2)))))
|
|
|
goto out_sigsegv;
|
|
|
- opcode = (instr[0] << 16) | instr[1];
|
|
|
+ opcode = (instr[0] << 16) | instr[1];
|
|
|
} else {
|
|
|
- /* MIPS16e mode */
|
|
|
- if (__get_user(instr[0], (u16 __user *)msk_isa16_mode(epc)))
|
|
|
+ /* MIPS16e mode */
|
|
|
+ if (__get_user(instr[0],
|
|
|
+ (u16 __user *)msk_isa16_mode(epc)))
|
|
|
goto out_sigsegv;
|
|
|
- bcode = (instr[0] >> 6) & 0x3f;
|
|
|
- do_trap_or_bp(regs, bcode, "Break");
|
|
|
- goto out;
|
|
|
+ bcode = (instr[0] >> 6) & 0x3f;
|
|
|
+ do_trap_or_bp(regs, bcode, "Break");
|
|
|
+ goto out;
|
|
|
}
|
|
|
} else {
|
|
|
- if (__get_user(opcode, (unsigned int __user *) exception_epc(regs)))
|
|
|
+ if (__get_user(opcode,
|
|
|
+ (unsigned int __user *) exception_epc(regs)))
|
|
|
goto out_sigsegv;
|
|
|
}
|
|
|
|