diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-07 07:00:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-07 07:00:07 +0200 |
| commit | 35dc9ec1076b79c31bf7ed538af008b7f23bb14d (patch) | |
| tree | f90affdd5dc45f47f8d5d84ea34c71e5e521e7a1 /arch/x86/mm | |
| parent | 0ec7ae928a9c19c2b7b8054507d5694a2597065e (diff) | |
| parent | 07837831047fb72856d1f61a726a4094397facd8 (diff) | |
| download | blackbird-op-linux-35dc9ec1076b79c31bf7ed538af008b7f23bb14d.tar.gz blackbird-op-linux-35dc9ec1076b79c31bf7ed538af008b7f23bb14d.zip | |
Merge branch 'linus' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/setup_nx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c index 8bea84724a7d..f65a33f505b6 100644 --- a/arch/x86/mm/setup_nx.c +++ b/arch/x86/mm/setup_nx.c @@ -32,8 +32,9 @@ early_param("noexec", noexec_setup); void x86_configure_nx(void) { - /* If disable_nx is set, clear NX on all new mappings going forward. */ - if (disable_nx) + if (boot_cpu_has(X86_FEATURE_NX) && !disable_nx) + __supported_pte_mask |= _PAGE_NX; + else __supported_pte_mask &= ~_PAGE_NX; } |
