lkml.org 
[lkml]   [2011]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/efi] x86: Don't use magic strings for EFI loader signature
    Commit-ID:  f7d7d01be53cb47e0ae212c4e968aa28b82d2138
    Gitweb: http://git.kernel.org/tip/f7d7d01be53cb47e0ae212c4e968aa28b82d2138
    Author: Matt Fleming <matt.fleming@intel.com>
    AuthorDate: Tue, 15 Nov 2011 12:56:14 +0000
    Committer: H. Peter Anvin <hpa@linux.intel.com>
    CommitDate: Fri, 9 Dec 2011 17:35:38 -0800

    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>
    ---
    arch/x86/include/asm/efi.h | 4 ++++
    arch/x86/kernel/setup.c | 7 +------
    2 files changed, 5 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
    index b8d8bfc..26d8c18 100644
    --- 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)
    @@ -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);
    diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
    index 9a9e40f..4d5243c 100644
    --- a/arch/x86/kernel/setup.c
    +++ b/arch/x86/kernel/setup.c
    @@ -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();
    }

    \
     
     \ /
      Last update: 2011-12-10 03:41    [W:0.035 / U:59.108 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site