From b9d7ca9a79eee2ebf463710bf6817f8750230a66 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <cody@linux.vnet.ibm.com>
Date: Fri, 10 Aug 2012 15:22:54 -0700
Subject: [PATCH] --- yaml --- r: 323679 b: refs/heads/master c:
 515850e4fbd87c8f249446faa2e5ad98e672711d h: refs/heads/master i:   323677:
 f6b7a0820e6771a704d6f4da5c2dc2079587b035   323675:
 33d94501803278b1dcd42c51fe4108db9b628a86   323671:
 0e6d611c193a6a0119cc87b7dc61e5daebd98c4b   323663:
 1ca0f4b6037614dc9ac06f8ef58d0781d1661e5e   323647:
 7775746dd024669cf9306c2ca9875885a41b312f v: v3

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

diff --git a/[refs] b/[refs]
index 4402a57c68c7..1e26d260308b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a0317b41e20770f81bc61d7b208957385466c3f
+refs/heads/master: 515850e4fbd87c8f249446faa2e5ad98e672711d
diff --git a/trunk/tools/perf/util/symbol.c b/trunk/tools/perf/util/symbol.c
index e5c38179f728..96dbf28fc941 100644
--- a/trunk/tools/perf/util/symbol.c
+++ b/trunk/tools/perf/util/symbol.c
@@ -1364,13 +1364,14 @@ int dso__load_vmlinux(struct dso *dso, struct map *map,
 	if (fd < 0)
 		return -1;
 
-	dso__set_long_name(dso, (char *)vmlinux);
-	dso__set_loaded(dso, map->type);
 	err = dso__load_sym(dso, map, symfs_vmlinux, fd, filter, 0, 0);
 	close(fd);
 
-	if (err > 0)
+	if (err > 0) {
+		dso__set_long_name(dso, (char *)vmlinux);
+		dso__set_loaded(dso, map->type);
 		pr_debug("Using %s for symbols\n", symfs_vmlinux);
+	}
 
 	return err;
 }