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 / idle.c

diff --git a/arch/s390/kernel/idle.c b/arch/s390/kernel/idle.c
index c846aee7372f391b6d975bad40d2a7ad7f7c1cf8..7559f1beab2918f84831791ae93a901cd826bb57 100644 (file)
--- a/arch/s390/kernel/idle.c
+++ b/arch/s390/kernel/idle.c
@@ -21,7 +21,7 @@ static DEFINE_PER_CPU(struct s390_idle_data, s390_idle);
 
 void __kprobes enabled_wait(void)
 {
-       struct s390_idle_data *idle = &__get_cpu_var(s390_idle);
+       struct s390_idle_data *idle = this_cpu_ptr(&s390_idle);
        unsigned long long idle_time;
        unsigned long psw_mask;