Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

[net-next-2.6.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 644ab744e759ef6d35371992b3096d555c676eea..8683dec6946b8d2aa8f64e0cd288de1713d72d82 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4596,9 +4596,6 @@ __init static int tracer_alloc_buffers(void)
 
        register_tracer(&nop_trace);
        current_trace = &nop_trace;
-#ifdef CONFIG_BOOT_TRACER
-       register_tracer(&boot_tracer);
-#endif
        /* All seems OK, enable tracing */
        tracing_disabled = 0;