---

yaml --- r: 116569 b: refs/heads/master c: 5f87f11 h: refs/heads/master i: 116567: 6389787 v: v3
git-mirror · Oct 14, 2008 · 604e31d · 604e31d
1 parent 4edc137
commit 604e31d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf569a932217b97e2fc2c48aa597fe29519a0cff
+refs/heads/master: 5f87f1121895dc09d2d1c1db5f14af6aa4ce3e94
diff --git a/trunk/init/Kconfig b/trunk/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/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
@@ -14,6 +14,7 @@ config TRACING
 	bool
 	select DEBUG_FS
 	select STACKTRACE
+	select TRACEPOINTS
 
 config FTRACE
 	bool "Kernel Function Tracer"