---

yaml --- r: 323760 b: refs/heads/master c: 618a3f1 h: refs/heads/master v: v3
git-mirror · Sep 5, 2012 · 16a6860 · 16a6860
1 parent c5ba90a
commit 16a6860
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74ba9e11f02a4ce0c7708dc77d1756b93065e440
+refs/heads/master: 618a3f1d30ea0ee2ff3a88661b8d6a4035123211
diff --git a/trunk/tools/perf/util/header.c b/trunk/tools/perf/util/header.c
@@ -2314,7 +2314,7 @@ static int perf_evlist__set_tracepoint_names(struct perf_evlist *evlist,
 	struct perf_evsel *pos;
 
 	list_for_each_entry(pos, &evlist->entries, node) {
-		if (pos->attr.type == PERF_TYPE_TRACEPOINT &&
+		if (pos->attr.type == PERF_TYPE_TRACEPOINT && !pos->name &&
 		    perf_evsel__set_tracepoint_name(pos, pevent))
 			return -1;
 	}