diff options
| author | Satoru Takeuchi | 2013-02-14 01:07:35 +0100 |
|---|---|---|
| committer | Matt Fleming | 2013-02-14 11:36:18 +0100 |
| commit | 6b59e366e074d3962e04f01efb8acc10a33c0e1e (patch) | |
| tree | 0cc0f5de6582ee866c249deed2afd8fa6dee1407 /arch/x86/include | |
| parent | efivarfs: guid part of filenames are case-insensitive (diff) | |
| download | kernel-qcow2-linux-6b59e366e074d3962e04f01efb8acc10a33c0e1e.tar.gz kernel-qcow2-linux-6b59e366e074d3962e04f01efb8acc10a33c0e1e.tar.xz kernel-qcow2-linux-6b59e366e074d3962e04f01efb8acc10a33c0e1e.zip | |
x86, efi: remove duplicate code in setup_arch() by using, efi_is_native()
The check, "IS_ENABLED(CONFIG_X86_64) != efi_enabled(EFI_64BIT)",
in setup_arch() can be replaced by efi_is_enabled(). This change
remove duplicate code and improve readability.
Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Olof Johansson <olof@lixom.net>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/efi.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index 28677c55113f..60c89f30c727 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h @@ -102,7 +102,14 @@ extern void efi_call_phys_epilog(void); extern void efi_unmap_memmap(void); extern void efi_memory_uc(u64 addr, unsigned long size); -#ifndef CONFIG_EFI +#ifdef CONFIG_EFI + +static inline bool efi_is_native(void) +{ + return IS_ENABLED(CONFIG_X86_64) == efi_enabled(EFI_64BIT); +} + +#else /* * IF EFI is not configured, have the EFI calls return -ENOSYS. */ |