diff options
| author | Huang, Ying <ying.huang@intel.com> | 2008-06-02 08:26:21 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-06-05 15:10:02 +0200 |
| commit | ecacf09f7d26b2317e8b1d59fa40f62081fad0bb (patch) | |
| tree | ec54663f20002c4275b6e0f3ea194d616e4b222e /arch/x86/kernel/setup_32.c | |
| parent | x86: reserve highmem pages via reserve_early (diff) | |
| download | linux-ecacf09f7d26b2317e8b1d59fa40f62081fad0bb.tar.xz linux-ecacf09f7d26b2317e8b1d59fa40f62081fad0bb.zip | |
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.c | 5 |
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 @@ #include <asm/bios_ebda.h> #include <asm/cacheflush.h> #include <asm/processor.h> +#include <asm/efi.h> /* This value is set up by the early boot code to point to the value immediately after the boot time page tables. It contains a *physical* @@ -683,8 +684,10 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_EFI if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, - "EL32", 4)) + "EL32", 4)) { efi_enabled = 1; + efi_reserve_early(); + } #endif ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev); |