diff options
Diffstat (limited to 'arch/parisc/kernel/traps.c')
| -rw-r--r-- | arch/parisc/kernel/traps.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index c32f5d6d778e..528f0ff9b273 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c | |||
| @@ -250,15 +250,14 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err) | |||
| 250 | oops_enter(); | 250 | oops_enter(); |
| 251 | 251 | ||
| 252 | /* Amuse the user in a SPARC fashion */ | 252 | /* Amuse the user in a SPARC fashion */ |
| 253 | if (err) printk( | 253 | if (err) printk(KERN_CRIT |
| 254 | KERN_CRIT " _______________________________ \n" | 254 | " _______________________________ \n" |
| 255 | KERN_CRIT " < Your System ate a SPARC! Gah! >\n" | 255 | " < Your System ate a SPARC! Gah! >\n" |
| 256 | KERN_CRIT " ------------------------------- \n" | 256 | " ------------------------------- \n" |
| 257 | KERN_CRIT " \\ ^__^\n" | 257 | " \\ ^__^\n" |
| 258 | KERN_CRIT " \\ (xx)\\_______\n" | 258 | " (__)\\ )\\/\\\n" |
| 259 | KERN_CRIT " (__)\\ )\\/\\\n" | 259 | " U ||----w |\n" |
| 260 | KERN_CRIT " U ||----w |\n" | 260 | " || ||\n"); |
| 261 | KERN_CRIT " || ||\n"); | ||
| 262 | 261 | ||
| 263 | /* unlock the pdc lock if necessary */ | 262 | /* unlock the pdc lock if necessary */ |
| 264 | pdc_emergency_unlock(); | 263 | pdc_emergency_unlock(); |
| @@ -797,7 +796,8 @@ void notrace handle_interruption(int code, struct pt_regs *regs) | |||
| 797 | else | 796 | else |
| 798 | printk(KERN_DEBUG "User Fault (long pointer) (fault %d) ", | 797 | printk(KERN_DEBUG "User Fault (long pointer) (fault %d) ", |
| 799 | code); | 798 | code); |
| 800 | printk("pid=%d command='%s'\n", task_pid_nr(current), current->comm); | 799 | printk(KERN_CONT "pid=%d command='%s'\n", |
| 800 | task_pid_nr(current), current->comm); | ||
| 801 | show_regs(regs); | 801 | show_regs(regs); |
| 802 | #endif | 802 | #endif |
| 803 | si.si_signo = SIGSEGV; | 803 | si.si_signo = SIGSEGV; |