prio_tree: remove

[karo-tx-linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index b28673087ac006e79f4563b1a06d39eb1b163d37..313360fe1118ffd17591da27c2ba7dacb499c126 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -86,7 +86,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) { }
@@ -547,7 +546,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();
@@ -631,6 +629,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 */