diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2004-08-22 22:45:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-22 22:45:33 -0700 |
| commit | 2f85be7d30a34f7b4919bbe3e68ec5f63634bd85 (patch) | |
| tree | 17809cab70685c3935ada1a4583dbde3510acb70 /include | |
| parent | 4e9d864d3d054c5acb3d4067c8157360dfb69ab7 (diff) | |
| download | history-2f85be7d30a34f7b4919bbe3e68ec5f63634bd85.tar.gz | |
[PATCH] clean up __always_inline__ usage
I find it somewhat annoying that the preprocessor expands every "inline" to
"__inline__ __attribute__((always_inline)) __attribute__((always_inline))"
in the current code.
Fix that up.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/compiler-gcc+.h | 6 | ||||
| -rw-r--r-- | include/linux/compiler-gcc3.h | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/include/linux/compiler-gcc+.h b/include/linux/compiler-gcc+.h index 5629cf5cd9c952..6b9308541dcd39 100644 --- a/include/linux/compiler-gcc+.h +++ b/include/linux/compiler-gcc+.h @@ -6,9 +6,9 @@ */ #include <linux/compiler-gcc.h> -#define inline __inline__ __attribute__((always_inline)) -#define __inline__ __inline__ __attribute__((always_inline)) -#define __inline __inline__ __attribute__((always_inline)) +#define inline inline __attribute__((always_inline)) +#define __inline__ __inline__ __attribute__((always_inline)) +#define __inline __inline __attribute__((always_inline)) #define __deprecated __attribute__((deprecated)) #define __attribute_used__ __attribute__((__used__)) #define __attribute_pure__ __attribute__((pure)) diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h index 61f8cd034e7ec9..54a461e0661453 100644 --- a/include/linux/compiler-gcc3.h +++ b/include/linux/compiler-gcc3.h @@ -4,13 +4,9 @@ #include <linux/compiler-gcc.h> #if __GNUC_MINOR__ >= 1 -# define inline __inline__ __attribute__((always_inline)) -# define __inline__ __inline__ __attribute__((always_inline)) -# define __inline __inline__ __attribute__((always_inline)) -#endif - -#if __GNUC_MINOR__ >= 1 -# define __always_inline inline __attribute__((always_inline)) +# define inline inline __attribute__((always_inline)) +# define __inline__ __inline__ __attribute__((always_inline)) +# define __inline __inline __attribute__((always_inline)) #endif #if __GNUC_MINOR__ > 0 |