Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58cc1a9e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' of... 

Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
parents c6df8d5a e7dadc00

tools/perf/util/symbol.c

+6 −2
Original line number Diff line number Diff line
@@ -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)