efi: Defer freeing boot services memory until after ACPI init

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

diff --git a/init/main.c b/init/main.c
index e60679de61c3a050640554966d34542fcc13a7bd..d61ec542205c1f69cc5c1a9438f19c32f3dfcd8d 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -461,10 +461,6 @@ 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)
@@ -606,6 +602,10 @@ 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);
@@ -631,6 +631,9 @@ asmlinkage void __init start_kernel(void)
        acpi_early_init(); /* before LAPIC and SMP init */
        sfi_init_late();
 
+       if (efi_enabled)
+               efi_free_boot_services();
+
        ftrace_init();
 
        /* Do the rest non-__init'ed, we're now alive */