Commit d9597075 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -270,11 +270,15 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir, ...@@ -270,11 +270,15 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
const char *name, bool is_kallsyms) const char *name, bool is_kallsyms)
{ {
const size_t size = PATH_MAX; const size_t size = PATH_MAX;
char *realname = realpath(name, NULL), char *realname, *filename = malloc(size),
*filename = malloc(size),
*linkname = malloc(size), *targetname; *linkname = malloc(size), *targetname;
int len, err = -1; int len, err = -1;
if (is_kallsyms)
realname = (char *)name;
else
realname = realpath(name, NULL);
if (realname == NULL || filename == NULL || linkname == NULL) if (realname == NULL || filename == NULL || linkname == NULL)
goto out_free; goto out_free;
...@@ -306,7 +310,8 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir, ...@@ -306,7 +310,8 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
if (symlink(targetname, linkname) == 0) if (symlink(targetname, linkname) == 0)
err = 0; err = 0;
out_free: out_free:
free(realname); if (!is_kallsyms)
free(realname);
free(filename); free(filename);
free(linkname); free(linkname);
return err; return err;
......
...@@ -1836,7 +1836,7 @@ int dso__load_vmlinux(struct dso *self, struct map *map, ...@@ -1836,7 +1836,7 @@ int dso__load_vmlinux(struct dso *self, struct map *map,
int err = -1, fd; int err = -1, fd;
char symfs_vmlinux[PATH_MAX]; 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); symbol_conf.symfs, vmlinux);
fd = open(symfs_vmlinux, O_RDONLY); fd = open(symfs_vmlinux, O_RDONLY);
if (fd < 0) if (fd < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment