1 files changed, 5 insertions, 11 deletions

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 06853e670354..fa511acff7e6 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -926,11 +926,11 @@ void __init setup_arch(char **cmdline_p)
 #ifdef CONFIG_EFI
         if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,
                      "EL32", 4)) {
-                set_bit(EFI_BOOT, &x86_efi_facility);
+                set_bit(EFI_BOOT, &efi.flags);
         } else if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,
                      "EL64", 4)) {
-                set_bit(EFI_BOOT, &x86_efi_facility);
-                set_bit(EFI_64BIT, &x86_efi_facility);
+                set_bit(EFI_BOOT, &efi.flags);
+                set_bit(EFI_64BIT, &efi.flags);
         }
 
         if (efi_enabled(EFI_BOOT))
@@ -1239,14 +1239,8 @@ void __init setup_arch(char **cmdline_p)
         register_refined_jiffies(CLOCK_TICK_RATE);
 
 #ifdef CONFIG_EFI
-        /* Once setup is done above, unmap the EFI memory map on
-         * mismatched firmware/kernel archtectures since there is no
-         * support for runtime services.
-         */
-        if (efi_enabled(EFI_BOOT) && !efi_is_native()) {
-                pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n");
-                efi_unmap_memmap();
-        }
+        if (efi_enabled(EFI_BOOT))
+                efi_apply_memmap_quirks();
 #endif
 }