Merge branch 'linus' into x86/x2apic
[sfrench/cifs-2.6.git] / arch / x86 / kernel / cpu / common_64.c
index 7b8cc72feb40e3ed8bfd02437fe3b6324b024f67..c6bee77ca9e6797fbd87f292aefb2f9dc4c0c892 100644 (file)
@@ -608,6 +608,8 @@ void __cpuinit cpu_init(void)
        barrier();
 
        check_efer();
+       if (cpu != 0 && x2apic)
+               enable_x2apic();
 
        /*
         * set up and load the per-CPU TSS