On Fri, Jun 01, 2018 at 10:19:57AM -0300, Arnaldo Carvalho de Melo wrote:
> Em Fri, Jun 01, 2018 at 11:56:48AM +0200, Jiri Olsa escreveu:
> > The compilation is broken if there's no slang support:
> >
> > builtin-annotate.c: In function ‘hists__find_annotations’:
> > builtin-annotate.c:344:10: error: too many arguments to function
> > ‘hist_entry__tui_annotate’
> > key = hist_entry__tui_annotate(he, evsel, NULL, &ann->opts);
> >
> > Adding the missing argument to hist_entry__tui_annotate function.
>
> Thanks, I think I have this fixed locally.
>
> - Arnaldo
>
> > Fixes: 464fb4fd6af7 ("perf hists browser: Pass annotation_options from tool
> > to browser")
> > Link: http://lkml.kernel.org/n/[email protected]
> > Signed-off-by: Jiri Olsa <[email protected]>
> > ---
> > tools/perf/util/hist.h | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
> > index 256292b18bb8..9b1a68a685d4 100644
> > --- a/tools/perf/util/hist.h
> > +++ b/tools/perf/util/hist.h
> > @@ -446,7 +446,8 @@ static inline int map_symbol__tui_annotate(struct
> > map_symbol *ms __maybe_unused,
> >
> > static inline int hist_entry__tui_annotate(struct hist_entry *he
> > __maybe_unused,
> > struct perf_evsel *evsel
> > __maybe_unused,
> > - struct hist_browser_timer *hbt
> > __maybe_unused)
> > + struct hist_browser_timer *hbt
> > __maybe_unused,
> > + struct annotation_options
> > *annotation_opts)
good, because I sent you wrong one.. without __maybe_unused ;-) sry
jirka
