tracing: clean up tracepoints kconfig structure

do not expose users to CONFIG_TRACEPOINTS - tracers can select it
just fine.

update ftrace to select CONFIG_TRACEPOINTS.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/init/Kconfig b/init/Kconfig
index d5994490b0b07c1c917bb1dbd2c53411dafbe420..031344f954fd4a2029ff315a9813b52c16f051e4 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -771,11 +771,12 @@ config PROFILING
          Say Y here to enable the extended profiling support mechanisms used
          by profilers such as OProfile.
 
+#
+# Place an empty function call at each tracepoint site. Can be
+# dynamically changed for a probe function.
+#
 config TRACEPOINTS
-       bool "Activate tracepoints"
-       help
-         Place an empty function call at each tracepoint site. Can be
-         dynamically changed for a probe function.
+       bool
 
 config MARKERS
        bool "Activate markers"

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 263e9e6bbd60912132ba18077c0fa0d66d7e1ffb..cae2637d5e68eec46c93bf211702ce800743d3bc 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -14,6 +14,7 @@ config TRACING
        bool
        select DEBUG_FS
        select STACKTRACE
+       select TRACEPOINTS
 
 config FTRACE
        bool "Kernel Function Tracer"