Patch "perf tools: Fix build-id matching on vmlinux"
breaks annotation with kcore.  The problem is that
symbol__annotate() first gets the filename based on
the build-id which was previously not set.
This patch provides a quick fix, however there should
probably be only one way to determine the filename. e.g.
symbol__annotate() should use the same way as
dso__data_fd().

Signed-off-by: Adrian Hunter <adrian.hun...@intel.com>
---
 tools/perf/util/annotate.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 7dabde1..873c877 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -915,6 +915,8 @@ int symbol__annotate(struct symbol *sym, struct map *map, 
size_t privsize)
                        return -ENOMEM;
                }
                goto fallback;
+       } else if (dso__is_kcore(dso)) {
+               goto fallback;
        } else if (readlink(symfs_filename, command, sizeof(command)) < 0 ||
                   strstr(command, "[kernel.kallsyms]") ||
                   access(symfs_filename, R_OK)) {
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to