diff options
author | Huang, Ying <ying.huang@intel.com> | 2008-01-30 07:34:10 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:34:10 -0500 |
commit | a3828064be4ed8e95907d3943e7af13cb709694d (patch) | |
tree | b5458f61681a0bf4c3640f28c51ccd0a24c0c6b5 /arch/x86/kernel/setup_32.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_32.c')
-rw-r--r-- | arch/x86/kernel/setup_32.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index c038b09b1723..9c0ef4945a58 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
@@ -808,8 +808,6 @@ void __init setup_arch(char **cmdline_p) | |||
808 | #ifdef CONFIG_X86_GENERICARCH | 808 | #ifdef CONFIG_X86_GENERICARCH |
809 | generic_apic_probe(); | 809 | generic_apic_probe(); |
810 | #endif | 810 | #endif |
811 | if (efi_enabled) | ||
812 | efi_map_memmap(); | ||
813 | 811 | ||
814 | #ifdef CONFIG_ACPI | 812 | #ifdef CONFIG_ACPI |
815 | /* | 813 | /* |