[PATCH] x86: setup_arch 64bit move efi_init calling early
- Date: Mon, 23 Jun 2008 19:52:04 -0700
- From: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
- Subject: [PATCH] x86: setup_arch 64bit move efi_init calling early
Signed-off-by: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
---
arch/x86/kernel/setup_32.c | 32 ++++++++++++++++++--------------
arch/x86/kernel/setup_64.c | 14 +++++++-------
2 files changed, 25 insertions(+), 21 deletions(-)
Index: linux-2.6/arch/x86/kernel/setup_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup_64.c
+++ linux-2.6/arch/x86/kernel/setup_64.c
@@ -260,6 +260,9 @@ void __init setup_arch(char **cmdline_p)
insert_resource(&iomem_resource, &data_resource);
insert_resource(&iomem_resource, &bss_resource);
+ if (efi_enabled)
+ efi_init();
+
early_gart_iommu_check();
e820_register_active_regions(0, 0, -1UL);
@@ -286,8 +289,6 @@ void __init setup_arch(char **cmdline_p)
check_efer();
max_pfn_mapped = init_memory_mapping(0, (end_pfn << PAGE_SHIFT));
- if (efi_enabled)
- efi_init();
vsmp_init();
--
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/