---

yaml --- r: 146039 b: refs/heads/master c: 4ed9f07 h: refs/heads/master i: 146037: a25d87a 146035: 87b586c 146031: 86a1a24 v: v3
git-mirror · Apr 20, 2009 · 8bb2f15 · 8bb2f15
1 parent 46cd5c6
commit 8bb2f15
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ae5b8790037d05d32746f521af146c32089bfec
+refs/heads/master: 4ed9f0716e46bb9646f26e73f4a1b5b24db7947a
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
@@ -77,7 +77,12 @@ config TRACING_SUPPORT
 
 if TRACING_SUPPORT
 
-menu "Tracers"
+menuconfig FTRACE
+	bool "Tracers"
+	help
+	 Enable the kernel tracing infrastructure.
+
+if FTRACE
 
 config FUNCTION_TRACER
 	bool "Kernel Function Tracer"
@@ -462,7 +467,7 @@ config MMIOTRACE_TEST
 
 	  Say N, unless you absolutely know what you are doing.
 
-endmenu
+endif # FTRACE
 
 endif # TRACING_SUPPORT