From c8002d834944520e60d736882cee22480656b471 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 20 Apr 2009 10:59:34 -0400 Subject: [PATCH] --- yaml --- r: 146040 b: refs/heads/master c: a7abe97fd8e7a6ccabba5a04a9f17be9211d418c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/Kconfig | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 62c7fda39409..fa6a6dd55575 100644 --- 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 index 3fa36d2bc290..450d3c2cfbd2 100644 --- a/trunk/kernel/trace/Kconfig +++ b/trunk/kernel/trace/Kconfig @@ -183,7 +183,7 @@ 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 @@ -191,6 +191,10 @@ config EVENT_TRACER 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