---

yaml --- r: 88786 b: refs/heads/master c: 4f3ab19 h: refs/heads/master v: v3
git-mirror · Apr 17, 2008 · f26d6c6 · f26d6c6
1 parent e30d87c
commit f26d6c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82389871b89467b4478e02d13be2f776e0138b5b
+refs/heads/master: 4f3ab1959a63a2686524f17665d799fac28eb271
diff --git a/trunk/arch/x86/kernel/smpboot_64.c b/trunk/arch/x86/kernel/smpboot_64.c
@@ -97,7 +97,6 @@ static void __cpuinit smp_store_cpu_info(int id)
 	*c = boot_cpu_data;
 	c->cpu_index = id;
 	identify_cpu(c);
-	print_cpu_info(c);
 }
 
 static inline void wait_for_init_deassert(atomic_t *deassert)
@@ -568,6 +567,8 @@ static int __cpuinit do_boot_cpu(int cpu, int apicid)
 		if (cpu_isset(cpu, cpu_callin_map)) {
 			/* number CPUs logically, starting from 1 (BSP is 0) */
 			Dprintk("CPU has booted.\n");
+			printk(KERN_INFO "CPU%d: ", cpu);
+			print_cpu_info(&cpu_data(cpu));
 		} else {
 			boot_error = 1;
 			if (*((volatile unsigned char *)phys_to_virt(SMP_TRAMPOLINE_BASE))
@@ -751,6 +752,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
 	 */
 
 	setup_boot_clock();
+	printk(KERN_INFO "CPU%d: ", 0);
+	print_cpu_info(&cpu_data(0));
 }
 
 /*