summaryrefslogtreecommitdiffstats
path: root/tools/perf/util
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2017-04-18 11:08:10 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2017-04-19 13:01:53 -0300
commitb0742e90f5ab904aa835350c28bcec48e9109379 (patch)
tree32aac13c7004239579aea973b88d98a3e7e95cae /tools/perf/util
parent8ec20b176c4be72d067fa18e33a4f156d1da9bc8 (diff)
downloadlinux-b0742e90f5ab904aa835350c28bcec48e9109379.tar.bz2
perf tools: Don't include terminal handling headers in util.h
Continuing the disentanglement, mostly the TUI needs CTRL(c), that is in sys/ttydefaults.h and term.c needs the termios headers. And term.h needs to be added to a few places too. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/n/tip-il19zna7qj9ytavdbwlipc7t@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
-rw-r--r--tools/perf/util/parse-events.c2
-rw-r--r--tools/perf/util/term.c6
-rw-r--r--tools/perf/util/util.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 580f0e17ad38..f3dd1aa59a25 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1,7 +1,7 @@
#include <linux/hw_breakpoint.h>
#include <linux/err.h>
#include <errno.h>
-#include "util.h"
+#include "term.h"
#include "../perf.h"
#include "evlist.h"
#include "evsel.h"
diff --git a/tools/perf/util/term.c b/tools/perf/util/term.c
index 90b47d8aa19c..8f254a74d97d 100644
--- a/tools/perf/util/term.c
+++ b/tools/perf/util/term.c
@@ -1,4 +1,8 @@
-#include "util.h"
+#include "term.h"
+#include <stdlib.h>
+#include <termios.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
void get_term_dimensions(struct winsize *ws)
{
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 397676c25232..fa8c2e59a0bc 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -17,7 +17,6 @@
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
-#include <term.h>
#include <limits.h>
#include <sys/param.h>
#include <sys/types.h>
@@ -35,11 +34,8 @@
#include <sys/ioctl.h>
#include <linux/kernel.h>
#include <linux/types.h>
-#include <sys/ttydefaults.h>
#include <api/fs/tracing_path.h>
-#include <termios.h>
#include <linux/bitops.h>
-#include <termios.h>
extern char buildid_dir[];