diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c
index 07c7bf47d61860546663b436439df552deff937e..0e2887b6d09e2e8cb578ff8d9f50df7c2f4de94d 100644
--- a/arch/s390/kernel/processor.c
+++ b/arch/s390/kernel/processor.c
@@ -25,8 +25,8 @@ 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);