Merge branch 'akpm' (Andrew's patch-bomb)

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

diff --git a/init/main.c b/init/main.c
index b28673087ac006e79f4563b1a06d39eb1b163d37..db34c0ec47113a832695a3087ddd3129fdd2c976 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -631,6 +631,11 @@ asmlinkage void __init start_kernel(void)
        acpi_early_init(); /* before LAPIC and SMP init */
        sfi_init_late();
 
+       if (efi_enabled) {
+               efi_late_init();
+               efi_free_boot_services();
+       }
+
        ftrace_init();
 
        /* Do the rest non-__init'ed, we're now alive */