aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-01-14 12:33:33 -0500
committerSteven Rostedt <rostedt@goodmis.org>2014-02-20 12:13:11 -0500
commitf1b21c9a40704dfdf7b8423c7d2969ea31c9857d (patch)
tree6dcba7a8b72290fb91f855b950fcf4338f1711b2 /kernel
parent607e2ea167e56db84387f3ab97e59a862e101cab (diff)
tracing: Only let top level have option files
Currently, only the top level instance can have tracing options. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 944cd021aabf..da9543cdbe7a 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3968,9 +3968,11 @@ static int tracing_set_tracer(struct trace_array *tr, const char *buf)
3968 free_snapshot(tr); 3968 free_snapshot(tr);
3969 } 3969 }
3970#endif 3970#endif
3971 destroy_trace_option_files(topts); 3971 /* Currently, only the top instance has options */
3972 3972 if (tr->flags & TRACE_ARRAY_FL_GLOBAL) {
3973 topts = create_trace_option_files(tr, t); 3973 destroy_trace_option_files(topts);
3974 topts = create_trace_option_files(tr, t);
3975 }
3974 3976
3975#ifdef CONFIG_TRACER_MAX_TRACE 3977#ifdef CONFIG_TRACER_MAX_TRACE
3976 if (t->use_max_tr && !had_max_tr) { 3978 if (t->use_max_tr && !had_max_tr) {