summaryrefslogtreecommitdiff
path: root/arch/x86/platform/efi/efi_32.c
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2014-02-14 11:24:24 +0400
committerMatt Fleming <matt.fleming@intel.com>2014-02-14 13:30:19 +0400
commitc55d016f7a930dd1c995336017123b469a8c8f5a (patch)
tree428d313b67fe1cf2fc9e3c9e1ecc8e989726059f /arch/x86/platform/efi/efi_32.c
parentb28a960c42fcd9cfc987441fa6d1c1a471f0f9ed (diff)
downloadlinux-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_32.c')
-rw-r--r--arch/x86/platform/efi/efi_32.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
index 249b183cf417..0b74cdf7f816 100644
--- a/arch/x86/platform/efi/efi_32.c
+++ b/arch/x86/platform/efi/efi_32.c
@@ -77,3 +77,9 @@ void efi_call_phys_epilog(void)
local_irq_restore(efi_rt_eflags);
}
+
+void __init efi_runtime_mkexec(void)
+{
+ if (__supported_pte_mask & _PAGE_NX)
+ runtime_code_page_mkexec();
+}