1 files changed, 1 insertions, 5 deletions

diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index a546f55c77b4..1a1ae8edc40c 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -66,9 +66,6 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
 DEFINE_PER_CPU(struct task_struct *, current_task) = &init_task;
 EXPORT_PER_CPU_SYMBOL(current_task);
 
-DEFINE_PER_CPU(int, cpu_number);
-EXPORT_PER_CPU_SYMBOL(cpu_number);
-
 /*
  * Return saved PC of a blocked thread.
  */
@@ -111,7 +108,6 @@ void cpu_idle(void)
                                 play_dead();
 
                         local_irq_disable();
-                        __get_cpu_var(irq_stat).idle_timestamp = jiffies;
                         /* Don't trace irqs off for idle */
                         stop_critical_timings();
                         pm_idle();
@@ -591,7 +587,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
         if (prev->gs | next->gs)
                 loadsegment(gs, next->gs);
 
-        x86_write_percpu(current_task, next_p);
+        percpu_write(current_task, next_p);
 
         return prev_p;
 }