Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / include / linux / bitops.h

diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 38c2fb7ebe091bc7c252193a614abca2c5c244bb..6a2a19f14bb26bb3f4f49815b566c2a4e8353cab 100644 (file)
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -76,6 +76,15 @@ static __inline__ int generic_fls(int x)
  */
 #include <asm/bitops.h>
 
+
+static inline int generic_fls64(__u64 x)
+{
+       __u32 h = x >> 32;
+       if (h)
+               return fls(x) + 32;
+       return fls(x);
+}
+
 static __inline__ int get_bitmask_order(unsigned int count)
 {
        int order;