aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2010-03-25 18:58:59 -0400
committerIngo Molnar <mingo@elte.hu>2010-03-26 03:52:59 -0400
commit618038df3588fdfcaccfd40057f36ce792bee252 (patch)
tree6bdc3a9a28f5cab5e1facf6b0e6c30e18c45356b /tools/perf
parent4b8cf84624e9a58a21aaac3d064222092ae234e0 (diff)
perf tools: Move __used from perf.h to linux/compiler.h
Just like in the kernel and also to remove the need to include perf.h in the symbol subsystem. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Frédéric Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> LKML-Reference: <1269557941-15617-4-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/perf.h2
-rw-r--r--tools/perf/util/include/linux/compiler.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index aa786158b668..ec212748d651 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -106,8 +106,6 @@ static inline unsigned long long rdclock(void)
106#define __user 106#define __user
107#define asmlinkage 107#define asmlinkage
108 108
109#define __used __attribute__((__unused__))
110
111#define unlikely(x) __builtin_expect(!!(x), 0) 109#define unlikely(x) __builtin_expect(!!(x), 0)
112#define min(x, y) ({ \ 110#define min(x, y) ({ \
113 typeof(x) _min1 = (x); \ 111 typeof(x) _min1 = (x); \
diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h
index dfb0713ed47f..791f9dd27ebf 100644
--- a/tools/perf/util/include/linux/compiler.h
+++ b/tools/perf/util/include/linux/compiler.h
@@ -7,4 +7,6 @@
7#define __user 7#define __user
8#define __attribute_const__ 8#define __attribute_const__
9 9
10#define __used __attribute__((__unused__))
11
10#endif 12#endif