Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / s390 / kernel / processor.c

diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c
index edefead3b43a55dee5e197fae4a68011a1c3c41c..dbdd33ee010204f0e03c9c1fd48ad30acad59b4c 100644 (file)
--- a/arch/s390/kernel/processor.c
+++ b/arch/s390/kernel/processor.c
@@ -23,7 +23,7 @@ static DEFINE_PER_CPU(struct cpuid, cpu_id);
  */
 void cpu_init(void)
 {
-       struct cpuid *id = &__get_cpu_var(cpu_id);
+       struct cpuid *id = this_cpu_ptr(&cpu_id);
 
        get_cpu_id(id);
        atomic_inc(&init_mm.mm_count);