Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index baefc6dc553c40be31131f96f5d2dd78fe579804..182b3f97dcf494582b7c0acad854a89d251b7b01 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -448,6 +448,9 @@ static void __init parse_setup_data(void)
                case SETUP_DTB:
                        add_dtb(pa_data);
                        break;
+               case SETUP_EFI:
+                       parse_efi_setup(pa_data, data_len);
+                       break;
                default:
                        break;
                }
@@ -925,8 +928,6 @@ void __init setup_arch(char **cmdline_p)
        iomem_resource.end = (1ULL << boot_cpu_data.x86_phys_bits) - 1;
        setup_memory_map();
        parse_setup_data();
-       /* update the e820_saved too */
-       e820_reserve_setup_data();
 
        copy_edd();
 
@@ -988,6 +989,8 @@ void __init setup_arch(char **cmdline_p)
                early_dump_pci_devices();
 #endif
 
+       /* update the e820_saved too */
+       e820_reserve_setup_data();
        finish_e820_parsing();
 
        if (efi_enabled(EFI_BOOT))