Skip to content

Commit

Permalink
x86, hotplug: During CPU0 online, enable x2apic, set_numa_node.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Fenghua Yu authored and H. Peter Anvin committed Nov 14, 2012
1 parent e1c467e commit 27fd185
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions arch/x86/kernel/cpu/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 27fd185

Please sign in to comment.