summaryrefslogtreecommitdiff
path: root/tools/perf
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2017-04-18 18:33:30 +0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2017-04-19 19:01:56 +0300
commit1eae20c1d40acf7676aa799b48f747d9b28bf352 (patch)
tree404b15cff6e1c5fe940d299f215e44561d5b0cdf /tools/perf
parent76b31a29ddaf2fa5f0a70458c214bed02a4a70e9 (diff)
downloadlinux-1eae20c1d40acf7676aa799b48f747d9b28bf352.tar.xz
perf tools: Remove regex.h and fnmatch.h from util.h
The users of regex and fnmatch functions should include those headers instead. 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-ixzm5kuamsq1ixbkuv6kmwzj@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/builtin-report.c1
-rw-r--r--tools/perf/util/machine.c1
-rw-r--r--tools/perf/util/sort.c1
-rw-r--r--tools/perf/util/sort.h2
-rw-r--r--tools/perf/util/util.h2
5 files changed, 4 insertions, 3 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index f50738e0006e..5bbd4b2ef6d2 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -41,6 +41,7 @@
#include <dlfcn.h>
#include <errno.h>
#include <inttypes.h>
+#include <regex.h>
#include <linux/bitmap.h>
#include <linux/stringify.h>
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 46411742d03c..988e84ce6f88 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1,6 +1,7 @@
#include <dirent.h>
#include <errno.h>
#include <inttypes.h>
+#include <regex.h>
#include "callchain.h"
#include "debug.h"
#include "event.h"
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 4df228ab4db1..fe4fd7b5f8e0 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -1,5 +1,6 @@
#include <errno.h>
#include <inttypes.h>
+#include <regex.h>
#include <sys/mman.h>
#include "sort.h"
#include "hist.h"
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 421232a27e7b..8bcec05ee578 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -2,7 +2,7 @@
#define __PERF_SORT_H
#include "../builtin.h"
-#include "util.h"
+#include <regex.h>
#include "color.h"
#include <linux/list.h>
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index c0574e2763b7..d79f3c23dd02 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -23,9 +23,7 @@
#include <sys/time.h>
#include <time.h>
#include <signal.h>
-#include <fnmatch.h>
#include <assert.h>
-#include <regex.h>
#include <utime.h>
#include <sys/wait.h>
#include <poll.h>