summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@novell.com>2011-02-17 15:56:58 (GMT)
committerIngo Molnar <mingo@elte.hu>2011-02-18 07:52:30 (GMT)
commitfd8fa4d3ddc4cc04ec8097e632b995d535c52beb (patch)
tree731dddf8e6379b428841c10c58d3add9c47d581a /arch
parentbb3e6251a69e67d7620373ee18e35b404964273e (diff)
downloadlinux-fd8fa4d3ddc4cc04ec8097e632b995d535c52beb.tar.xz
x86: Combine printk()s in show_regs_common()
Printing a single character alone when there's an immediately following printk() is pretty pointless (and wasteful). Signed-off-by: Jan Beulich <jbeulich@novell.com> LKML-Reference: <4D5D535A0200007800032730@vpn.id2.novell.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/process.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index ff45541..99fa3ad 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -110,12 +110,9 @@ void show_regs_common(void)
init_utsname()->release,
(int)strcspn(init_utsname()->version, " "),
init_utsname()->version);
- printk(KERN_CONT " ");
- printk(KERN_CONT "%s %s", vendor, product);
- if (board) {
- printk(KERN_CONT "/");
- printk(KERN_CONT "%s", board);
- }
+ printk(KERN_CONT " %s %s", vendor, product);
+ if (board)
+ printk(KERN_CONT "/%s", board);
printk(KERN_CONT "\n");
}