diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
| commit | c58310bf4933986513020fa90b4190c7492995ae (patch) | |
| tree | 143f2c7578d02ebef5db8fc57ae69e951ae0e2ee /include/linux/compiler-gcc4.h | |
| parent | 269cdfaf769f5cd831284cc831790c7c5038040f (diff) | |
| parent | 1309d4e68497184d2fd87e892ddf14076c2bda98 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'include/linux/compiler-gcc4.h')
| -rw-r--r-- | include/linux/compiler-gcc4.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index 0ab3a3232330..974f5b7bb205 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h | |||
| @@ -5,15 +5,6 @@ | |||
| 5 | /* These definitions are for GCC v4.x. */ | 5 | /* These definitions are for GCC v4.x. */ |
| 6 | #include <linux/compiler-gcc.h> | 6 | #include <linux/compiler-gcc.h> |
| 7 | 7 | ||
| 8 | #ifdef CONFIG_FORCED_INLINING | ||
| 9 | # undef inline | ||
| 10 | # undef __inline__ | ||
| 11 | # undef __inline | ||
| 12 | # define inline inline __attribute__((always_inline)) | ||
| 13 | # define __inline__ __inline__ __attribute__((always_inline)) | ||
| 14 | # define __inline __inline __attribute__((always_inline)) | ||
| 15 | #endif | ||
| 16 | |||
| 17 | #define __used __attribute__((__used__)) | 8 | #define __used __attribute__((__used__)) |
| 18 | #define __must_check __attribute__((warn_unused_result)) | 9 | #define __must_check __attribute__((warn_unused_result)) |
| 19 | #define __compiler_offsetof(a,b) __builtin_offsetof(a,b) | 10 | #define __compiler_offsetof(a,b) __builtin_offsetof(a,b) |