diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-08-18 21:51:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-18 21:51:44 +0200 |
| commit | fe4c51b22080691792d3e28d86acb4d4ccb7e8e8 (patch) | |
| tree | a88323ad10bb2ad6b19b5ea5fbb41a210096bd5f /tools/perf/util/include/linux/compiler.h | |
| parent | 72ed62bdc46d76c965fb95aecb5d0bf97c976723 (diff) | |
| parent | 43bece79796c2a39ec98998fd3f1071f04f3d8c3 (diff) | |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Diffstat (limited to 'tools/perf/util/include/linux/compiler.h')
| -rw-r--r-- | tools/perf/util/include/linux/compiler.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h index 791f9dd27ebf..547628e97f3d 100644 --- a/tools/perf/util/include/linux/compiler.h +++ b/tools/perf/util/include/linux/compiler.h @@ -5,7 +5,9 @@ #define __always_inline inline #endif #define __user +#ifndef __attribute_const__ #define __attribute_const__ +#endif #define __used __attribute__((__unused__)) |