diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
| commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
| tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /include/asm-alpha/compiler.h | |
| parent | d6a4c847e43c851cc0ddf73087a730227223f989 (diff) | |
| parent | ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1 (diff) | |
Merge from Linus' tree.
Diffstat (limited to 'include/asm-alpha/compiler.h')
| -rw-r--r-- | include/asm-alpha/compiler.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-alpha/compiler.h b/include/asm-alpha/compiler.h index 399c33b7be51..0a4a8b40dfcd 100644 --- a/include/asm-alpha/compiler.h +++ b/include/asm-alpha/compiler.h | |||
| @@ -98,6 +98,9 @@ | |||
| 98 | #undef inline | 98 | #undef inline |
| 99 | #undef __inline__ | 99 | #undef __inline__ |
| 100 | #undef __inline | 100 | #undef __inline |
| 101 | 101 | #if __GNUC__ == 3 && __GNUC_MINOR__ >= 1 || __GNUC__ > 3 | |
| 102 | #undef __always_inline | ||
| 103 | #define __always_inline inline __attribute__((always_inline)) | ||
| 104 | #endif | ||
| 102 | 105 | ||
| 103 | #endif /* __ALPHA_COMPILER_H */ | 106 | #endif /* __ALPHA_COMPILER_H */ |