diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-09-30 17:45:22 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2015-09-30 21:22:57 +0200 |
| commit | 2d34f48955158cfdf18704256c84b04fe3a16c7b (patch) | |
| tree | 625e3b31654e1bd70123db75b279c9fc2cb598ff /kernel/trace/trace_events.c | |
| parent | tracing: Add a method to pass in trace_array descriptor to option files (diff) | |
| download | linux-2d34f48955158cfdf18704256c84b04fe3a16c7b.tar.xz linux-2d34f48955158cfdf18704256c84b04fe3a16c7b.zip | |
tracing: Make ftrace_trace_stack() depend on general trace_array flag
In preparation for the multi buffer instances to have their own trace_flags,
the check in ftrace_trace_stack() needs to test the trace_array descriptor
flag that is for the current event, not the global_trace descriptor.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace_events.c')
| -rw-r--r-- | kernel/trace/trace_events.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 0f394112a0a7..57c9e709772c 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -2941,15 +2941,15 @@ static struct ftrace_ops trace_ops __initdata = static __init void event_trace_self_test_with_function(void) { int ret; + event_tr = top_trace_array(); + if (WARN_ON(!event_tr)) + return; ret = register_ftrace_function(&trace_ops); if (WARN_ON(ret < 0)) { pr_info("Failed to enable function tracer for event tests\n"); return; } pr_info("Running tests again, along with the function tracer\n"); - event_tr = top_trace_array(); - if (WARN_ON(!event_tr)) - return; event_trace_self_tests(); unregister_ftrace_function(&trace_ops); } |