summaryrefslogtreecommitdiffstats
path: root/tools/perf/perf.h
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2014-04-25 21:31:02 +0200
committerJiri Olsa <jolsa@kernel.org>2014-05-01 21:22:39 +0200
commitd944c4eebcf4c0d5e5d9728fec110cbf0047ad7f (patch)
tree94240760600b3b1de6b6c95fe76b68a6990b2669 /tools/perf/perf.h
parent5ac3e4b6d1d8fb911bb9c497126c51b02033a412 (diff)
downloadlinux-d944c4eebcf4c0d5e5d9728fec110cbf0047ad7f.tar.bz2
tools: Consolidate types.h
Combine all definitions into a common tools/include/linux/types.h and kill the wild growth elsewhere. Move DECLARE_BITMAP to its proper bitmap.h header. Signed-off-by: Borislav Petkov <bp@suse.de> Acked-by: Rusty Russell <rusty@rustcorp.com.au> Link: http://lkml.kernel.org/n/tip-azczs7qcv6h9xek9od10hiv2@git.kernel.org Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Diffstat (limited to 'tools/perf/perf.h')
-rw-r--r--tools/perf/perf.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index ebdad3376c67..5aa8ac45082f 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -173,9 +173,8 @@
#include <sys/types.h>
#include <sys/syscall.h>
+#include <linux/types.h>
#include <linux/perf_event.h>
-#include "util/types.h"
-#include <stdbool.h>
/*
* prctl(PR_TASK_PERF_EVENTS_DISABLE) will (cheaply) disable all
@@ -202,7 +201,6 @@ static inline unsigned long long rdclock(void)
/*
* Pick up some kernel type conventions:
*/
-#define __user
#define asmlinkage
#define unlikely(x) __builtin_expect(!!(x), 0)