summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/init.c
diff options
context:
space:
mode:
authorKees Cook <kees.cook@canonical.com>2009-11-13 15:28:17 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-11-16 13:44:59 -0800
commit4b0f3b81eb33ef18283aa71440cccfede1753ae0 (patch)
tree024e05ffc845d0942dddeb8f0b760815ab0b3373 /arch/x86/mm/init.c
parent4763ed4d45522b876c97e1f7f4b659d211f75571 (diff)
downloadop-kernel-dev-4b0f3b81eb33ef18283aa71440cccfede1753ae0.zip
op-kernel-dev-4b0f3b81eb33ef18283aa71440cccfede1753ae0.tar.gz
x86, mm: Report state of NX protections during boot
It is possible for x86_64 systems to lack the NX bit either due to the hardware lacking support or the BIOS having turned off the CPU capability, so NX status should be reported. Additionally, anyone booting NX-capable CPUs in 32bit mode without PAE will lack NX functionality, so this change provides feedback for that case as well. Signed-off-by: Kees Cook <kees.cook@canonical.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com> LKML-Reference: <1258154897-6770-6-git-send-email-hpa@zytor.com>
Diffstat (limited to 'arch/x86/mm/init.c')
-rw-r--r--arch/x86/mm/init.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 27ec2c2..d406c52 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -146,10 +146,6 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
use_gbpages = direct_gbpages;
#endif
- /* XXX: replace this with Kees' improved messages */
- if (__supported_pte_mask & _PAGE_NX)
- printk(KERN_INFO "NX (Execute Disable) protection: active\n");
-
/* Enable PSE if available */
if (cpu_has_pse)
set_in_cr4(X86_CR4_PSE);
OpenPOWER on IntegriCloud