summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2017-04-25 11:45:59 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2017-04-25 11:45:59 -0300
commit6db81643fe41f51cf9f6fd10558b8b323d9198ba (patch)
tree743c48d4921a5fc8644e209fca3d48737896549c /tools
parentfd7647979a3948dae4fc6f25dbbdf9ba269bed78 (diff)
downloadlinux-stable-6db81643fe41f51cf9f6fd10558b8b323d9198ba.tar.gz
linux-stable-6db81643fe41f51cf9f6fd10558b8b323d9198ba.tar.bz2
linux-stable-6db81643fe41f51cf9f6fd10558b8b323d9198ba.zip
perf buildid: Move prototypes from util.h to build-id.h
Where they belong. Link: http://lkml.kernel.org/n/tip-94m3dziejxgo7k0488q3mqjm@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/tests/sdt.c1
-rw-r--r--tools/perf/util/build-id.h4
-rw-r--r--tools/perf/util/util.h3
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/perf/tests/sdt.c b/tools/perf/tests/sdt.c
index f73b3c5e125d..06eda675ae2c 100644
--- a/tools/perf/tests/sdt.c
+++ b/tools/perf/tests/sdt.c
@@ -1,7 +1,6 @@
#include <errno.h>
#include <stdio.h>
#include <sys/epoll.h>
-#include <util/util.h>
#include <util/evlist.h>
#include <linux/filter.h>
#include "tests.h"
diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h
index a96081121179..8a89b195c1fc 100644
--- a/tools/perf/util/build-id.h
+++ b/tools/perf/util/build-id.h
@@ -44,6 +44,10 @@ bool build_id_cache__cached(const char *sbuild_id);
int build_id_cache__add_s(const char *sbuild_id,
const char *name, bool is_kallsyms, bool is_vdso);
int build_id_cache__remove_s(const char *sbuild_id);
+
+extern char buildid_dir[];
+
+void set_buildid_dir(const char *dir);
void disable_buildid_cache(void);
#endif
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 3852b6d3270a..e7b6f36d8904 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -14,8 +14,6 @@
#include <stdarg.h>
#include <linux/types.h>
-extern char buildid_dir[];
-
#ifdef __GNUC__
#define NORETURN __attribute__((__noreturn__))
#else
@@ -36,7 +34,6 @@ void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
void set_warning_routine(void (*routine)(const char *err, va_list params));
int prefixcmp(const char *str, const char *prefix);
-void set_buildid_dir(const char *dir);
static inline void *zalloc(size_t size)
{