---

yaml --- r: 116626 b: refs/heads/master c: 35cb5ed h: refs/heads/master v: v3
git-mirror · Oct 14, 2008 · 3a1e4a0 · 3a1e4a0
1 parent 906dced
commit 3a1e4a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8925b394eca0bb0a444a6487d702d0f650e94a10
+refs/heads/master: 35cb5ed01261f5669657d2f1720aca902299887d
diff --git a/trunk/kernel/trace/trace_nop.c b/trunk/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);
 }