diff options
| author | Kees Cook <kees.cook@canonical.com> | 2010-11-10 10:35:54 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-11-10 15:43:15 -0800 |
| commit | 6036f373ea03687d355634fa70fb04baa95ab75e (patch) | |
| tree | 4ac6def9efc7f5dbb1ce4b71f43b4d1ef3e324ad /arch/x86/mm | |
| parent | ebba638ae723d8a8fc2f7abce5ec18b688b791d7 (diff) | |
x86, cpu: Only CPU features determine NX capabilities
Fix the NX feature boot warning when NX is missing to correctly
reflect that BIOSes cannot disable NX now.
Signed-off-by: Kees Cook <kees.cook@canonical.com>
LKML-Reference: <1289414154-7829-5-git-send-email-kees.cook@canonical.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/setup_nx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c index a3250aa34086..410531d3c292 100644 --- a/arch/x86/mm/setup_nx.c +++ b/arch/x86/mm/setup_nx.c @@ -41,7 +41,7 @@ void __init x86_report_nx(void) { if (!cpu_has_nx) { printk(KERN_NOTICE "Notice: NX (Execute Disable) protection " - "missing in CPU or disabled in BIOS!\n"); + "missing in CPU!\n"); } else { #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) if (disable_nx) { |