lkml.org 
[lkml]   [2008]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] x86: setup_arch 32bit move efi check later
    Date

    Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>

    ---
    arch/x86/kernel/setup_32.c | 17 ++++++++---------
    1 file changed, 8 insertions(+), 9 deletions(-)

    Index: linux-2.6/arch/x86/kernel/setup_32.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/kernel/setup_32.c
    +++ linux-2.6/arch/x86/kernel/setup_32.c
    @@ -337,14 +337,6 @@ void __init setup_arch(char **cmdline_p)
    early_ioremap_init();
    reserve_setup_data();

    -#ifdef CONFIG_EFI
    - if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,
    - "EL32", 4)) {
    - efi_enabled = 1;
    - efi_reserve_early();
    - }
    -#endif
    -
    ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);
    screen_info = boot_params.screen_info;
    edid_info = boot_params.edid_info;
    @@ -364,10 +356,17 @@ void __init setup_arch(char **cmdline_p)
    rd_prompt = ((boot_params.hdr.ram_size & RAMDISK_PROMPT_FLAG) != 0);
    rd_doload = ((boot_params.hdr.ram_size & RAMDISK_LOAD_FLAG) != 0);
    #endif
    +#ifdef CONFIG_EFI
    + if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,
    + "EL32", 4)) {
    + efi_enabled = 1;
    + efi_reserve_early();
    + }
    +#endif
    +
    ARCH_SETUP

    setup_memory_map();
    -
    copy_edd();

    if (!boot_params.hdr.root_flags)

    \
     
     \ /
      Last update: 2008-06-24 04:57    [W:0.021 / U:30.636 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site