summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/include/linux/compiler.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-09-13 17:11:19 +0200
committerIngo Molnar <mingo@kernel.org>2012-09-13 17:11:19 +0200
commitbe267be8b191d5fac9f65a29e047470f364315eb (patch)
tree80cdb3f7c1d53fc6209fac2d57ff9a4052e2750e /tools/perf/util/include/linux/compiler.h
parentd5cb2aef4fda355fbafe8db4f425b73ea94d2019 (diff)
parent9ec3f4e437ede2f3b5087d412abe16a0219b3b99 (diff)
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo: * Remove die()/exit() calls from several tools. * Add missing perf_regs.h file to MANIFEST * Clean up and improve 'perf sched' performance by elliminating lots of needless calls to libtraceevent. * More patches to make perf build on Android, from Irina Tirdea * Resolve vdso callchains, from Jiri Olsa Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/include/linux/compiler.h')
-rw-r--r--tools/perf/util/include/linux/compiler.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h
index 2dc867128e4..96b919dae11 100644
--- a/tools/perf/util/include/linux/compiler.h
+++ b/tools/perf/util/include/linux/compiler.h
@@ -9,7 +9,13 @@
#define __attribute_const__
#endif
-#define __used __attribute__((__unused__))
+#ifndef __maybe_unused
+#define __maybe_unused __attribute__((unused))
+#endif
#define __packed __attribute__((__packed__))
+#ifndef __force
+#define __force
+#endif
+
#endif