| Message ID | 1527655767-12161-1-git-send-email-leo.yan@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | perf hists browser: Fix stale hist_entry__tui_annotate() declaration | expand |
Hi Arnaldo, On Wed, May 30, 2018 at 12:49:27PM +0800, Leo Yan wrote: > Since commit 464fb4fd6af7 ("perf hists browser: Pass annotation_options > from tool to browser") has added extra parameter for functions, but it > missed to update hist_entry__tui_annotate() declaration for > !HAVE_SLANG_SUPPORT configuration so this results in regression for perf > tool building failure. > > This patch is to update hist_entry__tui_annotate() declaration for > new added argument '*annotation_opts'. Seems to me this fixing should be merged into the patch "perf hists browser: Pass annotation_options from tool to browser" because I encountered this issue on perf/core branch. Just remind for this. Thanks, Leo Yan > Signed-off-by: Leo Yan <leo.yan@linaro.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 5f30758..cafafbf 100644 > --- a/tools/perf/util/hist.h > +++ b/tools/perf/util/hist.h > @@ -460,7 +460,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 __maybe_unused) > { > return 0; > } > -- > 2.7.4 >
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index 5f30758..cafafbf 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -460,7 +460,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 __maybe_unused) { return 0; }
Since commit 464fb4fd6af7 ("perf hists browser: Pass annotation_options from tool to browser") has added extra parameter for functions, but it missed to update hist_entry__tui_annotate() declaration for !HAVE_SLANG_SUPPORT configuration so this results in regression for perf tool building failure. This patch is to update hist_entry__tui_annotate() declaration for new added argument '*annotation_opts'. Signed-off-by: Leo Yan <leo.yan@linaro.org> --- tools/perf/util/hist.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4