diff options
| author | Borislav Petkov <bp@suse.de> | 2014-02-14 11:24:24 +0400 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-02-14 13:30:19 +0400 |
| commit | c55d016f7a930dd1c995336017123b469a8c8f5a (patch) | |
| tree | 428d313b67fe1cf2fc9e3c9e1ecc8e989726059f /arch/x86/platform/efi/efi.c | |
| parent | b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed (diff) | |
| download | linux-c55d016f7a930dd1c995336017123b469a8c8f5a.tar.xz | |
x86/efi: Fix 32-bit fallout
We do not enable the new efi memmap on 32-bit and thus we need to run
runtime_code_page_mkexec() unconditionally there. Fix that.
Reported-and-tested-by: Lejun Zhu <lejun.zhu@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch/x86/platform/efi/efi.c')
| -rw-r--r-- | arch/x86/platform/efi/efi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index d62ec87a2b26..1a201ac7cef8 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -792,7 +792,7 @@ void __init efi_set_executable(efi_memory_desc_t *md, bool executable) set_memory_nx(addr, npages); } -static void __init runtime_code_page_mkexec(void) +void __init runtime_code_page_mkexec(void) { efi_memory_desc_t *md; void *p; @@ -1069,8 +1069,7 @@ void __init efi_enter_virtual_mode(void) efi.update_capsule = virt_efi_update_capsule; efi.query_capsule_caps = virt_efi_query_capsule_caps; - if (efi_enabled(EFI_OLD_MEMMAP) && (__supported_pte_mask & _PAGE_NX)) - runtime_code_page_mkexec(); + efi_runtime_mkexec(); kfree(new_memmap); |