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/m68knommu/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/m68knommu/kernel/traps.c')
-rw-r--r-- | arch/m68knommu/kernel/traps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68knommu/kernel/traps.c b/arch/m68knommu/kernel/traps.c index 51d325343ab5..3739c8f657d7 100644 --- a/arch/m68knommu/kernel/traps.c +++ b/arch/m68knommu/kernel/traps.c | |||
@@ -111,7 +111,7 @@ static void print_this_address(unsigned long addr, int i) | |||
111 | if (i % 5) | 111 | if (i % 5) |
112 | printk(KERN_CONT " [%08lx] ", addr); | 112 | printk(KERN_CONT " [%08lx] ", addr); |
113 | else | 113 | else |
114 | printk(KERN_CONT "\n" KERN_EMERG " [%08lx] ", addr); | 114 | printk(KERN_EMERG " [%08lx] ", addr); |
115 | i++; | 115 | i++; |
116 | #endif | 116 | #endif |
117 | } | 117 | } |
@@ -137,8 +137,8 @@ static void __show_stack(struct task_struct *task, unsigned long *stack) | |||
137 | if (stack + 1 + i > endstack) | 137 | if (stack + 1 + i > endstack) |
138 | break; | 138 | break; |
139 | if (i % 8 == 0) | 139 | if (i % 8 == 0) |
140 | printk("\n" KERN_EMERG " "); | 140 | printk(KERN_EMERG " "); |
141 | printk(" %08lx", *(stack + i)); | 141 | printk(KERN_CONT " %08lx", *(stack + i)); |
142 | } | 142 | } |
143 | printk("\n"); | 143 | printk("\n"); |
144 | i = 0; | 144 | i = 0; |