2 files changed, 3 insertions, 3 deletions

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 9eb1aa03a18d..38e5cf73b9ae 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -822,7 +822,7 @@ function_profile_call(unsigned long ip, unsigned long parent_ip,
 
         local_irq_save(flags);
 
-        stat = &__get_cpu_var(ftrace_profile_stats);
+        stat = this_cpu_ptr(&ftrace_profile_stats);
         if (!stat->hash || !ftrace_profile_enabled)
                 goto out;
 
@@ -853,7 +853,7 @@ static void profile_graph_return(struct ftrace_graph_ret *trace)
         unsigned long flags;
 
         local_irq_save(flags);
-        stat = &__get_cpu_var(ftrace_profile_stats);
+        stat = this_cpu_ptr(&ftrace_profile_stats);
         if (!stat->hash || !ftrace_profile_enabled)
                 goto out;
 
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 4c392c8238bf..05431696b10c 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1726,7 +1726,7 @@ static void __ftrace_trace_stack(struct ring_buffer *buffer,
          */
         barrier();
         if (use_stack == 1) {
-                trace.entries           = &__get_cpu_var(ftrace_stack).calls[0];
+                trace.entries           = this_cpu_ptr(ftrace_stack.calls);
                 trace.max_entries       = FTRACE_STACK_MAX_ENTRIES;
 
                 if (regs)