|
@@ -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
|