summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-03-01 09:26:35 +0100
committerIngo Molnar <mingo@elte.hu>2010-03-01 09:26:35 +0100
commita69cc61b1595773041c47ae993853dafda5eecc1 (patch)
tree7742d709f4ccdc2e0f104289a55d480786d972b4 /lib
parent1b39dbd7b12639da9da84d2317693581966f4b2b (diff)
parent3d083407a16698de86b42aee0da2ffb280b5cb7e (diff)
Merge branch 'perf/core' into auto-latest
Conflicts: tools/perf/util/probe-event.c
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig.debug8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c0b929302f7e..6551cff673bf 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -545,6 +545,14 @@ config LOCK_STAT
For more details, see Documentation/lockstat.txt
+ This also enables lock events required by "perf lock",
+ subcommand of perf.
+ If you want to use "perf lock", you also need to turn on
+ CONFIG_EVENT_TRACING.
+
+ CONFIG_LOCK_STAT defines "contended" and "acquired" lock events.
+ (CONFIG_LOCKDEP defines "acquire" and "release" events.)
+
config DEBUG_LOCKDEP
bool "Lock dependency engine debugging"
depends on DEBUG_KERNEL && LOCKDEP