Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b59e366 authored by Satoru Takeuchi's avatar Satoru Takeuchi Committed by Matt Fleming
Browse files

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: default avatarSatoru 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: default avatarMatt Fleming <matt.fleming@intel.com>
parent da27a243

arch/x86/include/asm/efi.h

+8 −1
Original line number Diff line number Diff line
@@ -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.

 */

arch/x86/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -1135,8 +1135,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();

	}

arch/x86/platform/efi/efi.c

+0 −5
Original line number Diff line number Diff line
@@ -69,11 +69,6 @@ struct efi_memory_map memmap; 
static struct efi efi_phys __initdata;

static efi_system_table_t efi_systab __initdata;



static inline bool efi_is_native(void)

{

	return IS_ENABLED(CONFIG_X86_64) == efi_enabled(EFI_64BIT);

}



unsigned long x86_efi_facility;



/*