diff options
author | Joe Perches <joe@perches.com> | 2009-07-06 16:05:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 13:30:03 -0400 |
commit | ad361c9884e809340f6daca80d56a9e9c871690a (patch) | |
tree | 7ec02c9934964fecdc791a0df0fc722d3bda5c53 /arch/xtensa/kernel/traps.c | |
parent | e3288775ff63900fbb7db505f2b9a1bee98f07df (diff) |
Remove multiple KERN_ prefixes from printk formats
Commit 5fd29d6ccbc98884569d6f3105aeca70858b3e0f ("printk: clean up
handling of log-levels and newlines") changed printk semantics. printk
lines with multiple KERN_<level> prefixes are no longer emitted as
before the patch.
<level> is now included in the output on each additional use.
Remove all uses of multiple KERN_<level>s in formats.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/xtensa/kernel/traps.c')
-rw-r--r-- | arch/xtensa/kernel/traps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c index ba9ab9349782..e64efac3b9db 100644 --- a/arch/xtensa/kernel/traps.c +++ b/arch/xtensa/kernel/traps.c | |||
@@ -354,10 +354,10 @@ void show_regs(struct pt_regs * regs) | |||
354 | 354 | ||
355 | for (i = 0; i < 16; i++) { | 355 | for (i = 0; i < 16; i++) { |
356 | if ((i % 8) == 0) | 356 | if ((i % 8) == 0) |
357 | printk ("\n" KERN_INFO "a%02d: ", i); | 357 | printk(KERN_INFO "a%02d:", i); |
358 | printk("%08lx ", regs->areg[i]); | 358 | printk(KERN_CONT " %08lx", regs->areg[i]); |
359 | } | 359 | } |
360 | printk("\n"); | 360 | printk(KERN_CONT "\n"); |
361 | 361 | ||
362 | printk("pc: %08lx, ps: %08lx, depc: %08lx, excvaddr: %08lx\n", | 362 | printk("pc: %08lx, ps: %08lx, depc: %08lx, excvaddr: %08lx\n", |
363 | regs->pc, regs->ps, regs->depc, regs->excvaddr); | 363 | regs->pc, regs->ps, regs->depc, regs->excvaddr); |