x86: 32-bit EFI runtime service support: fixes in sync with 64-bit support

[pandora-kernel.git] / arch / x86 / kernel / setup_32.c

diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index 2e805da..704550f 100644 (file)
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -648,9 +648,6 @@ void __init setup_arch(char **cmdline_p)
        printk(KERN_INFO "BIOS-provided physical RAM map:\n");
        print_memory_map(memory_setup());
 
-       if (efi_enabled)
-               efi_init();
-
        copy_edd();
 
        if (!boot_params.hdr.root_flags)
@@ -677,6 +674,9 @@ void __init setup_arch(char **cmdline_p)
        strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
        *cmdline_p = command_line;
 
+       if (efi_enabled)
+               efi_init();
+
        max_low_pfn = setup_memory();
 
 #ifdef CONFIG_VMI