x86: rodata config hookup

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2 files changed, 18 insertions, 0 deletions

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 347e33e5f395..2d0bd33b73aa 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -68,6 +68,22 @@ config DEBUG_RODATA
           data. This is recommended so that we can catch kernel bugs sooner.
           If in doubt, say "Y".
 
+config DEBUG_RODATA_TEST
+        bool "Testcase for the DEBUG_RODATA feature"
+        depends on DEBUG_RODATA
+        help
+          This option enables a testcase for the DEBUG_RODATA
+          feature as well as for the change_page_attr() infrastructure.
+          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 4KSTACKS
         bool "Use 4Kb for kernel stacks instead of 8Kb"
         depends on DEBUG_KERNEL
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 5bdb0f0431e9..6f813009d44b 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -64,6 +64,8 @@ obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
 
 obj-$(CONFIG_K8_NB)             += k8.o
 obj-$(CONFIG_MGEODE_LX)         += geode_32.o mfgpt_32.o
+obj-$(CONFIG_DEBUG_RODATA_TEST) += test_rodata.o
+obj-$(CONFIG_DEBUG_NX_TEST)     += test_nx.o
 
 obj-$(CONFIG_VMI)               += vmi_32.o vmiclock_32.o
 obj-$(CONFIG_PARAVIRT)          += paravirt.o paravirt_patch_$(BITS).o