Skip to contentSkip to conversation

perf evlist: Remove needless util.h from evlist.h

tip: perf/core tip-bot2 for Arnaldo Carvalho de Melo 1 participant 1 message Aug 29, 2019 1 message not in the archive perf events

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

tip-bot2 for Arnaldo Carvalho de Melo

author merge bot Applied
#1 lore raw

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     2da39f1cc36bff4cc53dc32a4afb3def488cc766
Gitweb:        https://git.kernel.org/tip/2da39f1cc36bff4cc53dc32a4afb3def488cc766
Author:        Arnaldo Carvalho de Melo <[email protected]>
AuthorDate:    Tue, 27 Aug 2019 11:51:18 -03:00
Committer:     Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Wed, 28 Aug 2019 17:19:35 -03:00

perf evlist: Remove needless util.h from evlist.h

There is no need for that util/util.h include there and, remove it, pruning the include tree, fix the fallout by adding necessary headers to places that were getting needed includes indirectly from evlist.h -> util.h.

---
 tools/perf/arch/x86/util/intel-bts.c | 1 +
 tools/perf/arch/x86/util/intel-pt.c  | 1 +
 tools/perf/builtin-report.c          | 1 +
 tools/perf/builtin-script.c          | 1 +
 tools/perf/builtin-top.c             | 1 +
 tools/perf/builtin-trace.c           | 1 +
 tools/perf/tests/sdt.c               | 1 +
 tools/perf/util/auxtrace.c           | 1 +
 tools/perf/util/evlist.c             | 1 +
 tools/perf/util/evlist.h             | 1 -
 tools/perf/util/evsel.c              | 1 +
 tools/perf/util/header.c             | 1 +
 tools/perf/util/session.c            | 1 +
 13 files changed, 12 insertions(+), 1 deletion(-)
tools/perf/arch/x86/util/intel-bts.c +1 -0
index 16d26ea..e4bb5df 100644
@@ -22,6 +22,7 @@
 #include "../../util/tsc.h"
 #include "../../util/auxtrace.h"
 #include "../../util/intel-bts.h"
+#include "../../util/util.h"
 
 #define KiB(x) ((x) * 1024)
 #define MiB(x) ((x) * 1024 * 1024)
tools/perf/arch/x86/util/intel-pt.c +1 -0
index 746981c..04b424a 100644
@@ -26,6 +26,7 @@
 #include "../../util/record.h"
 #include "../../util/target.h"
 #include "../../util/tsc.h"
+#include "../../util/util.h"
 #include "../../util/intel-pt.h"
 
 #define KiB(x) ((x) * 1024)
tools/perf/builtin-report.c +1 -0
index 318b0b9..0338916 100644
@@ -44,6 +44,7 @@
 #include "util/auxtrace.h"
 #include "util/units.h"
 #include "util/branch.h"
+#include "util/util.h"
 
 #include <dlfcn.h>
 #include <errno.h>
tools/perf/builtin-script.c +1 -0
index 51e7e6d..e005be0 100644
@@ -52,6 +52,7 @@
 #include <subcmd/pager.h>
 #include <perf/evlist.h>
 #include "util/record.h"
+#include "util/util.h"
 
 #include <linux/ctype.h>
 
tools/perf/builtin-top.c +1 -0
index 29e910f..42ba733 100644
@@ -34,6 +34,7 @@
 #include "util/thread.h"
 #include "util/thread_map.h"
 #include "util/top.h"
+#include "util/util.h"
 #include <linux/rbtree.h>
 #include <subcmd/parse-options.h>
 #include "util/parse-events.h"
tools/perf/builtin-trace.c +1 -0
index 58a75dd..6d9805a 100644
@@ -41,6 +41,7 @@
 #include "util/intlist.h"
 #include "util/thread_map.h"
 #include "util/stat.h"
+#include "util/util.h"
 #include "trace/beauty/beauty.h"
 #include "trace-event.h"
 #include "util/parse-events.h"
tools/perf/tests/sdt.c +1 -0
index 8bfaa63..dbc35a8 100644
@@ -9,6 +9,7 @@
 #include "debug.h"
 #include "probe-file.h"
 #include "build-id.h"
+#include "util.h"
 
 /* To test SDT event, we need libelf support to scan elf binary */
 #if defined(HAVE_SDT_EVENT) && defined(HAVE_LIBELF_SUPPORT)
tools/perf/util/auxtrace.c +1 -0
index 12e9b7a..112c24a 100644
@@ -50,6 +50,7 @@
 #include "intel-bts.h"
 #include "arm-spe.h"
 #include "s390-cpumsf.h"
+#include "util.h"
 
 #include <linux/ctype.h>
 #include "symbol/kallsyms.h"
tools/perf/util/evlist.c +1 -0
index 47bc541..5ad92fa 100644
@@ -16,6 +16,7 @@
 #include "evsel.h"
 #include "debug.h"
 #include "units.h"
+#include "util.h"
 #include "asm/bug.h"
 #include "bpf-event.h"
 #include <signal.h>
tools/perf/util/evlist.h +0 -1
index e31ddcc..16796de 100644
@@ -13,7 +13,6 @@
 #include "event.h"
 #include "evsel.h"
 #include "mmap.h"
-#include "util.h"
 #include <signal.h>
 #include <unistd.h>
 
tools/perf/util/evsel.c +1 -0
index d4540bf..dbc04e1 100644
@@ -40,6 +40,7 @@
 #include "stat.h"
 #include "string2.h"
 #include "memswap.h"
+#include "util.h"
 #include "util/parse-branch-options.h"
 #include <internal/xyarray.h>
 
tools/perf/util/header.c +1 -0
index 1f2965a..8e67faf 100644
@@ -42,6 +42,7 @@
 #include "tool.h"
 #include "time-utils.h"
 #include "units.h"
+#include "util.h"
 #include "cputopo.h"
 #include "bpf-event.h"
 
tools/perf/util/session.c +1 -0
index 5786e9c..a275f2e 100644
@@ -29,6 +29,7 @@
 #include "thread-stack.h"
 #include "sample-raw.h"
 #include "stat.h"
+#include "util.h"
 #include "arch/common.h"
 
 #ifdef HAVE_ZSTD_SUPPORT