vserver 1.9.3

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

diff --git a/include/asm-alpha/compiler.h b/include/asm-alpha/compiler.h
index dcfa94b..399c33b 100644 (file)
--- a/include/asm-alpha/compiler.h
+++ b/include/asm-alpha/compiler.h
@@ -17,9 +17,9 @@
 # define __kernel_extbl(val, shift)    __builtin_alpha_extbl(val, shift)
 # define __kernel_extwl(val, shift)    __builtin_alpha_extwl(val, shift)
 # define __kernel_cmpbge(a, b)         __builtin_alpha_cmpbge(a, b)
-# define __kernel_cttz(x)              __builtin_ctz(x)
-# define __kernel_ctlz(x)              __builtin_clz(x)
-# define __kernel_ctpop(x)             __builtin_popcount(x)
+# define __kernel_cttz(x)              __builtin_ctzl(x)
+# define __kernel_ctlz(x)              __builtin_clzl(x)
+# define __kernel_ctpop(x)             __builtin_popcountl(x)
 #else
 # define __kernel_insbl(val, shift)                                    \
   ({ unsigned long __kir;                                              \
@@ -90,4 +90,14 @@
   __asm__("stw %1,%0" : "=m"(mem) : "r"(val))
 #endif
 
+/* 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.  */
+
+#include <linux/compiler.h>
+#undef inline
+#undef __inline__
+#undef __inline
+
+
 #endif /* __ALPHA_COMPILER_H */