From a47db1246e560a02ba2bbbb216cf34f98f9086a2 Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Tue, 22 Feb 2011 21:53:12 +0100
Subject: [PATCH] --- yaml --- r: 234468 b: refs/heads/master c:
 9826e8329bc160e4cc58b83019f3f056965e42d0 h: refs/heads/master v: v3

---
 [refs]                                       |  2 +-
 trunk/tools/perf/Documentation/perf-lock.txt | 12 ++++++++++--
 trunk/tools/perf/builtin-lock.c              |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d60720db01f2..4d5918fe4cbe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6435a5e39d3e01a1a73a925ed53ee18619b0a368
+refs/heads/master: 9826e8329bc160e4cc58b83019f3f056965e42d0
diff --git a/trunk/tools/perf/Documentation/perf-lock.txt b/trunk/tools/perf/Documentation/perf-lock.txt
index 921de259ea10..4a26a2f3a6a3 100644
--- a/trunk/tools/perf/Documentation/perf-lock.txt
+++ b/trunk/tools/perf/Documentation/perf-lock.txt
@@ -24,8 +24,8 @@ and statistics with this 'perf lock' command.
 
   'perf lock report' reports statistical data.
 
-OPTIONS
--------
+COMMON OPTIONS
+--------------
 
 -i::
 --input=<file>::
@@ -39,6 +39,14 @@ OPTIONS
 --dump-raw-trace::
         Dump raw trace in ASCII.
 
+REPORT OPTIONS
+--------------
+
+-k::
+--key=<value>::
+        Sorting key. Possible values: acquired (default), contended,
+        wait_total, wait_max, wait_min.
+
 SEE ALSO
 --------
 linkperf:perf[1]
diff --git a/trunk/tools/perf/builtin-lock.c b/trunk/tools/perf/builtin-lock.c
index e00d93847c44..2e93f99b1480 100644
--- a/trunk/tools/perf/builtin-lock.c
+++ b/trunk/tools/perf/builtin-lock.c
@@ -893,7 +893,7 @@ static const char * const report_usage[] = {
 
 static const struct option report_options[] = {
 	OPT_STRING('k', "key", &sort_key, "acquired",
-		    "key for sorting"),
+		    "key for sorting (acquired / contended / wait_total / wait_max / wait_min)"),
 	/* TODO: type */
 	OPT_END()
 };