Merge branch 'linus' into timers/urgent, to pick up fixes

[deliverable/linux.git] / tools / perf / builtin-top.c

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index bd108683fcb87d30a45bda771f2ad665c59723cf..418ed94756d357f5101713945ae37b77178acb38 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -128,10 +128,14 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he)
                return err;
        }
 
-       err = symbol__annotate(sym, map, 0);
+       err = symbol__disassemble(sym, map, 0);
        if (err == 0) {
 out_assign:
                top->sym_filter_entry = he;
+       } else {
+               char msg[BUFSIZ];
+               symbol__strerror_disassemble(sym, map, err, msg, sizeof(msg));
+               pr_err("Couldn't annotate %s: %s\n", sym->name, msg);
        }
 
        pthread_mutex_unlock(&notes->lock);