diff --git a/[refs] b/[refs]
index 8ec777068402..da7b15a12d19 100644
--- 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
index dafaefb84038..9fb02c17ad0c 100644
--- 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);
 }