Commit 82120e6a authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] init.h needs to include compiler.h

From: Jun Sun <jsun@mvista.com>

It is needed for all those "__attribute_used__" etc to be valid.

Also, it seems that when compiling a file ending in ".S", gcc-2.95.3 does not
expand __GNUC__ at all.  This causes the compiler version check to fail when
building vsyscall.S.  So add __ASSEMBLY__ wrappers in there.
parent a9bca018
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
# define __kernel # define __kernel
#endif #endif
#ifndef __ASSEMBLY__
#if __GNUC__ > 3 #if __GNUC__ > 3
# include <linux/compiler-gcc+.h> /* catch-all for GCC 4, 5, etc. */ # include <linux/compiler-gcc+.h> /* catch-all for GCC 4, 5, etc. */
#elif __GNUC__ == 3 #elif __GNUC__ == 3
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
#else #else
# error Sorry, your compiler is too old/not recognized. # error Sorry, your compiler is too old/not recognized.
#endif #endif
#endif
/* Intel compiler defines __GNUC__. So we will overwrite implementations /* Intel compiler defines __GNUC__. So we will overwrite implementations
* coming from above header files here * coming from above header files here
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define _LINUX_INIT_H #define _LINUX_INIT_H
#include <linux/config.h> #include <linux/config.h>
#include <linux/compiler.h>
/* These macros are used to mark some functions or /* These macros are used to mark some functions or
* initialized data (doesn't apply to uninitialized data) * initialized data (doesn't apply to uninitialized data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment