[PARISC] dump stack backtrace on BUG() and add syslog-levels to printk()s

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
This commit is contained in:
Helge Deller 2006-12-21 21:02:00 +01:00 committed by Kyle McMartin
parent ca72a22327
commit bd83bcffb2

View File

@ -163,13 +163,13 @@ static void do_show_stack(struct unwind_frame_info *info)
{ {
int i = 1; int i = 1;
printk("Backtrace:\n"); printk(KERN_CRIT "Backtrace:\n");
while (i <= 16) { while (i <= 16) {
if (unwind_once(info) < 0 || info->ip == 0) if (unwind_once(info) < 0 || info->ip == 0)
break; break;
if (__kernel_text_address(info->ip)) { if (__kernel_text_address(info->ip)) {
printk(" [<" RFMT ">] ", info->ip); printk("%s [<" RFMT ">] ", (i&0x3)==1 ? KERN_CRIT : "", info->ip);
#ifdef CONFIG_KALLSYMS #ifdef CONFIG_KALLSYMS
print_symbol("%s\n", info->ip); print_symbol("%s\n", info->ip);
#else #else
@ -232,14 +232,14 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err)
/* Amuse the user in a SPARC fashion */ /* Amuse the user in a SPARC fashion */
if (err) printk( if (err) printk(
" _______________________________ \n" KERN_CRIT " _______________________________ \n"
" < Your System ate a SPARC! Gah! >\n" KERN_CRIT " < Your System ate a SPARC! Gah! >\n"
" ------------------------------- \n" KERN_CRIT " ------------------------------- \n"
" \\ ^__^\n" KERN_CRIT " \\ ^__^\n"
" \\ (xx)\\_______\n" KERN_CRIT " \\ (xx)\\_______\n"
" (__)\\ )\\/\\\n" KERN_CRIT " (__)\\ )\\/\\\n"
" U ||----w |\n" KERN_CRIT " U ||----w |\n"
" || ||\n"); KERN_CRIT " || ||\n");
/* unlock the pdc lock if necessary */ /* unlock the pdc lock if necessary */
pdc_emergency_unlock(); pdc_emergency_unlock();
@ -254,6 +254,8 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err)
if (err) if (err)
printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n", printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n",
current->comm, current->pid, str, err); current->comm, current->pid, str, err);
dump_stack();
show_regs(regs); show_regs(regs);
if (in_interrupt()) if (in_interrupt())