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 <[email protected]>
This commit is contained in:
Ingo Molnar 2009-08-15 18:55:58 +02:00
commit fa08661af8
2538 changed files with 70259 additions and 36388 deletions

View file

@ -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