diff options
author | Joe Perches <joe@perches.com> | 2012-12-12 13:18:51 -0500 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2013-07-19 16:53:03 -0400 |
commit | 29b7a47a9df2534ed62c4783dcf76153ceb76a73 (patch) | |
tree | 1bb4887df77aebeb705dd9fa0ea4fb44ada52129 | |
parent | b8a33fc7258f9e6e42b15571d0284b7c0ef0d0a9 (diff) |
alpha: Convert print_symbol to %pSR
Use the new vsprintf extension to avoid any possible
message interleaving.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Joe Perches <joe@perches.com>
-rw-r--r-- | arch/alpha/kernel/traps.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index be1fba334bd0..bd0665cdc840 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c | |||
@@ -66,8 +66,8 @@ dik_show_regs(struct pt_regs *regs, unsigned long *r9_15) | |||
66 | { | 66 | { |
67 | printk("pc = [<%016lx>] ra = [<%016lx>] ps = %04lx %s\n", | 67 | printk("pc = [<%016lx>] ra = [<%016lx>] ps = %04lx %s\n", |
68 | regs->pc, regs->r26, regs->ps, print_tainted()); | 68 | regs->pc, regs->r26, regs->ps, print_tainted()); |
69 | print_symbol("pc is at %s\n", regs->pc); | 69 | printk("pc is at %pSR\n", (void *)regs->pc); |
70 | print_symbol("ra is at %s\n", regs->r26 ); | 70 | printk("ra is at %pSR\n", (void *)regs->r26); |
71 | printk("v0 = %016lx t0 = %016lx t1 = %016lx\n", | 71 | printk("v0 = %016lx t0 = %016lx t1 = %016lx\n", |
72 | regs->r0, regs->r1, regs->r2); | 72 | regs->r0, regs->r1, regs->r2); |
73 | printk("t2 = %016lx t3 = %016lx t4 = %016lx\n", | 73 | printk("t2 = %016lx t3 = %016lx t4 = %016lx\n", |
@@ -132,9 +132,7 @@ dik_show_trace(unsigned long *sp) | |||
132 | continue; | 132 | continue; |
133 | if (tmp >= (unsigned long) &_etext) | 133 | if (tmp >= (unsigned long) &_etext) |
134 | continue; | 134 | continue; |
135 | printk("[<%lx>]", tmp); | 135 | printk("[<%lx>] %pSR\n", tmp, (void *)tmp); |
136 | print_symbol(" %s", tmp); | ||
137 | printk("\n"); | ||
138 | if (i > 40) { | 136 | if (i > 40) { |
139 | printk(" ..."); | 137 | printk(" ..."); |
140 | break; | 138 | break; |