diff options
| author | Huang, Ying <ying.huang@intel.com> | 2008-06-02 14:26:21 +0800 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-06-05 15:10:02 +0200 |
| commit | ecacf09f7d26b2317e8b1d59fa40f62081fad0bb (patch) | |
| tree | ec54663f20002c4275b6e0f3ea194d616e4b222e /arch/x86/kernel/setup_64.c | |
| parent | d0ec2c6f2c2f0478b34ae78b3e65f60a561ac807 (diff) | |
x86: reserve EFI memory map with reserve_early
This patch reserves the EFI memory map with reserve_early(). Because EFI
memory map is allocated by bootloader, if it is not reserved by
reserved_early(), it may be overwritten through address returned by
find_e820_area().
Signed-off-by: Huang Ying <ying.huang@intel.com>
Cc: andi@firstfloor.org
Cc: mingo@redhat.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/setup_64.c')
| -rw-r--r-- | arch/x86/kernel/setup_64.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 2599b2744207..078c02f6f5f9 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c @@ -330,8 +330,10 @@ void __init setup_arch(char **cmdline_p) #endif #ifdef CONFIG_EFI if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, - "EL64", 4)) + "EL64", 4)) { efi_enabled = 1; + efi_reserve_early(); + } #endif ARCH_SETUP @@ -457,9 +459,6 @@ void __init setup_arch(char **cmdline_p) acpi_reserve_bootmem(); #endif - if (efi_enabled) - efi_reserve_bootmem(); - #ifdef CONFIG_X86_MPPARSE /* * Find and reserve possible boot-time SMP configuration: |