summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2006-03-23 11:59:38 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-23 16:38:04 +0100
commitcc04ee9cc527e314e6906849ee931c33764f861e (patch)
tree525858d30d3160a19a820c8286868330e6edc445 /arch
parent[PATCH] i386: remove duplicate declaration of mp_bus_id_to_pci_bus (diff)
downloadlinux-cc04ee9cc527e314e6906849ee931c33764f861e.tar.xz
linux-cc04ee9cc527e314e6906849ee931c33764f861e.zip
[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>
Diffstat (limited to 'arch')
-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,
stack = (unsigned long*)context->previous_esp;
if (!stack)
break;
- printk(log_lvl);
- printk(" =======================\n");
+ printk("%s =======================\n", log_lvl);
}
}
@@ -218,14 +217,12 @@ static void show_stack_log_lvl(struct task_struct *task, unsigned long *esp,
break;
if (i && ((i % 8) == 0)) {
printk("\n");
- printk(log_lvl);
- printk(" ");
+ printk("%s ", log_lvl);
}
printk("%08lx ", *stack++);
}
printk("\n");
- printk(log_lvl);
- printk("Call Trace:\n");
+ printk("%sCall Trace:\n", log_lvl);
show_trace_log_lvl(task, esp, log_lvl);
}