lkml.org 
[lkml]   [2011]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/9] x86: Don't use magic strings for EFI loader signature
    Date
    From: Matt Fleming <matt.fleming@linux.intel.com>

    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>
    Cc: "H. Peter Anvin" <hpa@linux.intel.com>
    Signed-off-by: Matt Fleming <matt.fleming@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 7093e4a..844f735 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)
    @@ -37,6 +39,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 afaf384..eca164b 100644
    --- a/arch/x86/kernel/setup.c
    +++ b/arch/x86/kernel/setup.c
    @@ -750,12 +750,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();
    }
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-08-11 13:03    [W:0.042 / U:0.348 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site