aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-10-09 02:54:15 -0400
committerRalf Baechle <ralf@linux-mips.org>2013-10-29 16:25:37 -0400
commitdc73e4c1b6df2795830a398192aaba7fb3c5cbb7 (patch)
treeb55c3323928556cdf1d650fb41811f597791d85c /arch/mips
parent83e4da1ed45441c3aadc39ac47d33895ab23c841 (diff)
MIPS: traps: Reformat notify_die invocations to 80 columns.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/kernel/traps.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index a17b6efb8bfe..f9c8746be8d6 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -371,7 +371,8 @@ void __noreturn die(const char *str, struct pt_regs *regs)
371 371
372 oops_enter(); 372 oops_enter();
373 373
374 if (notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV) == NOTIFY_STOP) 374 if (notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs),
375 SIGSEGV) == NOTIFY_STOP)
375 sig = 0; 376 sig = 0;
376 377
377 console_verbose(); 378 console_verbose();
@@ -462,8 +463,8 @@ asmlinkage void do_be(struct pt_regs *regs)
462 printk(KERN_ALERT "%s bus error, epc == %0*lx, ra == %0*lx\n", 463 printk(KERN_ALERT "%s bus error, epc == %0*lx, ra == %0*lx\n",
463 data ? "Data" : "Instruction", 464 data ? "Data" : "Instruction",
464 field, regs->cp0_epc, field, regs->regs[31]); 465 field, regs->cp0_epc, field, regs->regs[31]);
465 if (notify_die(DIE_OOPS, "bus error", regs, 0, regs_to_trapnr(regs), SIGBUS) 466 if (notify_die(DIE_OOPS, "bus error", regs, 0, regs_to_trapnr(regs),
466 == NOTIFY_STOP) 467 SIGBUS) == NOTIFY_STOP)
467 goto out; 468 goto out;
468 469
469 die_if_kernel("Oops", regs); 470 die_if_kernel("Oops", regs);
@@ -732,8 +733,8 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
732 siginfo_t info = {0}; 733 siginfo_t info = {0};
733 734
734 prev_state = exception_enter(); 735 prev_state = exception_enter();
735 if (notify_die(DIE_FP, "FP exception", regs, 0, regs_to_trapnr(regs), SIGFPE) 736 if (notify_die(DIE_FP, "FP exception", regs, 0, regs_to_trapnr(regs),
736 == NOTIFY_STOP) 737 SIGFPE) == NOTIFY_STOP)
737 goto out; 738 goto out;
738 die_if_kernel("FP exception in kernel code", regs); 739 die_if_kernel("FP exception in kernel code", regs);
739 740
@@ -803,7 +804,8 @@ static void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
803 return; 804 return;
804#endif /* CONFIG_KGDB_LOW_LEVEL_TRAP */ 805#endif /* CONFIG_KGDB_LOW_LEVEL_TRAP */
805 806
806 if (notify_die(DIE_TRAP, str, regs, code, regs_to_trapnr(regs), SIGTRAP) == NOTIFY_STOP) 807 if (notify_die(DIE_TRAP, str, regs, code, regs_to_trapnr(regs),
808 SIGTRAP) == NOTIFY_STOP)
807 return; 809 return;
808 810
809 /* 811 /*
@@ -897,12 +899,14 @@ asmlinkage void do_bp(struct pt_regs *regs)
897 */ 899 */
898 switch (bcode) { 900 switch (bcode) {
899 case BRK_KPROBE_BP: 901 case BRK_KPROBE_BP:
900 if (notify_die(DIE_BREAK, "debug", regs, bcode, regs_to_trapnr(regs), SIGTRAP) == NOTIFY_STOP) 902 if (notify_die(DIE_BREAK, "debug", regs, bcode,
903 regs_to_trapnr(regs), SIGTRAP) == NOTIFY_STOP)
901 goto out; 904 goto out;
902 else 905 else
903 break; 906 break;
904 case BRK_KPROBE_SSTEPBP: 907 case BRK_KPROBE_SSTEPBP:
905 if (notify_die(DIE_SSTEPBP, "single_step", regs, bcode, regs_to_trapnr(regs), SIGTRAP) == NOTIFY_STOP) 908 if (notify_die(DIE_SSTEPBP, "single_step", regs, bcode,
909 regs_to_trapnr(regs), SIGTRAP) == NOTIFY_STOP)
906 goto out; 910 goto out;
907 else 911 else
908 break; 912 break;
@@ -966,8 +970,8 @@ asmlinkage void do_ri(struct pt_regs *regs)
966 int status = -1; 970 int status = -1;
967 971
968 prev_state = exception_enter(); 972 prev_state = exception_enter();
969 if (notify_die(DIE_RI, "RI Fault", regs, 0, regs_to_trapnr(regs), SIGILL) 973 if (notify_die(DIE_RI, "RI Fault", regs, 0, regs_to_trapnr(regs),
970 == NOTIFY_STOP) 974 SIGILL) == NOTIFY_STOP)
971 goto out; 975 goto out;
972 976
973 die_if_kernel("Reserved instruction in kernel code", regs); 977 die_if_kernel("Reserved instruction in kernel code", regs);