Commit 4370ee4d authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar

x86: call do_boot_cpu directly from native_cpu_up

We don't need __smp_prepare_cpu anymore.
Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6becedbb
...@@ -702,20 +702,6 @@ void cpu_exit_clear(void) ...@@ -702,20 +702,6 @@ void cpu_exit_clear(void)
} }
#endif #endif
static void __cpuinit __smp_prepare_cpu(int cpu)
{
int apicid;
apicid = per_cpu(x86_cpu_to_apicid, cpu);
/* init low mem mapping */
clone_pgd_range(swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,
min_t(unsigned long, KERNEL_PGD_PTRS, USER_PGD_PTRS));
flush_tlb_all();
do_boot_cpu(apicid, cpu);
}
static int boot_cpu_logical_apicid; static int boot_cpu_logical_apicid;
/* Where the IO area was mapped on multiquad, always 0 otherwise */ /* Where the IO area was mapped on multiquad, always 0 otherwise */
void *xquad_portio; void *xquad_portio;
...@@ -872,7 +858,12 @@ int __cpuinit native_cpu_up(unsigned int cpu) ...@@ -872,7 +858,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
per_cpu(cpu_state, cpu) = CPU_UP_PREPARE; per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
__smp_prepare_cpu(cpu); /* init low mem mapping */
clone_pgd_range(swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,
min_t(unsigned long, KERNEL_PGD_PTRS, USER_PGD_PTRS));
flush_tlb_all();
do_boot_cpu(apicid, cpu);
/* In case one didn't come up */ /* In case one didn't come up */
if (!cpu_isset(cpu, cpu_callin_map)) { if (!cpu_isset(cpu, cpu_callin_map)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment