From eba460265694a63e3ed5d5286e67ca790bc57d46 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 28 May 2009 10:52:00 +0200
Subject: [PATCH] --- yaml --- r: 147558 b: refs/heads/master c:
 63299f057fbce47da895e8865cba7e9c3eb01a20 h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/Documentation/perf_counter/builtin-report.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 11f1f0869330..59ecaae967bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca8cdeef9ca2ff89ee8a21d6f6ff3dfb60286041
+refs/heads/master: 63299f057fbce47da895e8865cba7e9c3eb01a20
diff --git a/trunk/Documentation/perf_counter/builtin-report.c b/trunk/Documentation/perf_counter/builtin-report.c
index 506cde437b78..9fdf8224ee61 100644
--- a/trunk/Documentation/perf_counter/builtin-report.c
+++ b/trunk/Documentation/perf_counter/builtin-report.c
@@ -1240,7 +1240,8 @@ static const struct option options[] = {
 	OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
 		    "dump raw trace in ASCII"),
 	OPT_STRING('k', "vmlinux", &vmlinux, "file", "vmlinux pathname"),
-	OPT_STRING('s', "sort", &sort_order, "foo", "bar"),
+	OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
+		   "sort by key(s): pid, comm, dso, symbol. Default: pid,symbol"),
 	OPT_END()
 };