Merge tag 'v4.14-rc1' into asoc-rockchip

Linux 4.14-rc1

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c
index d903fd493416..02176193f427 100644
--- a/tools/perf/ui/gtk/annotate.c
+++ b/tools/perf/ui/gtk/annotate.c
@@ -34,10 +34,10 @@ static int perf_gtk__get_percent(char *buf, size_t size, struct symbol *sym,
                 return 0;
 
         symhist = annotation__histogram(symbol__annotation(sym), evidx);
-        if (!symbol_conf.event_group && !symhist->addr[dl->offset])
+        if (!symbol_conf.event_group && !symhist->addr[dl->offset].nr_samples)
                 return 0;
 
-        percent = 100.0 * symhist->addr[dl->offset] / symhist->sum;
+        percent = 100.0 * symhist->addr[dl->offset].nr_samples / symhist->nr_samples;
 
         markup = perf_gtk__get_percent_color(percent);
         if (markup)
@@ -169,7 +169,7 @@ static int symbol__gtk_annotate(struct symbol *sym, struct map *map,
                 return -1;
 
         err = symbol__disassemble(sym, map, perf_evsel__env_arch(evsel),
-                                  0, NULL);
+                                  0, NULL, NULL);
         if (err) {
                 char msg[BUFSIZ];
                 symbol__strerror_disassemble(sym, map, err, msg, sizeof(msg));