From 7cb0b2c1d222756f7058a6092e3c719a14accd05 Mon Sep 17 00:00:00 2001
From: David Ahern <dsahern@gmail.com>
Date: Mon, 14 Jan 2013 10:47:30 -0700
Subject: [PATCH] --- yaml --- r: 349963 b: refs/heads/master c:
 b7c14a0b6a4e3add92e1527a31cb1826f4799248 h: refs/heads/master i:   349961:
 974b5f97def55759d0d76db3d80b32df450e6b3d   349959:
 978bb5175587daa7fa5d59b7b23039c77b3f4dc6 v: v3

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

diff --git a/[refs] b/[refs]
index f524fecbd2bf..0d787398f865 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 164c800e42657e586f6fd446b3d8d41cf1f815f1
+refs/heads/master: b7c14a0b6a4e3add92e1527a31cb1826f4799248
diff --git a/trunk/tools/perf/util/symbol.c b/trunk/tools/perf/util/symbol.c
index daf95549e7b9..e6432d85b43d 100644
--- a/trunk/tools/perf/util/symbol.c
+++ b/trunk/tools/perf/util/symbol.c
@@ -923,8 +923,10 @@ int dso__load_vmlinux_path(struct dso *dso, struct map *map,
 	filename = dso__build_id_filename(dso, NULL, 0);
 	if (filename != NULL) {
 		err = dso__load_vmlinux(dso, map, filename, filter);
-		if (err > 0)
+		if (err > 0) {
+			dso->lname_alloc = 1;
 			goto out;
+		}
 		free(filename);
 	}
 
@@ -932,6 +934,7 @@ int dso__load_vmlinux_path(struct dso *dso, struct map *map,
 		err = dso__load_vmlinux(dso, map, vmlinux_path[i], filter);
 		if (err > 0) {
 			dso__set_long_name(dso, strdup(vmlinux_path[i]));
+			dso->lname_alloc = 1;
 			break;
 		}
 	}
@@ -971,6 +974,7 @@ static int dso__load_kernel_sym(struct dso *dso, struct map *map,
 		if (err > 0) {
 			dso__set_long_name(dso,
 					   strdup(symbol_conf.vmlinux_name));
+			dso->lname_alloc = 1;
 			goto out_fixup;
 		}
 		return err;