diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-09-29 10:24:56 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2015-09-29 15:01:34 -0400 |
| commit | 8179e8a15b76eaec1e757da7a0f96de9f0c466c6 (patch) | |
| tree | 918b3fcdab03e23e2032f70db9de17cb8c76b396 /kernel/trace/trace.c | |
| parent | 4ee4301c4bab22c84df20ce694cc6932dd812be5 (diff) | |
tracing: Do not create function tracer options when not compiled in
When the function tracer is not compiled in, do not create the option files
for it.
Fix up both the sched_wakeup and irqsoff tracers to handle the change.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 68fcb40fc764..cb223ad51cdf 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -490,11 +490,11 @@ static inline void ftrace_trace_stack(struct ring_buffer *buffer, /* trace_flags holds trace_options default values */ unsigned long trace_flags = - FUNCTION_GRAPH_DEFAULT_FLAGS | + FUNCTION_DEFAULT_FLAGS | FUNCTION_GRAPH_DEFAULT_FLAGS | TRACE_ITER_PRINT_PARENT | TRACE_ITER_PRINTK | TRACE_ITER_ANNOTATE | TRACE_ITER_CONTEXT_INFO | TRACE_ITER_RECORD_CMD | TRACE_ITER_OVERWRITE | - TRACE_ITER_IRQ_INFO | TRACE_ITER_MARKERS | TRACE_ITER_FUNCTION + TRACE_ITER_IRQ_INFO | TRACE_ITER_MARKERS ; static void tracer_tracing_on(struct trace_array *tr) |