diff options
Diffstat (limited to 'tools/perf/util/annotate.c')
| -rw-r--r-- | tools/perf/util/annotate.c | 16 | 
1 files changed, 6 insertions, 10 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 199f69ec656..08c6d138a65 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -64,8 +64,8 @@ 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->end) -		return 0; +	if (addr < sym->start || addr > sym->end) +		return -ERANGE;  	offset = addr - sym->start;  	h = annotation__histogram(notes, evidx); @@ -561,16 +561,12 @@ void symbol__annotate_decay_histogram(struct symbol *sym, int evidx)  {  	struct annotation *notes = symbol__annotation(sym);  	struct sym_hist *h = annotation__histogram(notes, evidx); -	struct objdump_line *pos; -	int len = sym->end - sym->start; +	int len = sym->end - sym->start, offset;  	h->sum = 0; - -	list_for_each_entry(pos, ¬es->src->source, node) { -		if (pos->offset != -1 && pos->offset < len) { -			h->addr[pos->offset] = h->addr[pos->offset] * 7 / 8; -			h->sum += h->addr[pos->offset]; -		} +	for (offset = 0; offset < len; ++offset) { +		h->addr[offset] = h->addr[offset] * 7 / 8; +		h->sum += h->addr[offset];  	}  }  |