[PATCH] x86: fls() in asm

There is a single instruction on i386 to find largest set bit; so it makes
sense to use it (like we use bfs for ffs()).

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/asm-i386/bitops.h b/include/asm-i386/bitops.h
index 26eb9811712fe6ae6cfdbb527a3bc7e696dc88bb..65679aca4b2229ffb4e5b1781363ee8f10ef8efd 100644 (file)
--- a/include/asm-i386/bitops.h
+++ b/include/asm-i386/bitops.h
@@ -367,11 +367,6 @@ static inline unsigned long ffz(unsigned long word)
        return word;
 }
 
-/*
- * fls: find last bit set.
- */
-
-#define fls(x) generic_fls(x)
 #define fls64(x)   generic_fls64(x)
 
 #ifdef __KERNEL__
@@ -414,6 +409,23 @@ static inline int ffs(int x)
        return r+1;
 }
 
+/**
+ * fls - find last bit set
+ * @x: the word to search
+ *
+ * This is defined the same way as ffs.
+ */
+static inline int fls(int x)
+{
+       int r;
+
+       __asm__("bsrl %1,%0\n\t"
+               "jnz 1f\n\t"
+               "movl $-1,%0\n"
+               "1:" : "=r" (r) : "rm" (x));
+       return r+1;
+}
+
 /**
  * hweightN - returns the hamming weight of a N-bit word
  * @x: the word to weigh