diff options
| author | Huang, Ying <ying.huang@intel.com> | 2008-01-30 13:34:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:34:10 +0100 |
| commit | a3828064be4ed8e95907d3943e7af13cb709694d (patch) | |
| tree | b5458f61681a0bf4c3640f28c51ccd0a24c0c6b5 /arch/x86/kernel/setup_64.c | |
| parent | bed23c67fe077b4d66cb3329263d7cfa33b3fd67 (diff) | |
x86: fixes some bugs about EFI memory map handling
This patch fixes some bugs of EFI memory handing code.
- On x86_64, it is possible that EFI memory map can not be mapped via
identity map, so efi_map_memmap is removed, just use early_ioremap.
- On i386, the EFI memory map mapping take effect cross paging_init,
so it is not necessary to use efi_map_memmap.
- EFI memory map is unmapped in efi_enter_virtual_mode to avoid
early_ioremap leak.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 4ccad185ab7..697533e8682 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c @@ -378,10 +378,8 @@ void __init setup_arch(char **cmdline_p) acpi_reserve_bootmem(); #endif - if (efi_enabled) { - efi_map_memmap(); + if (efi_enabled) efi_reserve_bootmem(); - } /* * Find and reserve possible boot-time SMP configuration: |