2 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c
index 70ff07186772..151d3155ddf6 100644
--- a/arch/x86/kernel/setup64.c
+++ b/arch/x86/kernel/setup64.c
@@ -247,6 +247,7 @@ void __cpuinit cpu_init (void)
                 BUG();
         enter_lazy_tlb(&init_mm, me);
 
+        load_sp0(t, &current->thread);
         set_tss_desc(cpu, t);
         load_TR_desc();
         load_LDT(&init_mm.context);
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 67af727f733a..3b48d1f4c7c3 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -864,7 +864,6 @@ do_rest:
         irq_ctx_init(cpu);
 #else
         cpu_pda(cpu)->pcurrent = c_idle.idle;
-        load_sp0(&per_cpu(init_tss, cpu), &c_idle.idle->thread);
         clear_tsk_thread_flag(c_idle.idle, TIF_FORK);
 #endif
         early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);