nx-emu: drop exec-shield sysctl, merge with disable_nx

[linux-flexiantxendom0-natty.git] / arch / x86 / kernel / cpu / common.c

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 20d704f..16d1096 100644 (file)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -833,7 +833,7 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
         *  If we have either disabled exec-shield on the boot command line,
         *  or we have NX, then we don't need to do this.
         */
-       if (exec_shield != 0) {
+       if (!disable_nx) {
 #ifdef CONFIG_X86_PAE
                if (!test_cpu_cap(c, X86_FEATURE_NX))
 #endif