diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-18 08:43:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-18 08:43:26 -0700 |
| commit | f5aa089a8e593187ddefb90b1b9334c33c9cd1ae (patch) | |
| tree | 5e3f1ed296141e84023c6912b62a7b5878d5e459 /include/linux | |
| parent | 0e0c55215a388f5f0e6216864204c326b8d42a76 (diff) | |
Wrap <linux/compiler.h> inside '#ifndef __ASSEMBLY__'
None of the compatibility defines make sense for assembly
files, and gcc has trouble with vararg macros when using
"-traditional" (which is used for asm), to the point of
ICE'ing.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/compiler.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 71a58c866055..b1a757d315a5 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -1,6 +1,8 @@ #ifndef __LINUX_COMPILER_H #define __LINUX_COMPILER_H +#ifndef __ASSEMBLY__ + #ifdef __CHECKER__ # define __user __attribute__((noderef, address_space(1))) # define __kernel /* default address space */ @@ -22,7 +24,6 @@ extern void __chk_io_ptr(void __iomem *); #ifdef __KERNEL__ -#ifndef __ASSEMBLY__ #if __GNUC__ > 3 # include <linux/compiler-gcc+.h> /* catch-all for GCC 4, 5, etc. */ #elif __GNUC__ == 3 @@ -32,7 +33,6 @@ extern void __chk_io_ptr(void __iomem *); #else # error Sorry, your compiler is too old/not recognized. #endif -#endif /* Intel compiler defines __GNUC__. So we will overwrite implementations * coming from above header files here @@ -62,6 +62,8 @@ extern void __chk_io_ptr(void __iomem *); (typeof(ptr)) (__ptr + (off)); }) #endif +#endif /* __ASSEMBLY__ */ + #endif /* __KERNEL__ */ /* |