Skip to content

Commit

Permalink
x86: decouple call to print_cpu_info from smp_store_cpu_info
Browse files Browse the repository at this point in the history
This will ease integration with i386

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Glauber de Oliveira Costa authored and Ingo Molnar committed Apr 17, 2008
1 parent 8238987 commit 4f3ab19
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion arch/x86/kernel/smpboot_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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));
}

/*
Expand Down

0 comments on commit 4f3ab19

Please sign in to comment.