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

[firefly-linux-kernel-4.4.55.git] / drivers / oprofile / timer_int.c

diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
index 61be1d9c16c85f6da3243b74b6b5c63ec3cef774..bdef916e5dda3c02eb9f29504b0e69faa6a7bd8b 100644 (file)
--- a/drivers/oprofile/timer_int.c
+++ b/drivers/oprofile/timer_int.c
@@ -32,7 +32,7 @@ static enum hrtimer_restart oprofile_hrtimer_notify(struct hrtimer *hrtimer)
 
 static void __oprofile_hrtimer_start(void *unused)
 {
-       struct hrtimer *hrtimer = &__get_cpu_var(oprofile_hrtimer);
+       struct hrtimer *hrtimer = this_cpu_ptr(&oprofile_hrtimer);
 
        if (!ctr_running)
                return;