]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86: fix printout ugliness in cpu info printk
authorMarcin Slusarz <marcin.slusarz@gmail.com>
Fri, 1 Feb 2008 20:31:51 +0000 (21:31 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 19 Feb 2008 15:18:33 +0000 (16:18 +0100)
fix print_cpu_info, because it produced on boot:

  CPU: <6>AMD Athlon(tm) 64 Processor 3200+ stepping 00

instead of:

  CPU: AMD Athlon(tm) 64 Processor 3200+ stepping 00

(broken since 04e1ba852132c9ad006affcd5b8c8606295170b0 -
 x86: cleanup kernel/setup_64.c)

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/setup_64.c

index e1866172deb2239625944ba70d7aa114164b0673..6fd804f0782145be3b45c223590c5c287a9bdb57 100644 (file)
@@ -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);