diff options
author | Matt Fleming <matt.fleming@intel.com> | 2011-11-15 07:56:14 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-12-09 20:35:38 -0500 |
commit | f7d7d01be53cb47e0ae212c4e968aa28b82d2138 (patch) | |
tree | a5392888758468720073c955b1ebe1e620786c48 /arch/x86/include/asm/efi.h | |
parent | 8af21e7e71d1ac56d9b66fb787a14fd66af7f5f7 (diff) |
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: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1318848017-12301-1-git-send-email-matt@console-pimps.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/efi.h')
-rw-r--r-- | arch/x86/include/asm/efi.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index b8d8bfcd44a9..26d8c18d5faa 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h | |||
@@ -3,6 +3,8 @@ | |||
3 | 3 | ||
4 | #ifdef CONFIG_X86_32 | 4 | #ifdef CONFIG_X86_32 |
5 | 5 | ||
6 | #define EFI_LOADER_SIGNATURE "EL32" | ||
7 | |||
6 | extern unsigned long asmlinkage efi_call_phys(void *, ...); | 8 | extern unsigned long asmlinkage efi_call_phys(void *, ...); |
7 | 9 | ||
8 | #define efi_call_phys0(f) efi_call_phys(f) | 10 | #define efi_call_phys0(f) efi_call_phys(f) |
@@ -35,6 +37,8 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...); | |||
35 | 37 | ||
36 | #else /* !CONFIG_X86_32 */ | 38 | #else /* !CONFIG_X86_32 */ |
37 | 39 | ||
40 | #define EFI_LOADER_SIGNATURE "EL64" | ||
41 | |||
38 | extern u64 efi_call0(void *fp); | 42 | extern u64 efi_call0(void *fp); |
39 | extern u64 efi_call1(void *fp, u64 arg1); | 43 | extern u64 efi_call1(void *fp, u64 arg1); |
40 | extern u64 efi_call2(void *fp, u64 arg1, u64 arg2); | 44 | extern u64 efi_call2(void *fp, u64 arg1, u64 arg2); |