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

[linux-flexiantxendom0-natty.git] / fs / binfmt_elf.c

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index fbf9002..9211f58 100644 (file)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -717,7 +717,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
         * Turn off the CS limit completely if exec-shield disabled or
         * NX active:
         */
-       if (!exec_shield || executable_stack != EXSTACK_DISABLE_X || (__supported_pte_mask & _PAGE_NX))
+       if (disable_nx || executable_stack != EXSTACK_DISABLE_X || (__supported_pte_mask & _PAGE_NX))
                arch_add_exec_range(current->mm, -1);
 #endif