From: Arnaldo Carvalho de Melo <a...@redhat.com>

It only operates on the notes->src->cyc_hist, just pass that to it.

Cc: Adrian Hunter <adrian.hun...@intel.com>
Cc: David Ahern <dsah...@gmail.com>
Cc: Jiri Olsa <jo...@kernel.org>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Wang Nan <wangn...@huawei.com>
Link: https://lkml.kernel.org/n/tip-zd1cu4zwmu21k0cxlr83y...@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 tools/perf/util/annotate.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 0f5ed6091e00..a7221f9fa504 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -741,14 +741,11 @@ void symbol__annotate_zero_histograms(struct symbol *sym)
        pthread_mutex_unlock(&notes->lock);
 }
 
-static int __symbol__account_cycles(struct annotation *notes,
+static int __symbol__account_cycles(struct cyc_hist *ch,
                                    u64 start,
                                    unsigned offset, unsigned cycles,
                                    unsigned have_start)
 {
-       struct cyc_hist *ch;
-
-       ch = notes->src->cycles_hist;
        /*
         * For now we can only account one basic block per
         * final jump. But multiple could be overlapping.
@@ -870,7 +867,7 @@ static int symbol__account_cycles(u64 addr, u64 start,
                        start = 0;
        }
        offset = addr - sym->start;
-       return __symbol__account_cycles(notes,
+       return __symbol__account_cycles(notes->src->cycles_hist,
                                        start ? start - sym->start : 0,
                                        offset, cycles,
                                        !!start);
-- 
2.14.3

Reply via email to