From 3ff00d24763a193fc579f092991eb8a0b9f5c462 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tzanussi@gmail.com>
Date: Wed, 27 Jan 2010 02:27:52 -0600
Subject: [PATCH] --- yaml --- r: 182467 b: refs/heads/master c:
 f526d68b6ce9ba7a2bd94e663e240a022524c58a h: refs/heads/master i:   182465:
 700b4edc876e2922d3d4e34a22da99a963c6feea   182463:
 1ed8cb27c9329a3643352acaa63752e66aee54f6 v: v3

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

diff --git a/[refs] b/[refs]
index 2b8910337b7f..3166b36054df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faa5c5c36ec50bf43e39c7798ce9701e6b002db3
+refs/heads/master: f526d68b6ce9ba7a2bd94e663e240a022524c58a
diff --git a/trunk/tools/perf/Documentation/perf-trace.txt b/trunk/tools/perf/Documentation/perf-trace.txt
index 60e5900da483..c00a76fcb8d6 100644
--- a/trunk/tools/perf/Documentation/perf-trace.txt
+++ b/trunk/tools/perf/Documentation/perf-trace.txt
@@ -45,9 +45,11 @@ OPTIONS
 --list=::
         Display a list of available trace scripts.
 
--s::
+-s ['lang']::
 --script=::
         Process trace data with the given script ([lang]:script[.ext]).
+	If the string 'lang' is specified in place of a script name, a
+        list of supported languages will be displayed instead.
 
 -g::
 --gen-script=::
diff --git a/trunk/tools/perf/builtin-trace.c b/trunk/tools/perf/builtin-trace.c
index 0b65779e3c10..d5d20c34e221 100644
--- a/trunk/tools/perf/builtin-trace.c
+++ b/trunk/tools/perf/builtin-trace.c
@@ -219,9 +219,9 @@ static int parse_scriptname(const struct option *opt __used,
 	const char *script, *ext;
 	int len;
 
-	if (strcmp(str, "list") == 0) {
+	if (strcmp(str, "lang") == 0) {
 		list_available_languages();
-		return 0;
+		exit(0);
 	}
 
 	script = strchr(str, ':');