ieee1394: merge from Linus

[linux-2.6] / include / asm-alpha / compiler.h

diff --git a/include/asm-alpha/compiler.h b/include/asm-alpha/compiler.h
index 399c33b7be5112732a4f1f31d2d401a696df511e..d2768cc3d7a4ed578022b221bc877766d853f3ed 100644 (file)
--- a/include/asm-alpha/compiler.h
+++ b/include/asm-alpha/compiler.h
@@ -90,6 +90,7 @@
   __asm__("stw %1,%0" : "=m"(mem) : "r"(val))
 #endif
 
+#ifdef __KERNEL__
 /* Some idiots over in <linux/compiler.h> thought inline should imply
    always_inline.  This breaks stuff.  We'll include this file whenever
    we run into such problems.  */
@@ -98,6 +99,9 @@
 #undef inline
 #undef __inline__
 #undef __inline
+#undef __always_inline
+#define __always_inline                inline __attribute__((always_inline))
 
+#endif /* __KERNEL__ */
 
 #endif /* __ALPHA_COMPILER_H */