1 files changed, 1 insertions, 2 deletions

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 9c857f05cef0..e89acdf6b77b 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1196,8 +1196,7 @@ void __init setup_arch(char **cmdline_p)
          * mismatched firmware/kernel archtectures since there is no
          * support for runtime services.
          */
-        if (efi_enabled(EFI_BOOT) &&
-            IS_ENABLED(CONFIG_X86_64) != efi_enabled(EFI_64BIT)) {
+        if (efi_enabled(EFI_BOOT) && !efi_is_native()) {
                 pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n");
                 efi_unmap_memmap();
         }