diff options
| -rw-r--r-- | include/linux/compiler.h | 2 | ||||
| -rw-r--r-- | include/linux/init.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 528641f69043..d67b1dfb698a 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -9,6 +9,7 @@ # define __kernel #endif +#ifndef __ASSEMBLY__ #if __GNUC__ > 3 # include <linux/compiler-gcc+.h> /* catch-all for GCC 4, 5, etc. */ #elif __GNUC__ == 3 @@ -18,6 +19,7 @@ #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 diff --git a/include/linux/init.h b/include/linux/init.h index 2c1c86d67b37..0ab73cff6c48 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -2,6 +2,7 @@ #define _LINUX_INIT_H #include <linux/config.h> +#include <linux/compiler.h> /* These macros are used to mark some functions or * initialized data (doesn't apply to uninitialized data) |