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

Commit f7d7d01b authored by Matt Fleming's avatar Matt Fleming Committed by H. Peter Anvin
Browse files

x86: Don't use magic strings for EFI loader signature 



Introduce a symbol, EFI_LOADER_SIGNATURE instead of using the magic
strings, which also helps to reduce the amount of ifdeffery.

Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1318848017-12301-1-git-send-email-matt@console-pimps.org


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 8af21e7e

arch/x86/include/asm/efi.h

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 


#ifdef CONFIG_X86_32



#define EFI_LOADER_SIGNATURE	"EL32"



extern unsigned long asmlinkage efi_call_phys(void *, ...);



#define efi_call_phys0(f)		efi_call_phys(f)
@@ -35,6 +37,8 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...); 


#else /* !CONFIG_X86_32 */



#define EFI_LOADER_SIGNATURE	"EL64"



extern u64 efi_call0(void *fp);

extern u64 efi_call1(void *fp, u64 arg1);

extern u64 efi_call2(void *fp, u64 arg1, u64 arg2);

arch/x86/kernel/setup.c

+1 −6
Original line number Diff line number Diff line
@@ -752,12 +752,7 @@ void __init setup_arch(char **cmdline_p) 
#endif

#ifdef CONFIG_EFI

	if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,

#ifdef CONFIG_X86_32

		     "EL32",

#else

		     "EL64",

#endif

	 4)) {

		     EFI_LOADER_SIGNATURE, 4)) {

		efi_enabled = 1;

		efi_memblock_x86_reserve_range();

	}