From 5d7dba423dfab20a4b1167147087df03dbc72af1 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@gmail.com>
Date: Sun, 29 Jan 2012 17:55:56 +0900
Subject: [PATCH] --- yaml --- r: 288631 b: refs/heads/master c:
 d1eec3ecaef083affaf3210246b01b6e80d3a44e h: refs/heads/master i:   288629:
 fe39743c57af6c8a0cb93cba1823972e2f2b68a4   288627:
 1101027423afb721a00dcb1eef2dd10b1d7cc6fa   288623:
 000443a6f09dbab0f318af5378c220638523a2a0 v: v3

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

diff --git a/[refs] b/[refs]
index c2f880113f76..cb8704a9b7c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 008953dc6a3164b7ec2be2684a8fad1e636d5648
+refs/heads/master: d1eec3ecaef083affaf3210246b01b6e80d3a44e
diff --git a/trunk/tools/perf/Documentation/perf-lock.txt b/trunk/tools/perf/Documentation/perf-lock.txt
index d6b2a4f2108b..c7f5f55634ac 100644
--- a/trunk/tools/perf/Documentation/perf-lock.txt
+++ b/trunk/tools/perf/Documentation/perf-lock.txt
@@ -8,7 +8,7 @@ perf-lock - Analyze lock events
 SYNOPSIS
 --------
 [verse]
-'perf lock' {record|report|trace}
+'perf lock' {record|report|script|info}
 
 DESCRIPTION
 -----------
@@ -20,10 +20,13 @@ and statistics with this 'perf lock' command.
   produces the file "perf.data" which contains tracing
   results of lock events.
 
-  'perf lock trace' shows raw lock events.
-
   'perf lock report' reports statistical data.
 
+  'perf lock script' shows raw lock events.
+
+  'perf lock info' shows metadata like threads or addresses
+  of lock instances.
+
 COMMON OPTIONS
 --------------
 
@@ -47,6 +50,17 @@ REPORT OPTIONS
         Sorting key. Possible values: acquired (default), contended,
         wait_total, wait_max, wait_min.
 
+INFO OPTIONS
+------------
+
+-t::
+--threads::
+	dump thread list in perf.data
+
+-m::
+--map::
+	dump map of lock instances (address:name table)
+
 SEE ALSO
 --------
 linkperf:perf[1]
diff --git a/trunk/tools/perf/builtin-lock.c b/trunk/tools/perf/builtin-lock.c
index 2296c391d0f5..12c814838993 100644
--- a/trunk/tools/perf/builtin-lock.c
+++ b/trunk/tools/perf/builtin-lock.c
@@ -922,12 +922,12 @@ static const struct option info_options[] = {
 	OPT_BOOLEAN('t', "threads", &info_threads,
 		    "dump thread list in perf.data"),
 	OPT_BOOLEAN('m', "map", &info_map,
-		    "map of lock instances (name:address table)"),
+		    "map of lock instances (address:name table)"),
 	OPT_END()
 };
 
 static const char * const lock_usage[] = {
-	"perf lock [<options>] {record|trace|report}",
+	"perf lock [<options>] {record|report|script|info}",
 	NULL
 };