diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-22 14:26:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-22 14:26:56 -0400 |
| commit | 8f6544edb2c7a7464fbbce1d86a4de414dc0cf95 (patch) | |
| tree | 5030e903106465b36e769ea04d4dfe2b91b22949 /tools/perf/util/include/linux/compiler.h | |
| parent | 4762e252f4afc6909edb0babe9c25f126afedcaa (diff) | |
| parent | fe4c51b22080691792d3e28d86acb4d4ccb7e8e8 (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf tools: Add group event scheduling option to perf record/stat
MAINTAINERS: Fix list of perf events source files
perf tools: Fix build against newer glibc
perf tools: Fix error handling of unknown events
perf evlist: Fix missing event name init for default event
perf list: Fix exit value
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 @@ | |||
| 5 | #define __always_inline inline | 5 | #define __always_inline inline |
| 6 | #endif | 6 | #endif |
| 7 | #define __user | 7 | #define __user |
| 8 | #ifndef __attribute_const__ | ||
| 8 | #define __attribute_const__ | 9 | #define __attribute_const__ |
| 10 | #endif | ||
| 9 | 11 | ||
| 10 | #define __used __attribute__((__unused__)) | 12 | #define __used __attribute__((__unused__)) |
| 11 | 13 | ||