---

yaml --- r: 313866 b: refs/heads/master c: 50bb1f7 h: refs/heads/master v: v3
git-mirror · Jul 17, 2012 · e3de1a2 · e3de1a2
1 parent 9c72ca6
commit e3de1a2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 711d2731d0cc90644a67b179bd78432c15a270f0
+refs/heads/master: 50bb1f761e420776a4d10798babfc76793d4056c
diff --git a/trunk/arch/s390/kernel/processor.c b/trunk/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);