Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

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

diff --git a/arch/s390/oprofile/hwsampler.c b/arch/s390/oprofile/hwsampler.c
index e53c6f268807aa5c15ec6dc8ff87a67bdc633d88..ff9b4eb3458908ccd70da612c346659f734e7641 100644 (file)
--- a/arch/s390/oprofile/hwsampler.c
+++ b/arch/s390/oprofile/hwsampler.c
@@ -178,7 +178,7 @@ static int smp_ctl_qsi(int cpu)
 static void hws_ext_handler(struct ext_code ext_code,
                            unsigned int param32, unsigned long param64)
 {
-       struct hws_cpu_buffer *cb = &__get_cpu_var(sampler_cpu_buffer);
+       struct hws_cpu_buffer *cb = this_cpu_ptr(&sampler_cpu_buffer);
 
        if (!(param32 & CPU_MF_INT_SF_MASK))
                return;