aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2006-03-23 05:59:38 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-23 10:38:04 -0500
commitcc04ee9cc527e314e6906849ee931c33764f861e (patch)
tree525858d30d3160a19a820c8286868330e6edc445
parent7c63ee5cf7d210b51c2a8243e29988edec2646ed (diff)
[PATCH] i386 traps: merge printk calls
Merge a few printk calls in i386 traps. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/i386/kernel/traps.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index ee61988f61b5..f20797b8da1d 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -188,8 +188,7 @@ static void show_trace_log_lvl(struct task_struct *task,
188 stack = (unsigned long*)context->previous_esp; 188 stack = (unsigned long*)context->previous_esp;
189 if (!stack) 189 if (!stack)
190 break; 190 break;
191 printk(log_lvl); 191 printk("%s =======================\n", log_lvl);
192 printk(" =======================\n");
193 } 192 }
194} 193}
195 194
@@ -218,14 +217,12 @@ static void show_stack_log_lvl(struct task_struct *task, unsigned long *esp,
218 break; 217 break;
219 if (i && ((i % 8) == 0)) { 218 if (i && ((i % 8) == 0)) {
220 printk("\n"); 219 printk("\n");
221 printk(log_lvl); 220 printk("%s ", log_lvl);
222 printk(" ");
223 } 221 }
224 printk("%08lx ", *stack++); 222 printk("%08lx ", *stack++);
225 } 223 }
226 printk("\n"); 224 printk("\n");
227 printk(log_lvl); 225 printk("%sCall Trace:\n", log_lvl);
228 printk("Call Trace:\n");
229 show_trace_log_lvl(task, esp, log_lvl); 226 show_trace_log_lvl(task, esp, log_lvl);
230} 227}
231 228