1 files changed, 5 insertions, 2 deletions

diff --git a/init/main.c b/init/main.c
index 02df2ddc5f83..9cf77ab138a6 100644
--- a/init/main.c
+++ b/init/main.c
@@ -87,7 +87,6 @@ extern void init_IRQ(void);
 extern void fork_init(unsigned long);
 extern void mca_init(void);
 extern void sbus_init(void);
-extern void prio_tree_init(void);
 extern void radix_tree_init(void);
 #ifndef CONFIG_DEBUG_RODATA
 static inline void mark_rodata_ro(void) { }
@@ -548,7 +547,6 @@ asmlinkage void __init start_kernel(void)
         /* init some links before init_ISA_irqs() */
         early_irq_init();
         init_IRQ();
-        prio_tree_init();
         init_timers();
         hrtimers_init();
         softirq_init();
@@ -632,6 +630,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 */