aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/mm/init.c')
-rw-r--r--arch/x86/mm/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 73ffd5536f62..27ec2c23fd47 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -146,8 +146,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
146 use_gbpages = direct_gbpages; 146 use_gbpages = direct_gbpages;
147#endif 147#endif
148 148
149 set_nx(); 149 /* XXX: replace this with Kees' improved messages */
150 if (nx_enabled) 150 if (__supported_pte_mask & _PAGE_NX)
151 printk(KERN_INFO "NX (Execute Disable) protection: active\n"); 151 printk(KERN_INFO "NX (Execute Disable) protection: active\n");
152 152
153 /* Enable PSE if available */ 153 /* Enable PSE if available */