perf tools: Remove sys/ioctl.h from util.h

Not needed in this header, added to the places that need 'struct
winsize' and the ioctl defines.

Link: http://lkml.kernel.org/n/tip-2pznlli3146y4242otlcm70m@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 5eb638fd003f74bd58387cbbf5611d33c50327c7..46c0faf6c502b9ae31ac09901bbca31de61691bf 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -25,6 +25,7 @@
 #include "parse-events.h"
 #include <subcmd/parse-options.h>
 
+#include <sys/ioctl.h>
 #include <sys/mman.h>
 
 #include <linux/bitops.h>

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 44a7aef3911b02b2c3bab3fdf6c5c51873beebea..0e879097adfb33b455d16aa31099e698ee34db04 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -16,6 +16,7 @@
 #include <linux/hw_breakpoint.h>
 #include <linux/perf_event.h>
 #include <linux/err.h>
+#include <sys/ioctl.h>
 #include <sys/resource.h>
 #include "asm/bug.h"
 #include "callchain.h"

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 4f7e42e18f8a5fe75ec7f7538017a8dfe3a4a1f2..01e779b91c8ef618984fcdb8d68d526b1870828a 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -2,6 +2,7 @@
 #include <linux/err.h>
 #include <dirent.h>
 #include <errno.h>
+#include <sys/ioctl.h>
 #include <sys/param.h>
 #include "term.h"
 #include "../perf.h"

diff --git a/tools/perf/util/top.h b/tools/perf/util/top.h
index b2940c88734a01e280046f5c806c2a530fafc25a..9bdfb78a9a35d2b27a3c38bf5234af0af1f7985d 100644 (file)
--- a/tools/perf/util/top.h
+++ b/tools/perf/util/top.h
@@ -5,7 +5,7 @@
 #include <linux/types.h>
 #include <stddef.h>
 #include <stdbool.h>
-#include <termios.h>
+#include <sys/ioctl.h>
 
 struct perf_evlist;
 struct perf_evsel;

diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 0df20a3973daf546a9098d4f728324882a6ecf06..c014b2fc22b3c238d2f946f70888358144af7883 100644 (file)
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <sys/wait.h>
 #include <poll.h>
-#include <sys/ioctl.h>
 #include <linux/types.h>
 
 extern char buildid_dir[];