diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-10-22 09:33:46 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-10-22 09:33:46 +0200 |
commit | 4ba792e303e278052bb0ee60cce15d6d7dc15c7c (patch) | |
tree | c9e034f488a2194af1e956a217b26120b6844835 /tools/perf/util/annotate.c | |
parent | 43e41adc9e8c36545888d78fed2ef8d102a938dc (diff) | |
parent | e3d006ce8180a0c025ce66bdc89bbc125f85be57 (diff) |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
User visible changes:
- Print branch filter state in verbose mode. (Andi Kleen)
- Fix core dump caused by per-socket/core system-wide stat. (Kan Liang)
- Update libtraceevent KVM plugin. (Paolo Bonzini)
Infrastructure changes:
- Add fixdep to 'tools/build' .gitignore. (Yunlong Song)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/annotate.c')
-rw-r--r-- | tools/perf/util/annotate.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index d1eece70b84d..0fc8d7a2fea5 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -548,8 +548,11 @@ static int __symbol__inc_addr_samples(struct symbol *sym, struct map *map, pr_debug3("%s: addr=%#" PRIx64 "\n", __func__, map->unmap_ip(map, addr)); - if (addr < sym->start || addr >= sym->end) + if (addr < sym->start || addr >= sym->end) { + pr_debug("%s(%d): ERANGE! sym->name=%s, start=%#" PRIx64 ", addr=%#" PRIx64 ", end=%#" PRIx64 "\n", + __func__, __LINE__, sym->name, sym->start, addr, sym->end); return -ERANGE; + } offset = addr - sym->start; h = annotation__histogram(notes, evidx); |