1 files changed, 6 insertions, 3 deletions

diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index dea7ef9d3e82..8c6c8c52b95c 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -596,6 +596,12 @@ static void __cpuinit start_secondary(void *unused)
 void __devinit initialize_secondary(void)
 {
         /*
+         * switch to the per CPU GDT we already set up
+         * in do_boot_cpu()
+         */
+        cpu_set_gdt(current_thread_info()->cpu);
+
+        /*
          * We don't actually need to load the full TSS,
          * basically just the stack pointer and the eip.
          */
@@ -972,9 +978,6 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
         /* Stack for startup_32 can be just as for start_secondary onwards */
         stack_start.esp = (void *) idle->thread.esp;
 
-        start_pda = cpu_pda(cpu);
-        cpu_gdt_descr = per_cpu(cpu_gdt_descr, cpu);
-
         irq_ctx_init(cpu);
 
         x86_cpu_to_apicid[cpu] = apicid;