Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[karo-tx-linux.git] / arch / x86 / kernel / cpu / common.c

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 6a6432cf89de26519aa8ef20f95cddf841d8b8a8..9c3ab43a6954d7217f390ae1f4f54527de82d09b 100644 (file)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1228,7 +1228,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
@@ -1260,8 +1260,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