summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2015-09-29 18:21:35 -0400
committerSteven Rostedt <rostedt@goodmis.org>2015-09-30 04:35:18 -0400
commitb9f9108cad3998a4c8fd26051c37a451f1dff1f1 (patch)
tree7afa361be6f48e60d256acc0f9e57c7ea5aff479 /kernel/trace/trace.c
parentb5e87c0581319481399b6d8e8d6972b5523c18e6 (diff)
downloadlinux-stable-b9f9108cad3998a4c8fd26051c37a451f1dff1f1.tar.gz
linux-stable-b9f9108cad3998a4c8fd26051c37a451f1dff1f1.tar.bz2
linux-stable-b9f9108cad3998a4c8fd26051c37a451f1dff1f1.zip
tracing: Remove access to trace_flags in trace_printk.c
In the effort to move the global trace_flags to the tracing instances, the direct access to trace_flags must be removed from trace_printk.c Instead, add a new trace_printk_enabled boolean that is set by a new access function trace_printk_control(), that will enable or disable trace_printk. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 991bab9b79d2..d98789b112c6 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3555,8 +3555,10 @@ int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
#endif
}
- if (mask == TRACE_ITER_PRINTK)
+ if (mask == TRACE_ITER_PRINTK) {
trace_printk_start_stop_comm(enabled);
+ trace_printk_control(enabled);
+ }
return 0;
}