From 171f7474b6bb6c7074431f76c28ea87d625c68fd Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Fri, 30 Aug 2019 11:28:14 -0300 Subject: [PATCH] perf hist: Remove needless ui/progress.h from hist.h We only need a forward declaration, add it and fixup all the files that need ui_progress definitions but were wrongly getting it from hist.h. Cc: Adrian Hunter Cc: Jiri Olsa Cc: Namhyung Kim Link: https://lkml.kernel.org/n/tip-84a90o9jdxybffxo9jmouokw@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-c2c.c | 1 + tools/perf/builtin-report.c | 1 + tools/perf/util/hist.h | 2 +- tools/perf/util/session.c | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index d1ad694c67a2..0d76b2cb8c0a 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -37,6 +37,7 @@ #include "mem2node.h" #include "symbol.h" #include "ui/ui.h" +#include "ui/progress.h" #include "../perf.h" struct c2c_hists { diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index ba419ee40283..d7a345667945 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -47,6 +47,7 @@ #include "util/branch.h" #include "util/util.h" #include "ui/ui.h" +#include "ui/progress.h" #include #include diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index 7b9267ebebeb..1c0a635e5e32 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -8,7 +8,6 @@ #include "evsel.h" #include "header.h" #include "color.h" -#include "ui/progress.h" struct hist_entry; struct hist_entry_ops; @@ -18,6 +17,7 @@ struct mem_info; struct branch_info; struct block_info; struct symbol; +struct ui_progress; enum hist_filter { HIST_FILTER__DSO, diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index a72774e4463f..f166da76acf1 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -30,6 +30,7 @@ #include "sample-raw.h" #include "stat.h" #include "util.h" +#include "ui/progress.h" #include "../perf.h" #include "arch/common.h" -- 2.39.2