1 files changed, 7 insertions, 6 deletions

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 0854ff169274..ad59edd84de7 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -232,12 +232,6 @@ static void notrace start_secondary(void *unused)
          */
         if (boot_cpu_has(X86_FEATURE_PCID))
                 __write_cr4(__read_cr4() | X86_CR4_PCIDE);
-        cpu_init();
-        x86_cpuinit.early_percpu_clock_init();
-        preempt_disable();
-        smp_callin();
-
-        enable_start_cpu0 = 0;
 
 #ifdef CONFIG_X86_32
         /* switch away from the initial page table */
@@ -245,6 +239,13 @@ static void notrace start_secondary(void *unused)
         __flush_tlb_all();
 #endif
 
+        cpu_init();
+        x86_cpuinit.early_percpu_clock_init();
+        preempt_disable();
+        smp_callin();
+
+        enable_start_cpu0 = 0;
+
         /* otherwise gcc will move up smp_processor_id before the cpu_init */
         barrier();
         /*