Merge tag 'rodata-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[sfrench/cifs-2.6.git] / arch / x86 / Kconfig.debug

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 67eec55093a5dc97634aea899c4be86ff9f18f00..c4cba00dbdee5ec48af1fff44adbe0f7e6582c26 100644 (file)
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -109,25 +109,6 @@ config DEBUG_WX
 
          If in doubt, say "Y".
 
-config DEBUG_SET_MODULE_RONX
-       bool "Set loadable kernel module data as NX and text as RO"
-       depends on MODULES
-       ---help---
-         This option helps catch unintended modifications to loadable
-         kernel module's text and read-only data. It also prevents execution
-         of module data. Such protection may interfere with run-time code
-         patching and dynamic kernel tracing - and they might also protect
-         against certain classes of kernel exploits.
-         If in doubt, say "N".
-
-config DEBUG_NX_TEST
-       tristate "Testcase for the NX non-executable stack feature"
-       depends on DEBUG_KERNEL && m
-       ---help---
-         This option enables a testcase for the CPU NX capability
-         and the software setup of this feature.
-         If in doubt, say "N"
-
 config DOUBLEFAULT
        default y
        bool "Enable doublefault exception handler" if EXPERT