this_cpu: Use this_cpu_xx in trace_functions_graph.c
authorTejun Heo <tj@kernel.org>
Tue, 13 Oct 2009 14:23:02 +0000 (23:23 +0900)
committerTejun Heo <tj@kernel.org>
Tue, 13 Oct 2009 14:23:02 +0000 (23:23 +0900)
ftrace_cpu_disabled usage in trace_functions_graph.c were left out
during this_cpu_xx conversion in commit 9288f99a causing compile
failure.  Convert them.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoph Lameter <cl@linux-foundation.org>
kernel/trace/trace_functions_graph.c

index 45e6c01b2e4d96fc3eb9d4ef8b7a96bd7b60e30b..90a6daa10962432e9bb40ff439a26d3add840fe9 100644 (file)
@@ -176,7 +176,7 @@ static int __trace_graph_entry(struct trace_array *tr,
        struct ring_buffer *buffer = tr->buffer;
        struct ftrace_graph_ent_entry *entry;
 
-       if (unlikely(local_read(&__get_cpu_var(ftrace_cpu_disabled))))
+       if (unlikely(__this_cpu_read(per_cpu_var(ftrace_cpu_disabled))))
                return 0;
 
        event = trace_buffer_lock_reserve(buffer, TRACE_GRAPH_ENT,
@@ -240,7 +240,7 @@ static void __trace_graph_return(struct trace_array *tr,
        struct ring_buffer *buffer = tr->buffer;
        struct ftrace_graph_ret_entry *entry;
 
-       if (unlikely(local_read(&__get_cpu_var(ftrace_cpu_disabled))))
+       if (unlikely(__this_cpu_read(per_cpu_var(ftrace_cpu_disabled))))
                return;
 
        event = trace_buffer_lock_reserve(buffer, TRACE_GRAPH_RET,