diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-19 12:30:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-19 12:30:45 +0100 |
| commit | 68921fb4be8e567565aa704350e858db1c470eff (patch) | |
| tree | 69a7de3be302f128b6f6529e4e16635781abfd80 /arch/x86/mm | |
| parent | f7fb073463b2b4ea4d7b1848aaae04c6722354d3 (diff) | |
| parent | d9227958dc0e56976eaf452a213aee8415a9eb60 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-18.06-android
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/setup_nx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c index 90555bf60aa4..92e2eacb3321 100644 --- a/arch/x86/mm/setup_nx.c +++ b/arch/x86/mm/setup_nx.c @@ -31,7 +31,7 @@ early_param("noexec", noexec_setup); void x86_configure_nx(void) { - if (cpu_has_nx && !disable_nx) + if (boot_cpu_has(X86_FEATURE_NX) && !disable_nx) __supported_pte_mask |= _PAGE_NX; else __supported_pte_mask &= ~_PAGE_NX; @@ -39,7 +39,7 @@ void x86_configure_nx(void) void __init x86_report_nx(void) { - if (!cpu_has_nx) { + if (!boot_cpu_has(X86_FEATURE_NX)) { printk(KERN_NOTICE "Notice: NX (Execute Disable) protection " "missing in CPU!\n"); } else { |