perf evlist: Factor out a function to propagate maps for a single evsel

[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 e0b6146480442ca6046cc498d53af0e8f1987d7c..d1eece70b84d6e00c527ccd6027362517013aba8 100644 (file)
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -621,7 +621,7 @@ int addr_map_symbol__account_cycles(struct addr_map_symbol *ams,
                                    struct addr_map_symbol *start,
                                    unsigned cycles)
 {
-       unsigned long saddr = 0;
+       u64 saddr = 0;
        int err;
 
        if (!cycles)
@@ -640,7 +640,7 @@ int addr_map_symbol__account_cycles(struct addr_map_symbol *ams,
                   start->addr == ams->sym->start + ams->map->start)))
                saddr = start->al_addr;
        if (saddr == 0)
-               pr_debug2("BB with bad start: addr %lx start %lx sym %lx saddr %lx\n",
+               pr_debug2("BB with bad start: addr %"PRIx64" start %"PRIx64" sym %"PRIx64" saddr %"PRIx64"\n",
                        ams->addr,
                        start ? start->addr : 0,
                        ams->sym ? ams->sym->start + ams->map->start : 0,
@@ -1126,6 +1126,7 @@ fallback:
                dso->annotate_warned = 1;
                pr_err("Can't annotate %s:\n\n"
                       "No vmlinux file%s\nwas found in the path.\n\n"
+                      "Note that annotation using /proc/kcore requires CAP_SYS_RAWIO capability.\n\n"
                       "Please use:\n\n"
                       "  perf buildid-cache -vu vmlinux\n\n"
                       "or:\n\n"