1 files changed, 6 insertions, 5 deletions

diff --git a/init/main.c b/init/main.c
index 7a740870ffe3..95316a1b4a76 100644
--- a/init/main.c
+++ b/init/main.c
@@ -68,6 +68,7 @@
 #include <linux/shmem_fs.h>
 #include <linux/slab.h>
 #include <linux/perf_event.h>
+#include <linux/file.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -460,6 +461,10 @@ static void __init mm_init(void)
         percpu_init_late();
         pgtable_cache_init();
         vmalloc_init();
+#ifdef CONFIG_X86
+        if (efi_enabled)
+                efi_enter_virtual_mode();
+#endif
 }
 
 asmlinkage void __init start_kernel(void)
@@ -601,10 +606,6 @@ asmlinkage void __init start_kernel(void)
         calibrate_delay();
         pidmap_init();
         anon_vma_init();
-#ifdef CONFIG_X86
-        if (efi_enabled)
-                efi_enter_virtual_mode();
-#endif
         thread_info_cache_init();
         cred_init();
         fork_init(totalram_pages);
@@ -805,8 +806,8 @@ static noinline int init_post(void)
         system_state = SYSTEM_RUNNING;
         numa_default_policy();
 
-
         current->signal->flags |= SIGNAL_UNKILLABLE;
+        flush_delayed_fput();
 
         if (ramdisk_execute_command) {
                 run_init_process(ramdisk_execute_command);