Skip to content

Commit

Permalink
tracing: Remove ftrace_stop/start() from reading the trace file
Browse files Browse the repository at this point in the history
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.

Cc: stable@vger.kernel.org # 3.0+
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Steven Rostedt (Red Hat) committed Jul 1, 2014
1 parent fb6bab6 commit 099ed15
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1396,7 +1396,6 @@ void tracing_start(void)

arch_spin_unlock(&global_trace.max_lock);

ftrace_start();
out:
raw_spin_unlock_irqrestore(&global_trace.start_lock, flags);
}
Expand Down Expand Up @@ -1443,7 +1442,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;
Expand Down

0 comments on commit 099ed15

Please sign in to comment.