From: Steven Rostedt (Red Hat) <rostedt@goodmis.org>
Date: Wed, 25 Jun 2014 03:50:09 +0000 (-0400)
Subject: tracing: Remove ftrace_stop/start() from reading the trace file
X-Git-Tag: v3.4.99~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf09db97205d46b3e083582eb2799aedddd9953b;p=platform%2Fkernel%2Flinux-stable.git

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>
---

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index a494ec3..8897a6f 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1052,7 +1052,6 @@ void tracing_start(void)
 
 	arch_spin_unlock(&ftrace_max_lock);
 
-	ftrace_start();
  out:
 	raw_spin_unlock_irqrestore(&tracing_start_lock, flags);
 }
@@ -1068,7 +1067,6 @@ void tracing_stop(void)
 	struct ring_buffer *buffer;
 	unsigned long flags;
 
-	ftrace_stop();
 	raw_spin_lock_irqsave(&tracing_start_lock, flags);
 	if (trace_stop_count++)
 		goto out;