diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/compiler-gcc.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/compiler-gcc.h')
| -rw-r--r-- | include/linux/compiler-gcc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index b2fd7547b58d..5c8351b859f0 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h | |||
| @@ -29,10 +29,11 @@ | |||
| 29 | BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(typeof(a), typeof(&a[0]))) | 29 | BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(typeof(a), typeof(&a[0]))) |
| 30 | 30 | ||
| 31 | /* | 31 | /* |
| 32 | * Force always-inline if the user requests it so via the .config: | 32 | * Force always-inline if the user requests it so via the .config, |
| 33 | * or if gcc is too old: | ||
| 33 | */ | 34 | */ |
| 34 | #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \ | 35 | #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \ |
| 35 | !defined(CONFIG_OPTIMIZE_INLINING) && (__GNUC__ >= 4) | 36 | !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4) |
| 36 | # define inline inline __attribute__((always_inline)) | 37 | # define inline inline __attribute__((always_inline)) |
| 37 | # define __inline__ __inline__ __attribute__((always_inline)) | 38 | # define __inline__ __inline__ __attribute__((always_inline)) |
| 38 | # define __inline __inline __attribute__((always_inline)) | 39 | # define __inline __inline __attribute__((always_inline)) |