From: Frédéric Weisbecker <fweisbec@gmail.com>
Date: Sun, 21 Sep 2008 18:10:14 +0000 (+0200)
Subject: tracing/ftrace: make nop tracer reset previous entries
X-Git-Tag: v2.6.28-rc1~78^2~66
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=35cb5ed01261f5669657d2f1720aca902299887d;p=linux-2.6-omap-h63xx.git

tracing/ftrace: make nop tracer reset previous entries

If nop tracer is selected, some old entries from the previous tracer
could still be enqueued. Tracing have to be reset.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Steven Noonan <steven@uplinklabs.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/kernel/trace/trace_nop.c b/kernel/trace/trace_nop.c
index dafaefb8403..9fb02c17ad0 100644
--- a/kernel/trace/trace_nop.c
+++ b/kernel/trace/trace_nop.c
@@ -26,8 +26,12 @@ static void stop_nop_trace(struct trace_array *tr)
 
 static void nop_trace_init(struct trace_array *tr)
 {
+	int cpu;
 	ctx_trace = tr;
 
+	for_each_online_cpu(cpu)
+		tracing_reset(tr->data[cpu]);
+
 	if (tr->ctrl)
 		start_nop_trace(tr);
 }