projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perf symbols: Make sure --symfs usage includes the path separator
[firefly-linux-kernel-4.4.55.git]
/
tools
/
perf
/
util
/
annotate.c
diff --git
a/tools/perf/util/annotate.c
b/tools/perf/util/annotate.c
index 809b4c50beaed3e3a57845919b3a034fe7ab8c9e..7745fec01a6bc2c0e96f5bdbcf51197d5844fb0e 100644
(file)
--- a/
tools/perf/util/annotate.c
+++ b/
tools/perf/util/annotate.c
@@
-899,10
+899,8
@@
int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize)
struct kcore_extract kce;
bool delete_extract = false;
struct kcore_extract kce;
bool delete_extract = false;
- if (filename) {
- snprintf(symfs_filename, sizeof(symfs_filename), "%s%s",
- symbol_conf.symfs, filename);
- }
+ if (filename)
+ symbol__join_symfs(symfs_filename, filename);
if (filename == NULL) {
if (dso->has_build_id) {
if (filename == NULL) {
if (dso->has_build_id) {
@@
-922,8
+920,7
@@
fallback:
* DSO is the same as when 'perf record' ran.
*/
filename = (char *)dso->long_name;
* DSO is the same as when 'perf record' ran.
*/
filename = (char *)dso->long_name;
- snprintf(symfs_filename, sizeof(symfs_filename), "%s%s",
- symbol_conf.symfs, filename);
+ symbol__join_symfs(symfs_filename, filename);
free_filename = false;
}
free_filename = false;
}