x86, hotplug: During CPU0 online, enable x2apic, set_numa_node.
Previously these functions were not run on the BSP (CPU 0, the boot processor) since the boot processor init would only be executed before this functionality was initialized. Signed-off-by: Fenghua Yu <fenghua.yu@intel.com> Link: http://lkml.kernel.org/r/1352835171-3958-11-git-send-email-fenghua.yu@intel.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
parent
e1c467e690
commit
27fd185f3d
|
@ -1237,7 +1237,7 @@ void __cpuinit cpu_init(void)
|
|||
oist = &per_cpu(orig_ist, cpu);
|
||||
|
||||
#ifdef CONFIG_NUMA
|
||||
if (cpu != 0 && this_cpu_read(numa_node) == 0 &&
|
||||
if (this_cpu_read(numa_node) == 0 &&
|
||||
early_cpu_to_node(cpu) != NUMA_NO_NODE)
|
||||
set_numa_node(early_cpu_to_node(cpu));
|
||||
#endif
|
||||
|
@ -1269,8 +1269,7 @@ void __cpuinit cpu_init(void)
|
|||
barrier();
|
||||
|
||||
x86_configure_nx();
|
||||
if (cpu != 0)
|
||||
enable_x2apic();
|
||||
enable_x2apic();
|
||||
|
||||
/*
|
||||
* set up and load the per-CPU TSS
|
||||
|
|
Loading…
Reference in New Issue