aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup_32.c
diff options
context:
space:
mode:
authorHuang, Ying <ying.huang@intel.com>2008-06-02 02:26:21 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-06-05 09:10:02 -0400
commitecacf09f7d26b2317e8b1d59fa40f62081fad0bb (patch)
treeec54663f20002c4275b6e0f3ea194d616e4b222e /arch/x86/kernel/setup_32.c
parentd0ec2c6f2c2f0478b34ae78b3e65f60a561ac807 (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_32.c')
-rw-r--r--arch/x86/kernel/setup_32.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index 0ec6480aaa27..2960cbecfa5a 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -67,6 +67,7 @@
67#include <asm/bios_ebda.h> 67#include <asm/bios_ebda.h>
68#include <asm/cacheflush.h> 68#include <asm/cacheflush.h>
69#include <asm/processor.h> 69#include <asm/processor.h>
70#include <asm/efi.h>
70 71
71/* This value is set up by the early boot code to point to the value 72/* This value is set up by the early boot code to point to the value
72 immediately after the boot time page tables. It contains a *physical* 73 immediately after the boot time page tables. It contains a *physical*
@@ -683,8 +684,10 @@ void __init setup_arch(char **cmdline_p)
683 684
684#ifdef CONFIG_EFI 685#ifdef CONFIG_EFI
685 if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, 686 if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,
686 "EL32", 4)) 687 "EL32", 4)) {
687 efi_enabled = 1; 688 efi_enabled = 1;
689 efi_reserve_early();
690 }
688#endif 691#endif
689 692
690 ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev); 693 ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);