From 7ef4a30ffc91fefd1a0b85d9fceb234bada3e0c5 Mon Sep 17 00:00:00 2001
From: Alexander van Heukelum <heukelum@mailshack.com>
Date: Sat, 15 Mar 2008 18:32:36 +0100
Subject: [PATCH] --- yaml --- r: 93675 b: refs/heads/master c:
 d57594c203b1e7b54373080a797f0cbfa4aade68 h: refs/heads/master i:   93673:
 f43be7e29b830d39a075d53986f3b85adf286834   93671:
 336ce4aee3629785fa3948a7bab9f2129ed0a291 v: v3

---
 [refs]                                   |  2 +-
 trunk/include/asm-generic/bitops/fls64.h | 22 ++++++++++++++++++++++
 trunk/include/asm-x86/bitops_64.h        | 15 ++-------------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 6285f2b32415..1751023d8af9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56a6b1eb7bfb5ace0b5cb9c149f502fbd101b8ab
+refs/heads/master: d57594c203b1e7b54373080a797f0cbfa4aade68
diff --git a/trunk/include/asm-generic/bitops/fls64.h b/trunk/include/asm-generic/bitops/fls64.h
index 1b6b17ce2428..86d403f8b256 100644
--- a/trunk/include/asm-generic/bitops/fls64.h
+++ b/trunk/include/asm-generic/bitops/fls64.h
@@ -3,6 +3,18 @@
 
 #include <asm/types.h>
 
+/**
+ * fls64 - find last set bit in a 64-bit word
+ * @x: the word to search
+ *
+ * This is defined in a similar way as the libc and compiler builtin
+ * ffsll, but returns the position of the most significant set bit.
+ *
+ * fls64(value) returns 0 if value is 0 or the position of the last
+ * set bit if value is nonzero. The last (most significant) bit is
+ * at position 64.
+ */
+#if BITS_PER_LONG == 32
 static inline int fls64(__u64 x)
 {
 	__u32 h = x >> 32;
@@ -10,5 +22,15 @@ static inline int fls64(__u64 x)
 		return fls(h) + 32;
 	return fls(x);
 }
+#elif BITS_PER_LONG == 64
+static inline int fls64(__u64 x)
+{
+	if (x == 0)
+		return 0;
+	return __fls(x) + 1;
+}
+#else
+#error BITS_PER_LONG not 32 or 64
+#endif
 
 #endif /* _ASM_GENERIC_BITOPS_FLS64_H_ */
diff --git a/trunk/include/asm-x86/bitops_64.h b/trunk/include/asm-x86/bitops_64.h
index a5fbe7a02a3f..d13352087191 100644
--- a/trunk/include/asm-x86/bitops_64.h
+++ b/trunk/include/asm-x86/bitops_64.h
@@ -39,25 +39,14 @@ static inline void set_bit_string(unsigned long *bitmap, unsigned long i,
 
 #include <asm-generic/bitops/sched.h>
 
-/**
- * fls64 - find last bit set in 64 bit word
- * @x: the word to search
- *
- * This is defined the same way as fls.
- */
-static inline int fls64(__u64 x)
-{
-	if (x == 0)
-		return 0;
-	return __fls(x) + 1;
-}
-
 #define ARCH_HAS_FAST_MULTIPLIER 1
 
 #include <asm-generic/bitops/hweight.h>
 
 #endif /* __KERNEL__ */
 
+#include <asm-generic/bitops/fls64.h>
+
 #ifdef __KERNEL__
 
 #include <asm-generic/bitops/ext2-non-atomic.h>