Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+9
-4
+8
-3
tools/perf/util/header.c
+8
-3
tools/perf/util/header.c
···
270
270
const char *name, bool is_kallsyms)
271
271
{
272
272
const size_t size = PATH_MAX;
273
-
char *realname = realpath(name, NULL),
274
-
*filename = malloc(size),
273
+
char *realname, *filename = malloc(size),
275
274
*linkname = malloc(size), *targetname;
276
275
int len, err = -1;
276
+
277
+
if (is_kallsyms)
278
+
realname = (char *)name;
279
+
else
280
+
realname = realpath(name, NULL);
277
281
278
282
if (realname == NULL || filename == NULL || linkname == NULL)
279
283
goto out_free;
···
310
306
if (symlink(targetname, linkname) == 0)
311
307
err = 0;
312
308
out_free:
313
-
free(realname);
309
+
if (!is_kallsyms)
310
+
free(realname);
314
311
free(filename);
315
312
free(linkname);
316
313
return err;
+1
-1
tools/perf/util/symbol.c
+1
-1
tools/perf/util/symbol.c
···
1836
1836
int err = -1, fd;
1837
1837
char symfs_vmlinux[PATH_MAX];
1838
1838
1839
-
snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s/%s",
1839
+
snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s%s",
1840
1840
symbol_conf.symfs, vmlinux);
1841
1841
fd = open(symfs_vmlinux, O_RDONLY);
1842
1842
if (fd < 0)