diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-10-13 15:58:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 13:23:26 -0400 |
commit | 8fbbae657305f83ed009143c4c7a8737d75621b2 (patch) | |
tree | e8dd6ccc03b5360f15406af697fae7b615bcf69a /arch/m68k/kernel/traps.c | |
parent | 5b1d5f953bbb50dcbdf93719cb622aa128ba7527 (diff) |
m68k: Use new printk() extension %pS to print symbols
This changes the oops and backtrace code to use the new `%pS' printk()
extension to print out symbols rather than manually calling print_symbol.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k/kernel/traps.c')
-rw-r--r-- | arch/m68k/kernel/traps.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index 75b8340b254b..6d813de2baf1 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c | |||
@@ -883,8 +883,7 @@ void show_trace(unsigned long *stack) | |||
883 | if (i % 5 == 0) | 883 | if (i % 5 == 0) |
884 | printk("\n "); | 884 | printk("\n "); |
885 | #endif | 885 | #endif |
886 | printk(" [<%08lx>]", addr); | 886 | printk(" [<%08lx>] %pS\n", addr, (void *)addr); |
887 | print_symbol(" %s\n", addr); | ||
888 | i++; | 887 | i++; |
889 | } | 888 | } |
890 | } | 889 | } |
@@ -900,10 +899,8 @@ void show_registers(struct pt_regs *regs) | |||
900 | int i; | 899 | int i; |
901 | 900 | ||
902 | print_modules(); | 901 | print_modules(); |
903 | printk("PC: [<%08lx>]",regs->pc); | 902 | printk("PC: [<%08lx>] %pS\n", regs->pc, (void *)regs->pc); |
904 | print_symbol(" %s", regs->pc); | 903 | printk("SR: %04x SP: %p a2: %08lx\n", regs->sr, regs, regs->a2); |
905 | printk("\nSR: %04x SP: %p a2: %08lx\n", | ||
906 | regs->sr, regs, regs->a2); | ||
907 | printk("d0: %08lx d1: %08lx d2: %08lx d3: %08lx\n", | 904 | printk("d0: %08lx d1: %08lx d2: %08lx d3: %08lx\n", |
908 | regs->d0, regs->d1, regs->d2, regs->d3); | 905 | regs->d0, regs->d1, regs->d2, regs->d3); |
909 | printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", | 906 | printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", |