x86-64: Move current task from PDA to per-cpu and consolidate with 32-bit.

Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 9ff3b0999cfb..72c2eb9b64cd 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -279,12 +279,11 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
         struct task_struct *idle = idle_task(cpu);
         int rc;
 
+        per_cpu(current_task, cpu) = idle;
 #ifdef CONFIG_X86_32
         init_gdt(cpu);
-        per_cpu(current_task, cpu) = idle;
         irq_ctx_init(cpu);
 #else
-        cpu_pda(cpu)->pcurrent = idle;
         clear_tsk_thread_flag(idle, TIF_FORK);
 #endif
         xen_setup_timer(cpu);