tracing: Move enabling tracepoints to just after rcu_init()

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

diff --git a/init/main.c b/init/main.c
index c5c11da6c4e15ef6ede067a7bfdcf34e8fce34ad..70687069f8e2863f55997dccb0445cde038efcaf 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -501,13 +501,13 @@ asmlinkage __visible void __init start_kernel(void)
 {
        char *command_line;
        char *after_dashes;
-       extern const struct kernel_param __start___param[], __stop___param[];
 
        /*
         * Need to run as early as possible, to initialize the
         * lockdep hash:
         */
        lockdep_init();
+       set_task_stack_end_magic(&init_task);
        smp_setup_processor_id();
        debug_objects_early_init();
 
@@ -577,6 +577,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() */
@@ -843,7 +847,6 @@ static char *initcall_level_names[] __initdata = {
 
 static void __init do_initcall_level(int level)
 {
-       extern const struct kernel_param __start___param[], __stop___param[];
        initcall_t *fn;
 
        strcpy(initcall_command_line, saved_command_line);