lkml.org 
[lkml]   [2012]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCHv3 1/4] efi: Add a stub for efi_enter_virtual_mode on non-x86
    This eliminates an ifdef in init/main.c.

    Signed-off-by: Josh Triplett <josh@joshtriplett.org>
    ---
    include/linux/efi.h | 4 ++++
    init/main.c | 2 --
    2 files changed, 4 insertions(+), 2 deletions(-)

    diff --git a/include/linux/efi.h b/include/linux/efi.h
    index ec45ccd..52fbedf 100644
    --- a/include/linux/efi.h
    +++ b/include/linux/efi.h
    @@ -495,7 +495,11 @@ extern void *efi_get_pal_addr (void);
    extern void efi_map_pal_code (void);
    extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg);
    extern void efi_gettimeofday (struct timespec *ts);
    +#ifdef CONFIG_X86
    extern void efi_enter_virtual_mode (void); /* switch EFI to virtual mode, if possible */
    +#else
    +static void efi_enter_virtual_mode(void) {}
    +#endif
    extern u64 efi_get_iobase (void);
    extern u32 efi_mem_type (unsigned long phys_addr);
    extern u64 efi_mem_attributes (unsigned long phys_addr);
    diff --git a/init/main.c b/init/main.c
    index b286730..ebb1ba5 100644
    --- a/init/main.c
    +++ b/init/main.c
    @@ -602,10 +602,8 @@ asmlinkage void __init start_kernel(void)
    calibrate_delay();
    pidmap_init();
    anon_vma_init();
    -#ifdef CONFIG_X86
    if (efi_enabled)
    efi_enter_virtual_mode();
    -#endif
    thread_info_cache_init();
    cred_init();
    fork_init(totalram_pages);
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2012-09-09 00:41    [W:0.022 / U:30.392 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site