1 files changed, 6 insertions, 2 deletions

diff --git a/init/main.c b/init/main.c
index b5a892c68375..844209453c02 100644
--- a/init/main.c
+++ b/init/main.c
@@ -62,6 +62,7 @@
 #include <linux/signal.h>
 #include <linux/idr.h>
 #include <linux/ftrace.h>
+#include <linux/async.h>
 #include <trace/boot.h>
 
 #include <asm/io.h>
@@ -599,7 +600,8 @@ asmlinkage void __init start_kernel(void)
         sched_clock_init();
         profile_init();
         if (!irqs_disabled())
-                printk("start_kernel(): bug: interrupts were enabled early\n");
+                printk(KERN_CRIT "start_kernel(): bug: interrupts were "
+                                 "enabled early\n");
         early_boot_irqs_on();
         local_irq_enable();
 
@@ -684,7 +686,7 @@ asmlinkage void __init start_kernel(void)
         rest_init();
 }
 
-static int initcall_debug;
+int initcall_debug;
 core_param(initcall_debug, initcall_debug, bool, 0644);
 
 int do_one_initcall(initcall_t fn)
@@ -785,6 +787,8 @@ static void run_init_process(char *init_filename)
  */
 static noinline int init_post(void)
 {
+        /* need to finish all async __init code before freeing the memory */
+        async_synchronize_full();
         free_initmem();
         unlock_kernel();
         mark_rodata_ro();