diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/efi.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/efi_32.c | 15 | ||||
| -rw-r--r-- | arch/x86/kernel/efi_64.c | 9 | ||||
| -rw-r--r-- | arch/x86/kernel/setup_32.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/setup_64.c | 4 |
5 files changed, 3 insertions, 29 deletions
diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c index 174b067b9d0..1411324a625 100644 --- a/arch/x86/kernel/efi.c +++ b/arch/x86/kernel/efi.c @@ -474,6 +474,8 @@ void __init efi_enter_virtual_mode(void) efi.reset_system = virt_efi_reset_system; efi.set_virtual_address_map = virt_efi_set_virtual_address_map; runtime_code_page_mkexec(); + early_iounmap(memmap.map, memmap.nr_map * memmap.desc_size); + memmap.map = NULL; } /* diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/kernel/efi_32.c index 114b896d757..cb91f985b4a 100644 --- a/arch/x86/kernel/efi_32.c +++ b/arch/x86/kernel/efi_32.c @@ -109,18 +109,3 @@ void efi_call_phys_epilog(void) local_irq_restore(efi_rt_eflags); } - -/* - * We need to map the EFI memory map again after paging_init(). - */ -void __init efi_map_memmap(void) -{ - memmap.map = NULL; - - memmap.map = early_ioremap((unsigned long) memmap.phys_map, - (memmap.nr_map * memmap.desc_size)); - if (memmap.map == NULL) - printk(KERN_ERR "Could not remap the EFI memmap!\n"); - - memmap.map_end = memmap.map + (memmap.nr_map * memmap.desc_size); -} diff --git a/arch/x86/kernel/efi_64.c b/arch/x86/kernel/efi_64.c index 9f8a7559439..4b73992c1e1 100644 --- a/arch/x86/kernel/efi_64.c +++ b/arch/x86/kernel/efi_64.c @@ -103,15 +103,6 @@ void __init efi_call_phys_epilog(void) local_irq_restore(efi_flags); } -/* - * We need to map the EFI memory map again after init_memory_mapping(). - */ -void __init efi_map_memmap(void) -{ - memmap.map = __va(memmap.phys_map); - memmap.map_end = memmap.map + (memmap.nr_map * memmap.desc_size); -} - void __init efi_reserve_bootmem(void) { reserve_bootmem_generic((unsigned long)memmap.phys_map, diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index c038b09b172..9c0ef4945a5 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) #ifdef CONFIG_X86_GENERICARCH generic_apic_probe(); #endif - if (efi_enabled) - efi_map_memmap(); #ifdef CONFIG_ACPI /* 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: |