1 files changed, 3 insertions, 3 deletions

diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c
index 6e0073e43f54..572d4c9cb33b 100644
--- a/arch/s390/kernel/processor.c
+++ b/arch/s390/kernel/processor.c
@@ -1,6 +1,4 @@
 /*
- *  arch/s390/kernel/processor.c
- *
  *  Copyright IBM Corp. 2008
  *  Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
  */
@@ -25,13 +23,15 @@ static DEFINE_PER_CPU(struct cpuid, cpu_id);
  */
 void __cpuinit cpu_init(void)
 {
-        struct cpuid *id = &per_cpu(cpu_id, smp_processor_id());
+        struct s390_idle_data *idle = &__get_cpu_var(s390_idle);
+        struct cpuid *id = &__get_cpu_var(cpu_id);
 
         get_cpu_id(id);
         atomic_inc(&init_mm.mm_count);
         current->active_mm = &init_mm;
         BUG_ON(current->mm);
         enter_lazy_tlb(&init_mm, current);
+        memset(idle, 0, sizeof(*idle));
 }
 
 /*