Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86, efi: Remove virtual-mode SetVirtualAddressMap call

The spec says that SetVirtualAddressMap doesn't work once you're in
virtual mode, so there's no point in having infrastructure for calling
it from there.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Link: http://lkml.kernel.org/r/1304623186-18261-1-git-send-email-mjg@redhat.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

authored by

Matthew Garrett and committed by
H. Peter Anvin
2b5e8ef3 0ee5623f

+1 -12
+1 -12
arch/x86/platform/efi/efi.c
··· 145 145 data_size, data); 146 146 } 147 147 148 - static efi_status_t virt_efi_set_virtual_address_map( 149 - unsigned long memory_map_size, 150 - unsigned long descriptor_size, 151 - u32 descriptor_version, 152 - efi_memory_desc_t *virtual_map) 153 - { 154 - return efi_call_virt4(set_virtual_address_map, 155 - memory_map_size, descriptor_size, 156 - descriptor_version, virtual_map); 157 - } 158 - 159 148 static efi_status_t __init phys_efi_set_virtual_address_map( 160 149 unsigned long memory_map_size, 161 150 unsigned long descriptor_size, ··· 561 572 efi.set_variable = virt_efi_set_variable; 562 573 efi.get_next_high_mono_count = virt_efi_get_next_high_mono_count; 563 574 efi.reset_system = virt_efi_reset_system; 564 - efi.set_virtual_address_map = virt_efi_set_virtual_address_map; 575 + efi.set_virtual_address_map = NULL; 565 576 if (__supported_pte_mask & _PAGE_NX) 566 577 runtime_code_page_mkexec(); 567 578 early_iounmap(memmap.map, memmap.nr_map * memmap.desc_size);