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

Commit d9597075 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf symbols: Avoid resolving [kernel.kallsyms] to real path for buildid cache
  perf symbols: Fix vmlinux path when not using --symfs
parents ba3820ad 7ee235ef

tools/perf/util/header.c

+8 −3
Original line number Diff line number Diff line
@@ -270,11 +270,15 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir, 
			  const char *name, bool is_kallsyms)

{

	const size_t size = PATH_MAX;

	char *realname = realpath(name, NULL),

	     *filename = malloc(size),

	char *realname, *filename = malloc(size),

	     *linkname = malloc(size), *targetname;

	int len, err = -1;



	if (is_kallsyms)

		realname = (char *)name;

	else

		realname = realpath(name, NULL);



	if (realname == NULL || filename == NULL || linkname == NULL)

		goto out_free;
@@ -306,6 +310,7 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir, 
	if (symlink(targetname, linkname) == 0)

		err = 0;

out_free:

	if (!is_kallsyms)

		free(realname);

	free(filename);

	free(linkname);

tools/perf/util/symbol.c

+1 −1
Original line number Diff line number Diff line
@@ -1836,7 +1836,7 @@ int dso__load_vmlinux(struct dso *self, struct map *map, 
	int err = -1, fd;

	char symfs_vmlinux[PATH_MAX];



	snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s/%s",

	snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s%s",

		 symbol_conf.symfs, vmlinux);

	fd = open(symfs_vmlinux, O_RDONLY);

	if (fd < 0)