diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-08-15 18:55:58 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-08-15 18:56:13 +0200 |
commit | fa08661af834875c9bd6f7f0b1b9388dc72a6585 (patch) | |
tree | c381fcfcfeb38515bfa93445c80ad9231343414d /init/Kconfig | |
parent | rcu: Add synchronize_sched_expedited() rcutorture doc + updates (diff) | |
parent | Linux 2.6.31-rc6 (diff) | |
download | linux-fa08661af834875c9bd6f7f0b1b9388dc72a6585.tar.xz linux-fa08661af834875c9bd6f7f0b1b9388dc72a6585.zip |
Merge commit 'v2.6.31-rc6' into core/rcu
Merge reason: the branch was on pre-rc1 .30, update to latest.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index d10f31dfa0b2..25373cf32672 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -932,6 +932,7 @@ menu "Performance Counters" config PERF_COUNTERS bool "Kernel Performance Counters" + default y if PROFILING depends on HAVE_PERF_COUNTERS select ANON_INODES help @@ -953,9 +954,17 @@ config PERF_COUNTERS Say Y if unsure. config EVENT_PROFILE - bool "Tracepoint profile sources" - depends on PERF_COUNTERS && EVENT_TRACER + bool "Tracepoint profiling sources" + depends on PERF_COUNTERS && EVENT_TRACING default y + help + Allow the use of tracepoints as software performance counters. + + When this is enabled, you can create perf counters based on + tracepoints using PERF_TYPE_TRACEPOINT and the tracepoint ID + found in debugfs://tracing/events/*/*/id. (The -e/--events + option to the perf tool can parse and interpret symbolic + tracepoints, in the subsystem:tracepoint_name format.) endmenu |