Merge tag 'trace-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[cascardo/linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 8a914b7..747ecc4 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -578,6 +578,10 @@ asmlinkage __visible void __init start_kernel(void)
                local_irq_disable();
        idr_init_cache();
        rcu_init();
+
+       /* trace_printk() and trace points may be used after this */
+       trace_init();
+
        context_tracking_init();
        radix_tree_init();
        /* init some links before init_ISA_irqs() */