Merge tag 'char-misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[mirror_ubuntu-artful-kernel.git] / tools / perf / builtin-lock.c

diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index 2296c391d0f581246c8c72a913d47357bbb15842..12c8148389931e7e9d2413bd263794a89e88d694 100644 (file)
--- a/tools/perf/builtin-lock.c
+++ b/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
 };