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

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

diff --git a/init/main.c b/init/main.c
index 38c68b593d0d704f103bec42d37b42ca4742673f..b729e1f22838c0834f99edb8ee33b7a60b56cdd0 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -647,6 +647,7 @@ asmlinkage __visible void __init start_kernel(void)
        profile_init();
        call_function_init();
        WARN(!irqs_disabled(), "Interrupts were enabled early\n");
+
        early_boot_irqs_disabled = false;
        local_irq_enable();
 
@@ -662,7 +663,7 @@ asmlinkage __visible void __init start_kernel(void)
                panic("Too many boot %s vars at `%s'", panic_later,
                      panic_param);
 
-       lockdep_info();
+       lockdep_init();
 
        /*
         * Need to run this when irqs are enabled, because it wants