diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-23 19:53:33 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:50:25 +0200 |
| commit | 7465252ea0121c9cd28be68dfb86293a7554a111 (patch) | |
| tree | 3bb600ac5bc3e595a7c903c719a9a4b5270dfc7b /arch | |
| parent | 11cd0bc140b5d66566c9eb49c1058737888cd75c (diff) | |
| download | blackbird-op-linux-7465252ea0121c9cd28be68dfb86293a7554a111.tar.gz blackbird-op-linux-7465252ea0121c9cd28be68dfb86293a7554a111.zip | |
x86: setup_arch 32bit move efi check later
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/setup_32.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 220d92faf0a9..52f4e01bb655 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c @@ -336,14 +336,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; @@ -363,10 +355,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) |
