Merge branch 'core/printk' into tracing/ftrace

[sfrench/cifs-2.6.git] / kernel / trace / trace_nop.c

diff --git a/kernel/trace/trace_nop.c b/kernel/trace/trace_nop.c
index b9767acd30acca0fcb6192b847888d1d32a6924a..9aa84bde23cd2d10e2207d635a908cc958286deb 100644 (file)
--- a/kernel/trace/trace_nop.c
+++ b/kernel/trace/trace_nop.c
@@ -47,12 +47,7 @@ static void stop_nop_trace(struct trace_array *tr)
 
 static int nop_trace_init(struct trace_array *tr)
 {
-       int cpu;
        ctx_trace = tr;
-
-       for_each_online_cpu(cpu)
-               tracing_reset(tr, cpu);
-
        start_nop_trace(tr);
        return 0;
 }