summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQian Cai <cai@lca.pw>2020-01-22 14:14:30 -0500
committerIngo Molnar <mingo@kernel.org>2020-01-25 10:14:36 +0100
commitcada0b6dbb8c07ab353d209437243bec8cc7c64a (patch)
treee948a272ce338bc93198b2275dabe0e503eab8af
parent0779221e7166c6865555bb6d29bf6af76fc316bd (diff)
downloadlinux-cada0b6dbb8c07ab353d209437243bec8cc7c64a.tar.bz2
efi/libstub/x86: Fix EFI server boot failure
x86_64 EFI systems are unable to boot due to a typo in a recent commit: EFI config tables not found. -- System halted This was probably due to the absense of CONFIG_EFI_MIXED=y in testing. Fixes: 796eb8d26a57 ("efi/libstub/x86: Use const attribute for efi_is_64bit()") Signed-off-by: Qian Cai <cai@lca.pw> Acked-by: Ard Biesheuvel <ardb@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: tglx@linutronix.de Cc: linux-efi@vger.kernel.org Link: https://lore.kernel.org/r/20200122191430.4888-1-cai@lca.pw
-rw-r--r--arch/x86/boot/compressed/eboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 82e26d0ff075..287393d725f0 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -32,7 +32,7 @@ __attribute_const__ bool efi_is_64bit(void)
{
if (IS_ENABLED(CONFIG_EFI_MIXED))
return efi_is64;
- return IS_ENABLED(CONFIG_X64_64);
+ return IS_ENABLED(CONFIG_X86_64);
}
static efi_status_t