X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=kernel%2Ftrace%2Ftrace_nop.c;h=4592b4862515c9d1680417f4fe46bc192999d661;hb=7f0ed77d241b60f70136f15b8eef30a3de1fa249;hp=dafaefb8403868bf1d624f57f5f9f4ec0096a18f;hpb=fb1b6d8b5154c692172a424e45fbd0573295cb93;p=linux-2.6-omap-h63xx.git

diff --git a/kernel/trace/trace_nop.c b/kernel/trace/trace_nop.c
index dafaefb8403..4592b486251 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, cpu);
+
 	if (tr->ctrl)
 		start_nop_trace(tr);
 }
@@ -47,7 +51,7 @@ static void nop_trace_ctrl_update(struct trace_array *tr)
 		stop_nop_trace(tr);
 }
 
-static struct tracer nop_trace __read_mostly =
+struct tracer nop_trace __read_mostly =
 {
 	.name		= "nop",
 	.init		= nop_trace_init,
@@ -58,8 +62,3 @@ static struct tracer nop_trace __read_mostly =
 #endif
 };
 
-__init static int init_nop_trace(void)
-{
-	return register_tracer(&nop_trace);
-}
-device_initcall(init_nop_trace);