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

[firefly-linux-kernel-4.4.55.git] / kernel / events / callchain.c

diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c
index f2a88de87a49b590207a0fc966b54060fd103f49..d659487254d5d77de07f279ceb0ba0bebe93ed03 100644 (file)
--- a/kernel/events/callchain.c
+++ b/kernel/events/callchain.c
@@ -137,7 +137,7 @@ static struct perf_callchain_entry *get_callchain_entry(int *rctx)
        int cpu;
        struct callchain_cpus_entries *entries;
 
-       *rctx = get_recursion_context(__get_cpu_var(callchain_recursion));
+       *rctx = get_recursion_context(this_cpu_ptr(callchain_recursion));
        if (*rctx == -1)
                return NULL;
 
@@ -153,7 +153,7 @@ static struct perf_callchain_entry *get_callchain_entry(int *rctx)
 static void
 put_callchain_entry(int rctx)
 {
-       put_recursion_context(__get_cpu_var(callchain_recursion), rctx);
+       put_recursion_context(this_cpu_ptr(callchain_recursion), rctx);
 }
 
 struct perf_callchain_entry *