linux-kernel - Re: [PATCH] perf tools: Fix hist_entry__tui_annotate declaration for !HAVE_SLANG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20180601152155.GA1602@krava>
Date:   Fri, 1 Jun 2018 17:21:55 +0200
From:   Jiri Olsa <jolsa@...hat.com>
To:     Arnaldo Carvalho de Melo <acme@...nel.org>
Cc:     Jiri Olsa <jolsa@...nel.org>, lkml <linux-kernel@...r.kernel.org>,
        Ingo Molnar <mingo@...nel.org>,
        Namhyung Kim <namhyung@...nel.org>,
        David Ahern <dsahern@...il.com>,
        Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
        Peter Zijlstra <a.p.zijlstra@...llo.nl>
Subject: Re: [PATCH] perf tools: Fix hist_entry__tui_annotate declaration for
 !HAVE_SLANG_SUPPORT

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/tip-vgf5a8wk0eyayo7omvutwhqo@git.kernel.org
> > Signed-off-by: Jiri Olsa <jolsa@...nel.org>
> > ---
> >  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