diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-06-24 23:50:09 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-09 11:14:02 -0700 |
| commit | 9d31798d8ca6537c2d5e36698cb1ed4ed835a19e (patch) | |
| tree | 6f123cb1deebae1089f4400b92392e814c500d3c /kernel/trace | |
| parent | 8bee745a7a6009b75edbdec0ffa0cc949dacff00 (diff) | |
| download | linux-3.10-9d31798d8ca6537c2d5e36698cb1ed4ed835a19e.tar.gz linux-3.10-9d31798d8ca6537c2d5e36698cb1ed4ed835a19e.tar.bz2 linux-3.10-9d31798d8ca6537c2d5e36698cb1ed4ed835a19e.zip | |
tracing: Remove ftrace_stop/start() from reading the trace file
commit 099ed151675cd1d2dbeae1dac697975f6a68716d upstream.
Disabling reading and writing to the trace file should not be able to
disable all function tracing callbacks. There's other users today
(like kprobes and perf). Reading a trace file should not stop those
from happening.
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 60f49637b4d..21920add797 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1306,7 +1306,6 @@ void tracing_start(void) arch_spin_unlock(&ftrace_max_lock); - ftrace_start(); out: raw_spin_unlock_irqrestore(&global_trace.start_lock, flags); } @@ -1353,7 +1352,6 @@ void tracing_stop(void) struct ring_buffer *buffer; unsigned long flags; - ftrace_stop(); raw_spin_lock_irqsave(&global_trace.start_lock, flags); if (global_trace.stop_count++) goto out; |