diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
| commit | 944d79559d154c12becde0dab327016cf438f46c (patch) | |
| tree | 50c101806f4d3b6585222dda060559eb4f3e005a /include/linux/compiler-gcc4.h | |
| parent | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (diff) | |
| parent | 0f36b018b2e314d45af86449f1a97facb1fbe300 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/linux/compiler-gcc4.h')
| -rw-r--r-- | include/linux/compiler-gcc4.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index 53686c037a06..6f5cc6f0e7a6 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h | |||
| @@ -3,14 +3,16 @@ | |||
| 3 | /* These definitions are for GCC v4.x. */ | 3 | /* These definitions are for GCC v4.x. */ |
| 4 | #include <linux/compiler-gcc.h> | 4 | #include <linux/compiler-gcc.h> |
| 5 | 5 | ||
| 6 | #define inline inline __attribute__((always_inline)) | 6 | #ifdef CONFIG_FORCED_INLINING |
| 7 | #define __inline__ __inline__ __attribute__((always_inline)) | 7 | # undef inline |
| 8 | #define __inline __inline __attribute__((always_inline)) | 8 | # undef __inline__ |
| 9 | #define __deprecated __attribute__((deprecated)) | 9 | # undef __inline |
| 10 | # define inline inline __attribute__((always_inline)) | ||
| 11 | # define __inline__ __inline__ __attribute__((always_inline)) | ||
| 12 | # define __inline __inline __attribute__((always_inline)) | ||
| 13 | #endif | ||
| 14 | |||
| 10 | #define __attribute_used__ __attribute__((__used__)) | 15 | #define __attribute_used__ __attribute__((__used__)) |
| 11 | #define __attribute_pure__ __attribute__((pure)) | ||
| 12 | #define __attribute_const__ __attribute__((__const__)) | ||
| 13 | #define noinline __attribute__((noinline)) | ||
| 14 | #define __must_check __attribute__((warn_unused_result)) | 16 | #define __must_check __attribute__((warn_unused_result)) |
| 15 | #define __compiler_offsetof(a,b) __builtin_offsetof(a,b) | 17 | #define __compiler_offsetof(a,b) __builtin_offsetof(a,b) |
| 16 | 18 | #define __always_inline inline __attribute__((always_inline)) | |