aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2017-04-25 10:45:59 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2017-04-25 10:45:59 -0400
commit6db81643fe41f51cf9f6fd10558b8b323d9198ba (patch)
tree743c48d4921a5fc8644e209fca3d48737896549c
parentfd7647979a3948dae4fc6f25dbbdf9ba269bed78 (diff)
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>
-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 @@
1#include <errno.h> 1#include <errno.h>
2#include <stdio.h> 2#include <stdio.h>
3#include <sys/epoll.h> 3#include <sys/epoll.h>
4#include <util/util.h>
5#include <util/evlist.h> 4#include <util/evlist.h>
6#include <linux/filter.h> 5#include <linux/filter.h>
7#include "tests.h" 6#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);
44int build_id_cache__add_s(const char *sbuild_id, 44int build_id_cache__add_s(const char *sbuild_id,
45 const char *name, bool is_kallsyms, bool is_vdso); 45 const char *name, bool is_kallsyms, bool is_vdso);
46int build_id_cache__remove_s(const char *sbuild_id); 46int build_id_cache__remove_s(const char *sbuild_id);
47
48extern char buildid_dir[];
49
50void set_buildid_dir(const char *dir);
47void disable_buildid_cache(void); 51void disable_buildid_cache(void);
48 52
49#endif 53#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 @@
14#include <stdarg.h> 14#include <stdarg.h>
15#include <linux/types.h> 15#include <linux/types.h>
16 16
17extern char buildid_dir[];
18
19#ifdef __GNUC__ 17#ifdef __GNUC__
20#define NORETURN __attribute__((__noreturn__)) 18#define NORETURN __attribute__((__noreturn__))
21#else 19#else
@@ -36,7 +34,6 @@ void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
36void set_warning_routine(void (*routine)(const char *err, va_list params)); 34void set_warning_routine(void (*routine)(const char *err, va_list params));
37 35
38int prefixcmp(const char *str, const char *prefix); 36int prefixcmp(const char *str, const char *prefix);
39void set_buildid_dir(const char *dir);
40 37
41static inline void *zalloc(size_t size) 38static inline void *zalloc(size_t size)
42{ 39{