aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <markos.chandras@imgtec.com>2013-12-04 11:20:08 -0500
committerRalf Baechle <ralf@linux-mips.org>2014-03-26 18:09:13 -0400
commitb08a9c95f80f2f760f62d70fcd5a869c425d17b6 (patch)
tree44ff9e007c905af52ad5e1eb8691f843f3eed0ee
parent86bdb2779d67773edcfddfca4d6a4ae055e21964 (diff)
MIPS: kernel: traps: Whitespace clean up
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
-rw-r--r--arch/mips/kernel/traps.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index ee1f2fc584ea..1a76d114e84b 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -10,6 +10,7 @@
10 * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com 10 * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com
11 * Copyright (C) 2002, 2003, 2004, 2005, 2007 Maciej W. Rozycki 11 * Copyright (C) 2002, 2003, 2004, 2005, 2007 Maciej W. Rozycki
12 * Copyright (C) 2000, 2001, 2012 MIPS Technologies, Inc. All rights reserved. 12 * Copyright (C) 2000, 2001, 2012 MIPS Technologies, Inc. All rights reserved.
13 * Copyright (C) 2014, Imagination Technologies Ltd.
13 */ 14 */
14#include <linux/bug.h> 15#include <linux/bug.h>
15#include <linux/compiler.h> 16#include <linux/compiler.h>
@@ -873,17 +874,19 @@ asmlinkage void do_bp(struct pt_regs *regs)
873 if ((__get_user(instr[0], (u16 __user *)msk_isa16_mode(epc)) || 874 if ((__get_user(instr[0], (u16 __user *)msk_isa16_mode(epc)) ||
874 (__get_user(instr[1], (u16 __user *)msk_isa16_mode(epc + 2))))) 875 (__get_user(instr[1], (u16 __user *)msk_isa16_mode(epc + 2)))))
875 goto out_sigsegv; 876 goto out_sigsegv;
876 opcode = (instr[0] << 16) | instr[1]; 877 opcode = (instr[0] << 16) | instr[1];
877 } else { 878 } else {
878 /* MIPS16e mode */ 879 /* MIPS16e mode */
879 if (__get_user(instr[0], (u16 __user *)msk_isa16_mode(epc))) 880 if (__get_user(instr[0],
881 (u16 __user *)msk_isa16_mode(epc)))
880 goto out_sigsegv; 882 goto out_sigsegv;
881 bcode = (instr[0] >> 6) & 0x3f; 883 bcode = (instr[0] >> 6) & 0x3f;
882 do_trap_or_bp(regs, bcode, "Break"); 884 do_trap_or_bp(regs, bcode, "Break");
883 goto out; 885 goto out;
884 } 886 }
885 } else { 887 } else {
886 if (__get_user(opcode, (unsigned int __user *) exception_epc(regs))) 888 if (__get_user(opcode,
889 (unsigned int __user *) exception_epc(regs)))
887 goto out_sigsegv; 890 goto out_sigsegv;
888 } 891 }
889 892