From: Ville Nuorvala <vnuorval@tcs.hut.fi>
There are a few kernel-only things in compiler.h which should have been
placed inside __KERNEL__.
---
include/linux/compiler.h | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff -puN include/linux/compiler.h~compiler_h-scope-fixes include/linux/compiler.h
--- 25/include/linux/compiler.h~compiler_h-scope-fixes 2004-03-05 00:12:07.000000000 -0800
+++ 25-akpm/include/linux/compiler.h 2004-03-05 00:12:07.000000000 -0800
@@ -39,6 +39,20 @@
#define likely(x) __builtin_expect(!!(x), 1)
#define unlikely(x) __builtin_expect(!!(x), 0)
+/* Optimization barrier */
+#ifndef barrier
+# define barrier() __memory_barrier()
+#endif
+
+#ifndef RELOC_HIDE
+# define RELOC_HIDE(ptr, off) \
+ ({ unsigned long __ptr; \
+ __ptr = (unsigned long) (ptr); \
+ (typeof(ptr)) (__ptr + (off)); })
+#endif
+
+#endif /* __KERNEL__ */
+
/*
* Allow us to mark functions as 'deprecated' and have gcc emit a nice
* warning for each use, in hopes of speeding the functions removal.
@@ -100,18 +114,4 @@
#define noinline
#endif
-/* Optimization barrier */
-#ifndef barrier
-# define barrier() __memory_barrier()
-#endif
-
-#ifndef RELOC_HIDE
-# define RELOC_HIDE(ptr, off) \
- ({ unsigned long __ptr; \
- __ptr = (unsigned long) (ptr); \
- (typeof(ptr)) (__ptr + (off)); })
-#endif
-
-#endif /* __KERNEL__ */
-
#endif /* __LINUX_COMPILER_H */
_