nx-emu: drop exec-shield sysctl, merge with disable_nx
authorKees Cook <kees.cook@canonical.com>
Fri, 5 Nov 2010 18:44:16 +0000 (11:44 -0700)
committerLeann Ogasawara <leann.ogasawara@canonical.com>
Mon, 28 Mar 2011 13:50:16 +0000 (06:50 -0700)
commitdcdabdc725a2a06fad5211839979b473f2e1f2b1
tree2e9a4ba3583c84aedaafa24421244754c2fb4371
parentb138b03e1b7ab8a97b0cc5cdaa0c5bdf77c53288
nx-emu: drop exec-shield sysctl, merge with disable_nx

The "exec-shield" sysctl doesn't really make much sense any more, and
the functionality is better merged with the existing "disable_nx"
kernel boot option.

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
arch/x86/kernel/cpu/common.c
arch/x86/mm/setup_nx.c
fs/binfmt_elf.c
include/linux/sched.h
kernel/sysctl.c