summaryrefslogtreecommitdiff
path: root/tools/perf/ui/browsers/annotate.c
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@infradead.org>2012-11-14 18:15:32 +0000
committerJames Simmons <jsimmons@infradead.org>2012-11-14 18:15:32 +0000
commitb44959f2817032bc4668434bbe1cf9ab28b8cb21 (patch)
treede3bd861b36c836ac9b7b6e8dc179ca1985b6593 /tools/perf/ui/browsers/annotate.c
parente22956a2faa9cf34cec4a471131d50c6be75b0c2 (diff)
parent2216c9e74fb3baac3cb73952158dbe38b703997e (diff)
Merge branch 'drm-core-next'HEADmaster
Conflicts: drivers/gpu/drm/tdfx/tdfx_drv.c
Diffstat (limited to 'tools/perf/ui/browsers/annotate.c')
-rw-r--r--tools/perf/ui/browsers/annotate.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 34b1c46eaf4..67a2703e666 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -814,7 +814,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
{
struct disasm_line *pos, *n;
struct annotation *notes;
- const size_t size = symbol__size(sym);
+ size_t size;
struct map_symbol ms = {
.map = map,
.sym = sym,
@@ -834,6 +834,8 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
if (sym == NULL)
return -1;
+ size = symbol__size(sym);
+
if (map->dso->annotate_warned)
return -1;