Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild...

[linux-2.6-omap-h63xx.git] / kernel / trace / trace_nop.c

diff --git a/kernel/trace/trace_nop.c b/kernel/trace/trace_nop.c
index 9fb02c17ad0c73bf33d0af8b48c6ce69f6a51c63..4592b4862515c9d1680417f4fe46bc192999d661 100644 (file)
--- a/kernel/trace/trace_nop.c
+++ b/kernel/trace/trace_nop.c
@@ -30,7 +30,7 @@ static void nop_trace_init(struct trace_array *tr)
        ctx_trace = tr;
 
        for_each_online_cpu(cpu)
-               tracing_reset(tr->data[cpu]);
+               tracing_reset(tr, cpu);
 
        if (tr->ctrl)
                start_nop_trace(tr);
@@ -51,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,
@@ -62,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);