diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-11-14 00:28:16 +0100 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-11-16 22:44:59 +0100 |
commit | 4763ed4d45522b876c97e1f7f4b659d211f75571 (patch) | |
tree | ae053500de9f1c374e4b7f34d8f21d45a5b961d2 /arch/x86/include/asm/proto.h | |
parent | x86, pageattr: Make set_memory_(x|nx) aware of NX support (diff) | |
download | linux-4763ed4d45522b876c97e1f7f4b659d211f75571.tar.xz linux-4763ed4d45522b876c97e1f7f4b659d211f75571.zip |
x86, mm: Clean up and simplify NX enablement
The 32- and 64-bit code used very different mechanisms for enabling
NX, but even the 32-bit code was enabling NX in head_32.S if it is
available. Furthermore, we had a bewildering collection of tests for
the available of NX.
This patch:
a) merges the 32-bit set_nx() and the 64-bit check_efer() function
into a single x86_configure_nx() function. EFER control is left
to the head code.
b) eliminates the nx_enabled variable entirely. Things that need to
test for NX enablement can verify __supported_pte_mask directly,
and cpu_has_nx gives the supported status of NX.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Vegard Nossum <vegardno@ifi.uio.no>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Chris Wright <chrisw@sous-sol.org>
LKML-Reference: <1258154897-6770-5-git-send-email-hpa@zytor.com>
Acked-by: Kees Cook <kees.cook@canonical.com>
Diffstat (limited to 'arch/x86/include/asm/proto.h')
-rw-r--r-- | arch/x86/include/asm/proto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h index 621f56d73121..add7f18f17a7 100644 --- a/arch/x86/include/asm/proto.h +++ b/arch/x86/include/asm/proto.h @@ -16,7 +16,7 @@ extern void ia32_sysenter_target(void); extern void syscall32_cpu_init(void); -extern void check_efer(void); +extern void x86_configure_nx(void); extern int reboot_force; |