Commit 8c6184f6 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] m68k: M68k call trace output

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Improve formatting of call trace output (from Matthias Urlichs)
parent eeaf3b6b
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/kallsyms.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/fpu.h> #include <asm/fpu.h>
...@@ -825,9 +826,12 @@ void show_trace(unsigned long *stack) ...@@ -825,9 +826,12 @@ void show_trace(unsigned long *stack)
* out the call path that was taken. * out the call path that was taken.
*/ */
if (kernel_text_address(addr)) { if (kernel_text_address(addr)) {
if (i % 4 == 0) #ifndef CONFIG_KALLSYMS
if (i % 5 == 0)
printk("\n "); printk("\n ");
#endif
printk(" [<%08lx>]", addr); printk(" [<%08lx>]", addr);
print_symbol(" %s\n", addr);
i++; i++;
} }
} }
...@@ -1098,8 +1102,10 @@ void die_if_kernel (char *str, struct pt_regs *fp, int nr) ...@@ -1098,8 +1102,10 @@ void die_if_kernel (char *str, struct pt_regs *fp, int nr)
console_verbose(); console_verbose();
printk("%s: %08x\n",str,nr); printk("%s: %08x\n",str,nr);
printk("PC: [<%08lx>]\nSR: %04x SP: %p a2: %08lx\n", printk("PC: [<%08lx>]",fp->pc);
fp->pc, fp->sr, fp, fp->a2); print_symbol(" %s\n", fp->pc);
printk("\nSR: %04x SP: %p a2: %08lx\n",
fp->sr, fp, fp->a2);
printk("d0: %08lx d1: %08lx d2: %08lx d3: %08lx\n", printk("d0: %08lx d1: %08lx d2: %08lx d3: %08lx\n",
fp->d0, fp->d1, fp->d2, fp->d3); fp->d0, fp->d1, fp->d2, fp->d3);
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment