diff options
author | Tejun Heo <tj@kernel.org> | 2009-10-13 10:23:02 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-10-13 10:23:02 -0400 |
commit | dec54bf538326a1503dd780c9f2811f495af95c5 (patch) | |
tree | bf024b43bd57de772182e0eb026ee0204c66a14a | |
parent | 9288f99aa52d90a5b82573c4b769c97c55af2f56 (diff) |
this_cpu: Use this_cpu_xx in trace_functions_graph.c
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>
-rw-r--r-- | kernel/trace/trace_functions_graph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index 45e6c01b2e4..90a6daa1096 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c | |||
@@ -176,7 +176,7 @@ static int __trace_graph_entry(struct trace_array *tr, | |||
176 | struct ring_buffer *buffer = tr->buffer; | 176 | struct ring_buffer *buffer = tr->buffer; |
177 | struct ftrace_graph_ent_entry *entry; | 177 | struct ftrace_graph_ent_entry *entry; |
178 | 178 | ||
179 | if (unlikely(local_read(&__get_cpu_var(ftrace_cpu_disabled)))) | 179 | if (unlikely(__this_cpu_read(per_cpu_var(ftrace_cpu_disabled)))) |
180 | return 0; | 180 | return 0; |
181 | 181 | ||
182 | event = trace_buffer_lock_reserve(buffer, TRACE_GRAPH_ENT, | 182 | event = trace_buffer_lock_reserve(buffer, TRACE_GRAPH_ENT, |
@@ -240,7 +240,7 @@ static void __trace_graph_return(struct trace_array *tr, | |||
240 | struct ring_buffer *buffer = tr->buffer; | 240 | struct ring_buffer *buffer = tr->buffer; |
241 | struct ftrace_graph_ret_entry *entry; | 241 | struct ftrace_graph_ret_entry *entry; |
242 | 242 | ||
243 | if (unlikely(local_read(&__get_cpu_var(ftrace_cpu_disabled)))) | 243 | if (unlikely(__this_cpu_read(per_cpu_var(ftrace_cpu_disabled)))) |
244 | return; | 244 | return; |
245 | 245 | ||
246 | event = trace_buffer_lock_reserve(buffer, TRACE_GRAPH_RET, | 246 | event = trace_buffer_lock_reserve(buffer, TRACE_GRAPH_RET, |