Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kern…

…el/git/acme/linux-2.6 into perf/urgent
git-mirror · Jun 4, 2010 · 58cc1a9 · 58cc1a9
2 parents c6df8d5 + e7dadc0
commit 58cc1a9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
@@ -1745,7 +1745,12 @@ static int dso__load_kernel_sym(struct dso *self, struct map *map,
 	if (symbol_conf.vmlinux_name != NULL) {
 		err = dso__load_vmlinux(self, map,
 					symbol_conf.vmlinux_name, filter);
-		goto out_try_fixup;
+		if (err > 0) {
+			dso__set_long_name(self,
+					   strdup(symbol_conf.vmlinux_name));
+			goto out_fixup;
+		}
+		return err;
 	}
 
 	if (vmlinux_path != NULL) {
@@ -1806,7 +1811,6 @@ static int dso__load_kernel_sym(struct dso *self, struct map *map,
 		pr_debug("Using %s for symbols\n", kallsyms_filename);
 	free(kallsyms_allocated_filename);
 
-out_try_fixup:
 	if (err > 0) {
 out_fixup:
 		if (kallsyms_filename != NULL)