mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
x86: call do_boot_cpu directly from native_cpu_up
We don't need __smp_prepare_cpu anymore. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
6becedbb06
commit
4370ee4d3b
1 changed files with 6 additions and 15 deletions
|
@ -702,20 +702,6 @@ void cpu_exit_clear(void)
|
|||
}
|
||||
#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;
|
||||
/* Where the IO area was mapped on multiquad, always 0 otherwise */
|
||||
void *xquad_portio;
|
||||
|
@ -872,7 +858,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
|
|||
|
||||
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 */
|
||||
if (!cpu_isset(cpu, cpu_callin_map)) {
|
||||
|
|
Loading…
Reference in a new issue