tracing: Move tracing test module configs together

The MMIO test module was by itself, move it to the other test modules. Also,
add the text "Test module" to PREEMPTIRQ_DELAY_TEST as that create a test
module as well.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 32fcbc0..47d0149 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -680,16 +680,6 @@ config TRACE_EVENT_INJECT
 
          If unsure, say N.
 
-config MMIOTRACE_TEST
-       tristate "Test module for mmiotrace"
-       depends on MMIOTRACE && m
-       help
-         This is a dumb module for testing mmiotrace. It is very dangerous
-         as it will write garbage to IO memory starting at a given address.
-         However, it should be safe to use on e.g. unused portion of VRAM.
-
-         Say N, unless you absolutely know what you are doing.
-
 config TRACEPOINT_BENCHMARK
        bool "Add tracepoint that benchmarks tracepoints"
        help
@@ -759,8 +749,18 @@ config RING_BUFFER_STARTUP_TEST
 
         If unsure, say N
 
+config MMIOTRACE_TEST
+       tristate "Test module for mmiotrace"
+       depends on MMIOTRACE && m
+       help
+         This is a dumb module for testing mmiotrace. It is very dangerous
+         as it will write garbage to IO memory starting at a given address.
+         However, it should be safe to use on e.g. unused portion of VRAM.
+
+         Say N, unless you absolutely know what you are doing.
+
 config PREEMPTIRQ_DELAY_TEST
-       tristate "Preempt / IRQ disable delay thread to test latency tracers"
+       tristate "Test module to create a preempt / IRQ disable delay thread to test latency tracers"
        depends on m
        help
          Select this option to build a test module that can help test latency