vserver 1.9.3

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

diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h
index 22ecbf9..87c43e5 100644 (file)
--- a/include/asm-alpha/bitops.h
+++ b/include/asm-alpha/bitops.h
@@ -2,7 +2,6 @@
 #define _ALPHA_BITOPS_H
 
 #include <linux/config.h>
-#include <linux/kernel.h>
 #include <asm/compiler.h>
 
 /*
@@ -324,7 +323,7 @@ static inline int fls(int word)
 #endif
 
 /* Compute powers of two for the given integer.  */
-static inline int floor_log2(unsigned long word)
+static inline long floor_log2(unsigned long word)
 {
 #if defined(__alpha_cix__) && defined(__alpha_fix__)
        return 63 - __kernel_ctlz(word);
@@ -336,7 +335,7 @@ static inline int floor_log2(unsigned long word)
 #endif
 }
 
-static inline int ceil_log2(unsigned int word)
+static inline long ceil_log2(unsigned long word)
 {
        long bit = floor_log2(word);
        return bit + (word > (1UL << bit));