aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-23 14:15:22 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-14 10:33:32 +0200
commit5f87f1121895dc09d2d1c1db5f14af6aa4ce3e94 (patch)
tree4b8354ab2dc0890d0d4c91d42ff9e13db50ebeab
parentcf569a932217b97e2fc2c48aa597fe29519a0cff (diff)
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>
-rw-r--r--init/Kconfig9
-rw-r--r--kernel/trace/Kconfig1
2 files changed, 6 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig
index d5994490b0b..031344f954f 100644
--- 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 263e9e6bbd6..cae2637d5e6 100644
--- 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"