---

yaml --- r: 349963 b: refs/heads/master c: b7c14a0 h: refs/heads/master i: 349961: 974b5f9 349959: 978bb51 v: v3
git-mirror · Jan 24, 2013 · 7cb0b2c · 7cb0b2c
1 parent 00fc198
commit 7cb0b2c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -923,15 +923,18 @@ 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);
 	}
 
 	for (i = 0; i < vmlinux_path__nr_entries; ++i) {
 		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;