LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Jiri Olsa <jolsa@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>, lkml <linux-kernel@vger.kernel.org>,
	Ingo Molnar <mingo@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	David Ahern <dsahern@gmail.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: Re: [PATCH] perf tools: Fix hist_entry__tui_annotate declaration for !HAVE_SLANG_SUPPORT
Date: Fri, 1 Jun 2018 13:03:39 -0300	[thread overview]
Message-ID: <20180601160339.GK25467@kernel.org> (raw)
In-Reply-To: <20180601152155.GA1602@krava>

Em Fri, Jun 01, 2018 at 05:21:55PM +0200, Jiri Olsa escreveu:
> 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:
> > > Adding the missing argument to hist_entry__tui_annotate function.

> > Thanks, I think I have this fixed locally.

> > > +++ 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

Erm, I hadn't, so I just fixed this and force pushed perf/core

https://git.kernel.org/acme/c/2b90f5c0c0a6

- Arnaldo

      reply	other threads:[~2018-06-01 16:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-01  9:56 Jiri Olsa
2018-06-01 13:19 ` Arnaldo Carvalho de Melo
2018-06-01 15:21   ` Jiri Olsa
2018-06-01 16:03     ` Arnaldo Carvalho de Melo [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180601160339.GK25467@kernel.org \
    --to=acme@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=dsahern@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --subject='Re: [PATCH] perf tools: Fix hist_entry__tui_annotate declaration for '\!'HAVE_SLANG_SUPPORT' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).