diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-11 00:07:38 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-11 00:07:38 +0300 |
commit | d9597075fb6feb1b3dc71c352e334c5b0a37afde (patch) | |
tree | ee86d62282fe508c254f30ed26c3208482811a96 /tools/perf/util/symbol.c | |
parent | ba3820ade317ee36e496b9b40d2ec3987dd4aef0 (diff) | |
parent | 7ee235efe5f86f239ce73915fd2e15f4d14259c6 (diff) | |
download | linux-d9597075fb6feb1b3dc71c352e334c5b0a37afde.tar.xz |
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
Diffstat (limited to 'tools/perf/util/symbol.c')
-rw-r--r-- | tools/perf/util/symbol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 7821d0e6866f..b1bf490aff88 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -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) |