Merge branch 'linus' into x86/x2apic

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kernel / cpu / common_64.c

diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c
index dd6e3f15017eb87b04885fd5164681bbdd9a3073..6f9b8924bdc088d5ff4811767683532e608a28cb 100644 (file)
--- a/arch/x86/kernel/cpu/common_64.c
+++ b/arch/x86/kernel/cpu/common_64.c
@@ -597,6 +597,8 @@ void __cpuinit cpu_init(void)
        barrier();
 
        check_efer();
+       if (cpu != 0 && x2apic)
+               enable_x2apic();
 
        /*
         * set up and load the per-CPU TSS