---

yaml --- r: 146040 b: refs/heads/master c: a7abe97 h: refs/heads/master v: v3
git-mirror · Apr 20, 2009 · c8002d8 · c8002d8
1 parent 8bb2f15
commit c8002d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ed9f0716e46bb9646f26e73f4a1b5b24db7947a
+refs/heads/master: a7abe97fd8e7a6ccabba5a04a9f17be9211d418c
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
@@ -183,14 +183,18 @@ config CONTEXT_SWITCH_TRACER
 	  This tracer gets called from the context switch and records
 	  all switching of tasks.
 
-config EVENT_TRACER
+config ENABLE_EVENT_TRACING
 	bool "Trace various events in the kernel"
 	select TRACING
 	help
 	  This tracer hooks to various trace points in the kernel
 	  allowing the user to pick and choose which trace point they
 	  want to trace.
 
+	  Note, all tracers enable event tracing. This option is
+	  only a convenience to enable event tracing when no other
+	  tracers are selected.
+
 config FTRACE_SYSCALLS
 	bool "Trace syscalls"
 	depends on HAVE_FTRACE_SYSCALLS