The following commit has been merged into the efi/core branch of tip: Commit-ID: bc13809f1c47245cd584f4ad31ad06a5c5f40e54 Gitweb: https://git.kernel.org/tip/bc13809f1c47245cd584f4ad31ad06a5c5f40e54 Author: Heinrich Schuchardt <xypron.g...@gmx.de> AuthorDate: Sat, 03 Oct 2020 08:03:56 +02:00 Committer: Ard Biesheuvel <a...@kernel.org> CommitterDate: Mon, 26 Oct 2020 08:06:36 +01:00
efi/libstub/x86: simplify efi_is_native() CONFIG_EFI_MIXED depends on CONFIG_X86_64=y. There is no need to check CONFIG_X86_64 again. Signed-off-by: Heinrich Schuchardt <xypron.g...@gmx.de> Link: https://lore.kernel.org/r/20201003060356.4913-1-xypron.g...@gmx.de Signed-off-by: Ard Biesheuvel <a...@kernel.org> --- arch/x86/include/asm/efi.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index bc9758e..7673dc8 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h @@ -213,8 +213,6 @@ static inline bool efi_is_64bit(void) static inline bool efi_is_native(void) { - if (!IS_ENABLED(CONFIG_X86_64)) - return true; return efi_is_64bit(); }
