diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-05-21 15:27:26 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-05-21 15:27:26 -0400 |
| commit | ee9a3607fb03e804ddf624544105f4e34260c380 (patch) | |
| tree | ce41b6e0fa10982a306f6c142a92dbf3c9961284 /tools/perf/util/include/linux/compiler.h | |
| parent | b492e95be0ae672922f4734acf3f5d35c30be948 (diff) | |
| parent | d515e86e639890b33a09390d062b0831664f04a2 (diff) | |
Merge branch 'master' into for-2.6.35
Conflicts:
fs/ext3/fsync.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
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 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 |