aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2018-01-22 14:42:16 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2018-01-25 04:37:30 -0500
commitbafae98e7a95df74ce4529ae96251cb12c86fdf3 (patch)
tree622eb6822d6435ebec837e78f296047860862b68
parent3258abe0991590a182be0a20ef6b79b65fe2c9cd (diff)
perf evlist: Remove fcntl.h from evlist.h
Not needed there, fixup the places where it is needed and was getting only by luck via evlist.h. 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: https://lkml.kernel.org/n/tip-yxjpetn64z8vjuguu84gr6x6@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/builtin-kvm.c3
-rw-r--r--tools/perf/builtin-script.c1
-rw-r--r--tools/perf/builtin-trace.c1
-rw-r--r--tools/perf/tests/bpf.c1
-rw-r--r--tools/perf/tests/openat-syscall-tp-fields.c3
-rw-r--r--tools/perf/util/cgroup.c3
-rw-r--r--tools/perf/util/evlist.c1
-rw-r--r--tools/perf/util/evlist.h1
-rw-r--r--tools/perf/util/parse-events.c3
9 files changed, 16 insertions, 1 deletions
diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index 98853162eae9..55d919dc5bc6 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -26,6 +26,9 @@
26#include <sys/timerfd.h> 26#include <sys/timerfd.h>
27#endif 27#endif
28#include <sys/time.h> 28#include <sys/time.h>
29#include <sys/types.h>
30#include <sys/stat.h>
31#include <fcntl.h>
29 32
30#include <linux/kernel.h> 33#include <linux/kernel.h>
31#include <linux/time64.h> 34#include <linux/time64.h>
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 3499d68e1d70..ab19a6ee4093 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -42,6 +42,7 @@
42#include <sys/param.h> 42#include <sys/param.h>
43#include <sys/types.h> 43#include <sys/types.h>
44#include <sys/stat.h> 44#include <sys/stat.h>
45#include <fcntl.h>
45#include <unistd.h> 46#include <unistd.h>
46 47
47#include "sane_ctype.h" 48#include "sane_ctype.h"
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 46d3ff09440c..868306ccd8b8 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -56,6 +56,7 @@
56#include <linux/random.h> 56#include <linux/random.h>
57#include <linux/stringify.h> 57#include <linux/stringify.h>
58#include <linux/time64.h> 58#include <linux/time64.h>
59#include <fcntl.h>
59 60
60#include "sane_ctype.h" 61#include "sane_ctype.h"
61 62
diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
index 8e709c9d512c..e8399beca62b 100644
--- a/tools/perf/tests/bpf.c
+++ b/tools/perf/tests/bpf.c
@@ -3,6 +3,7 @@
3#include <sys/epoll.h> 3#include <sys/epoll.h>
4#include <sys/types.h> 4#include <sys/types.h>
5#include <sys/stat.h> 5#include <sys/stat.h>
6#include <fcntl.h>
6#include <util/util.h> 7#include <util/util.h>
7#include <util/bpf-loader.h> 8#include <util/bpf-loader.h>
8#include <util/evlist.h> 9#include <util/evlist.h>
diff --git a/tools/perf/tests/openat-syscall-tp-fields.c b/tools/perf/tests/openat-syscall-tp-fields.c
index 97c9407d02a0..43519267b93b 100644
--- a/tools/perf/tests/openat-syscall-tp-fields.c
+++ b/tools/perf/tests/openat-syscall-tp-fields.c
@@ -1,5 +1,8 @@
1// SPDX-License-Identifier: GPL-2.0 1// SPDX-License-Identifier: GPL-2.0
2#include <linux/err.h> 2#include <linux/err.h>
3#include <sys/types.h>
4#include <sys/stat.h>
5#include <fcntl.h>
3#include "perf.h" 6#include "perf.h"
4#include "evlist.h" 7#include "evlist.h"
5#include "evsel.h" 8#include "evsel.h"
diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c
index d9ffc1e6eb39..984f69144f87 100644
--- a/tools/perf/util/cgroup.c
+++ b/tools/perf/util/cgroup.c
@@ -6,6 +6,9 @@
6#include "cgroup.h" 6#include "cgroup.h"
7#include "evlist.h" 7#include "evlist.h"
8#include <linux/stringify.h> 8#include <linux/stringify.h>
9#include <sys/types.h>
10#include <sys/stat.h>
11#include <fcntl.h>
9 12
10int nr_cgroups; 13int nr_cgroups;
11 14
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 120efd85f2c8..ac35cd214feb 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -25,6 +25,7 @@
25#include "parse-events.h" 25#include "parse-events.h"
26#include <subcmd/parse-options.h> 26#include <subcmd/parse-options.h>
27 27
28#include <fcntl.h>
28#include <sys/ioctl.h> 29#include <sys/ioctl.h>
29#include <sys/mman.h> 30#include <sys/mman.h>
30 31
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index e7fbca69cbac..75f8e0ad5d76 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -7,7 +7,6 @@
7#include <linux/refcount.h> 7#include <linux/refcount.h>
8#include <linux/list.h> 8#include <linux/list.h>
9#include <api/fd/array.h> 9#include <api/fd/array.h>
10#include <fcntl.h>
11#include <stdio.h> 10#include <stdio.h>
12#include "../perf.h" 11#include "../perf.h"
13#include "event.h" 12#include "event.h"
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 170316795a18..34589c427e52 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -4,6 +4,9 @@
4#include <dirent.h> 4#include <dirent.h>
5#include <errno.h> 5#include <errno.h>
6#include <sys/ioctl.h> 6#include <sys/ioctl.h>
7#include <sys/types.h>
8#include <sys/stat.h>
9#include <fcntl.h>
7#include <sys/param.h> 10#include <sys/param.h>
8#include "term.h" 11#include "term.h"
9#include "../perf.h" 12#include "../perf.h"