From 735e6abfd6a601997286a294454ffa2828458e8c Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Fri, 20 Apr 2012 15:17:50 -0300 Subject: [PATCH] --- yaml --- r: 304847 b: refs/heads/master c: 97148a97baf71536e15aa0acf3310b7b1409e2f4 h: refs/heads/master i: 304845: 09dcc76578ba92afcdddeaeff393641dff939269 304843: 255f89854e6a9df3e613522844f8ebf5c9a80139 304839: d387b59136131c9387afa96e509c4548406f6dab 304831: 681c633847b54796c0bb04f08becee73b82452ea v: v3 --- [refs] | 2 +- trunk/tools/perf/ui/browsers/annotate.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b07e12e71c62..d83462bf2d82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7e6ead7347813b5833efb9b32908c08ff131259 +refs/heads/master: 97148a97baf71536e15aa0acf3310b7b1409e2f4 diff --git a/trunk/tools/perf/ui/browsers/annotate.c b/trunk/tools/perf/ui/browsers/annotate.c index 9c7b6d87822e..c2bbfc767d4f 100644 --- a/trunk/tools/perf/ui/browsers/annotate.c +++ b/trunk/tools/perf/ui/browsers/annotate.c @@ -690,7 +690,15 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx, bpos->idx = browser.nr_entries++; if (pos->offset != -1) { bpos->idx_asm = browser.nr_asm_entries++; - browser.offsets[pos->offset] = pos; + /* + * FIXME: short term bandaid to cope with assembly + * routines that comes with labels in the same column + * as the address in objdump, sigh. + * + * E.g. copy_user_generic_unrolled + */ + if (pos->offset < (s64)size) + browser.offsets[pos->offset] = pos; } else bpos->idx_asm = -1; }