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

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Apr 24, 2017 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2017-04-24 21:13 UTC #0 lore raw

Commit-ID:  86a5e0c2028899465a129d87f60fe4018c5ae839
Gitweb:     http://git.kernel.org/tip/86a5e0c2028899465a129d87f60fe4018c5ae839
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 19 Apr 2017 19:03:14 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 24 Apr 2017 13:43:32 -0300

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/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/util/evlist.c       | 1 +
 tools/perf/util/evsel.c        | 1 +
 tools/perf/util/parse-events.c | 1 +
 tools/perf/util/top.h          | 2 +-
 tools/perf/util/util.h         | 1 -
 5 files changed, 4 insertions(+), 2 deletions(-)

tools/perf/util/evlist.c +1 -0

index 5eb638f..46c0faf 100644
@@ -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>

tools/perf/util/evsel.c +1 -0

index 44a7aef..0e87909 100644
@@ -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"

tools/perf/util/parse-events.c +1 -0

index 4f7e42e..01e779b 100644
@@ -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"

tools/perf/util/top.h +1 -1

index b2940c8..9bdfb78 100644
@@ -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;

tools/perf/util/util.h +0 -1

index 0df20a3..c014b2f 100644
@@ -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[];