lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MIPS: traps: Reformat notify_die invocations to 80 columns.

Browse Source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle
2013-10-09 08:54:15 +02:00
parent 83e4da1ed4
commit dc73e4c1b6
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
arch/mips/kernel/traps.c
View File

@@ -371,7 +371,8 @@ void __noreturn die(const char *str, struct pt_regs *regs)
oops_enter(); oops_enter();
if (notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV) == NOTIFY_STOP) if (notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs),
SIGSEGV) == NOTIFY_STOP)
sig = 0; sig = 0;
console_verbose(); console_verbose();
@@ -462,8 +463,8 @@ asmlinkage void do_be(struct pt_regs *regs)
printk(KERN_ALERT "%s bus error, epc == %0*lx, ra == %0*lx\n", printk(KERN_ALERT "%s bus error, epc == %0*lx, ra == %0*lx\n",
data ? "Data" : "Instruction", data ? "Data" : "Instruction",
field, regs->cp0_epc, field, regs->regs[31]); field, regs->cp0_epc, field, regs->regs[31]);
if (notify_die(DIE_OOPS, "bus error", regs, 0, regs_to_trapnr(regs), SIGBUS) if (notify_die(DIE_OOPS, "bus error", regs, 0, regs_to_trapnr(regs),
== NOTIFY_STOP) SIGBUS) == NOTIFY_STOP)
goto out; goto out;
die_if_kernel("Oops", regs); die_if_kernel("Oops", regs);
@@ -732,8 +733,8 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
siginfo_t info = {0}; siginfo_t info = {0};
prev_state = exception_enter(); prev_state = exception_enter();
if (notify_die(DIE_FP, "FP exception", regs, 0, regs_to_trapnr(regs), SIGFPE) if (notify_die(DIE_FP, "FP exception", regs, 0, regs_to_trapnr(regs),
== NOTIFY_STOP) SIGFPE) == NOTIFY_STOP)
goto out; goto out;
die_if_kernel("FP exception in kernel code", regs); die_if_kernel("FP exception in kernel code", regs);
@@ -803,7 +804,8 @@ static void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
return; return;
#endif /* CONFIG_KGDB_LOW_LEVEL_TRAP */ #endif /* CONFIG_KGDB_LOW_LEVEL_TRAP */
if (notify_die(DIE_TRAP, str, regs, code, regs_to_trapnr(regs), SIGTRAP) == NOTIFY_STOP) if (notify_die(DIE_TRAP, str, regs, code, regs_to_trapnr(regs),
SIGTRAP) == NOTIFY_STOP)
return; return;
/* /*
@@ -897,12 +899,14 @@ asmlinkage void do_bp(struct pt_regs *regs)
*/ */
switch (bcode) { switch (bcode) {
case BRK_KPROBE_BP: case BRK_KPROBE_BP:
if (notify_die(DIE_BREAK, "debug", regs, bcode, regs_to_trapnr(regs), SIGTRAP) == NOTIFY_STOP) if (notify_die(DIE_BREAK, "debug", regs, bcode,
regs_to_trapnr(regs), SIGTRAP) == NOTIFY_STOP)
goto out; goto out;
else else
break; break;
case BRK_KPROBE_SSTEPBP: case BRK_KPROBE_SSTEPBP:
if (notify_die(DIE_SSTEPBP, "single_step", regs, bcode, regs_to_trapnr(regs), SIGTRAP) == NOTIFY_STOP) if (notify_die(DIE_SSTEPBP, "single_step", regs, bcode,
regs_to_trapnr(regs), SIGTRAP) == NOTIFY_STOP)
goto out; goto out;
else else
break; break;
@@ -966,8 +970,8 @@ asmlinkage void do_ri(struct pt_regs *regs)
int status = -1; int status = -1;
prev_state = exception_enter(); prev_state = exception_enter();
if (notify_die(DIE_RI, "RI Fault", regs, 0, regs_to_trapnr(regs), SIGILL) if (notify_die(DIE_RI, "RI Fault", regs, 0, regs_to_trapnr(regs),
== NOTIFY_STOP) SIGILL) == NOTIFY_STOP)
goto out; goto out;
die_if_kernel("Reserved instruction in kernel code", regs); die_if_kernel("Reserved instruction in kernel code", regs);