[PATCH] x86: setup_arch 32bit move efi check later
- Date: Mon, 23 Jun 2008 19:53:33 -0700
- From: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
- Subject: [PATCH] x86: setup_arch 32bit move efi check later
Signed-off-by: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
---
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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/