Merge branch 'x86/urgent' into x86/mm

[linux-2.6.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 4c54bc0d8ff3cc632f10a2639628dbf0592f7715..b746deb9ebc649685c4c167f50e525541b8da292 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -770,6 +770,9 @@ void __init setup_arch(char **cmdline_p)
 
        finish_e820_parsing();
 
 
        finish_e820_parsing();
 

+       if (efi_enabled)
+               efi_init();
+

        dmi_scan_machine();
 
        dmi_check_system(bad_bios_dmi_table);
        dmi_scan_machine();
 
        dmi_check_system(bad_bios_dmi_table);


@@ -789,8 +792,6 @@ void __init setup_arch(char **cmdline_p)
        insert_resource(&iomem_resource, &data_resource);
        insert_resource(&iomem_resource, &bss_resource);
 
        insert_resource(&iomem_resource, &data_resource);
        insert_resource(&iomem_resource, &bss_resource);
 

-       if (efi_enabled)
-               efi_init();

 
 #ifdef CONFIG_X86_32
        if (ppro_with_ram_bug()) {
 
 #ifdef CONFIG_X86_32
        if (ppro_with_ram_bug()) {