lkml.org 
[lkml]   [2011]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/efi] x86, efi: Remove virtual-mode SetVirtualAddressMap call
    Commit-ID:  2b5e8ef35bc89eee944c0627edacbb1fea5a1b84
    Gitweb: http://git.kernel.org/tip/2b5e8ef35bc89eee944c0627edacbb1fea5a1b84
    Author: Matthew Garrett <mjg@redhat.com>
    AuthorDate: Thu, 5 May 2011 15:19:42 -0400
    Committer: H. Peter Anvin <hpa@linux.intel.com>
    CommitDate: Mon, 9 May 2011 12:14:25 -0700

    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>
    ---
    arch/x86/platform/efi/efi.c | 13 +------------
    1 files changed, 1 insertions(+), 12 deletions(-)

    diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
    index 0fe27d7..f2e4fe9 100644
    --- a/arch/x86/platform/efi/efi.c
    +++ b/arch/x86/platform/efi/efi.c
    @@ -145,17 +145,6 @@ static void virt_efi_reset_system(int reset_type,
    data_size, data);
    }

    -static efi_status_t virt_efi_set_virtual_address_map(
    - unsigned long memory_map_size,
    - unsigned long descriptor_size,
    - u32 descriptor_version,
    - efi_memory_desc_t *virtual_map)
    -{
    - return efi_call_virt4(set_virtual_address_map,
    - memory_map_size, descriptor_size,
    - descriptor_version, virtual_map);
    -}
    -
    static efi_status_t __init phys_efi_set_virtual_address_map(
    unsigned long memory_map_size,
    unsigned long descriptor_size,
    @@ -572,7 +561,7 @@ void __init efi_enter_virtual_mode(void)
    efi.set_variable = virt_efi_set_variable;
    efi.get_next_high_mono_count = virt_efi_get_next_high_mono_count;
    efi.reset_system = virt_efi_reset_system;
    - efi.set_virtual_address_map = virt_efi_set_virtual_address_map;
    + efi.set_virtual_address_map = NULL;
    if (__supported_pte_mask & _PAGE_NX)
    runtime_code_page_mkexec();
    early_iounmap(memmap.map, memmap.nr_map * memmap.desc_size);

    \
     
     \ /
      Last update: 2011-05-10 01:19    [W:0.039 / U:0.532 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site