tracing: Replace __get_cpu_var uses with this_cpu_ptr

Replace uses of &__get_cpu_var for address calculation with this_cpu_ptr.

Link: http://lkml.kernel.org/p/alpine.DEB.2.10.1404291415560.18364@gentwo.org
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index 925eaf28fca9ccf3a38e6360eca752eb2cab857d..7bd2ad01e39c625ec4da93f095763b31a38b1f34 100644 (file)
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -355,7 +355,7 @@ static inline void reset_current_kprobe(void)
 
 static inline struct kprobe_ctlblk *get_kprobe_ctlblk(void)
 {
-       return (&__get_cpu_var(kprobe_ctlblk));
+       return this_cpu_ptr(&kprobe_ctlblk);
 }
 
 int register_kprobe(struct kprobe *p);

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 9eb1aa03a18df5630ebca83e47d2ef447d76355f..38e5cf73b9aed65d1a9f2ff1f6cc81b71de1f601 100644 (file)
--- 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 4c392c8238bf9592bce12114dd794ab27bf83ffa..05431696b10c2e73baeeb69f0cd5e91ebf4bee22 100644 (file)
--- 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)