From 7195da277f0454fc138b8adc6facc8a48ea0e0e3 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Mon, 16 Nov 2009 21:45:25 -0200
Subject: [PATCH] --- yaml --- r: 169635 b: refs/heads/master c:
 1124ba73be6a758965340bd997593b2996649d60 h: refs/heads/master i:   169633:
 a29e2b30f57cf1aeb5b887278236b4305da1269f   169631:
 b5d4487a21e3c92144561a734a84453f3ba1cb68 v: v3

---
 [refs]                                               | 2 +-
 trunk/tools/perf/Documentation/perf-buildid-list.txt | 2 +-
 trunk/tools/perf/builtin-buildid-list.c              | 2 +-
 trunk/tools/perf/util/symbol.c                       | 5 +----
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b94c9dad8c58..e3542b7b02e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ffcda17314cfeb698a667567ea63f63362dffbb
+refs/heads/master: 1124ba73be6a758965340bd997593b2996649d60
diff --git a/trunk/tools/perf/Documentation/perf-buildid-list.txt b/trunk/tools/perf/Documentation/perf-buildid-list.txt
index abab34e05576..01b642c0bf8f 100644
--- a/trunk/tools/perf/Documentation/perf-buildid-list.txt
+++ b/trunk/tools/perf/Documentation/perf-buildid-list.txt
@@ -26,7 +26,7 @@ OPTIONS
 	Don't do ownership validation.
 -v::
 --verbose::
-	Be more verbose, showing the name of the DSOs after the buildids.
+	Be more verbose.
 
 SEE ALSO
 --------
diff --git a/trunk/tools/perf/builtin-buildid-list.c b/trunk/tools/perf/builtin-buildid-list.c
index 2e377e1be435..7dee9d19ab7a 100644
--- a/trunk/tools/perf/builtin-buildid-list.c
+++ b/trunk/tools/perf/builtin-buildid-list.c
@@ -28,7 +28,7 @@ static const struct option options[] = {
 		    "input file name"),
 	OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
 	OPT_BOOLEAN('v', "verbose", &verbose,
-		    "be more verbose (show counter open errors, etc)"),
+		    "be more verbose"),
 	OPT_END()
 };
 
diff --git a/trunk/tools/perf/util/symbol.c b/trunk/tools/perf/util/symbol.c
index 53de9c4488d8..1b77e81b38de 100644
--- a/trunk/tools/perf/util/symbol.c
+++ b/trunk/tools/perf/util/symbol.c
@@ -1442,10 +1442,7 @@ size_t dsos__fprintf_buildid(FILE *fp)
 
 	list_for_each_entry(pos, &dsos, node) {
 		ret += dso__fprintf_buildid(pos, fp);
-		if (verbose)
-			ret += fprintf(fp, " %s\n", pos->long_name);
-		else
-			ret += fprintf(fp, "\n");
+		ret += fprintf(fp, " %s\n", pos->long_name);
 	}
 	return ret;
 }