41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From: Matt Fleming <matt.fleming@intel.com>
|
|
Date: Tue, 15 Nov 2011 12:56:14 +0000
|
|
Subject: [PATCH 02/11] x86: Don't use magic strings for EFI loader signature
|
|
|
|
commit f7d7d01be53cb47e0ae212c4e968aa28b82d2138 upstream.
|
|
|
|
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>
|
|
[bwh: Drop the hunk in arch/x86/kernel/setup.c which is unnecessary and
|
|
conflicts with a fix in 3.2.38]
|
|
---
|
|
arch/x86/include/asm/efi.h | 4 ++++
|
|
arch/x86/kernel/setup.c | 7 +------
|
|
2 files changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
--- a/arch/x86/include/asm/efi.h
|
|
+++ b/arch/x86/include/asm/efi.h
|
|
@@ -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)
|
|
@@ -37,6 +39,8 @@ extern unsigned long asmlinkage efi_call
|
|
|
|
#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);
|