From 5fd842e49e90ccc27980a4c0f058d2bae23198c6 Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Fri, 1 Feb 2008 21:31:51 +0100 Subject: [PATCH] --- yaml --- r: 85989 b: refs/heads/master c: d8ff0bbf564f7ebf6c33ef6662d8f00c7d43ba80 h: refs/heads/master i: 85987: 942fda14926b9cbbf43822a9de387bfeec1b33cf v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/setup_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 058d8ce64c62..f29d93b9d9e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d76c1ae4d1f4f322d47e7c6e47a277384ba9d9cb +refs/heads/master: d8ff0bbf564f7ebf6c33ef6662d8f00c7d43ba80 diff --git a/trunk/arch/x86/kernel/setup_64.c b/trunk/arch/x86/kernel/setup_64.c index e1866172deb2..6fd804f07821 100644 --- a/trunk/arch/x86/kernel/setup_64.c +++ b/trunk/arch/x86/kernel/setup_64.c @@ -1046,7 +1046,7 @@ __setup("noclflush", setup_noclflush); void __cpuinit print_cpu_info(struct cpuinfo_x86 *c) { if (c->x86_model_id[0]) - printk(KERN_INFO "%s", c->x86_model_id); + printk(KERN_CONT "%s", c->x86_model_id); if (c->x86_mask || c->cpuid_level >= 0) printk(KERN_CONT " stepping %02x\n", c->x86_mask);