diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-04 10:40:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-04 10:40:25 +0100 |
| commit | 888a8a3e9d79cbb9d83e53955f684998248580ec (patch) | |
| tree | 3dbf548438c77d89c8696a9a79c4129cdc2f3d3e /tools/perf/util/symbol.c | |
| parent | cfff2d909cbdaf8c467bd321aa0502a548ec8f7e (diff) | |
| parent | b06b3d49699a52e8f9ca056c4f96e81b1987d78e (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Pick up updates before queueing up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 3e193f8e3061..ba6d48949092 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) |