x86: fix new find_first_bit()

Some edge problems with the original C rewrite.

Thanks go to Cal Peake, who pinpointed the breakage to the rewrite, and
tested this fixed version.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 6 insertions, 7 deletions

diff --git a/include/asm-i386/bitops.h b/include/asm-i386/bitops.h
index 1caee1039363..ddf1739dc7fd 100644
--- a/include/asm-i386/bitops.h
+++ b/include/asm-i386/bitops.h
@@ -335,14 +335,13 @@ static inline unsigned long __ffs(unsigned long word)
 static inline int find_first_bit(const unsigned long *addr, unsigned size)
 {
         int x = 0;
-        do {
-                if (*addr)
-                        return __ffs(*addr) + x;
-                addr++;
-                if (x >= size)
-                        break;
+
+        while (x < size) {
+                unsigned long val = *addr++;
+                if (val)
+                        return __ffs(val) + x;
                 x += (sizeof(*addr)<<3);
-        } while (1);
+        }
         return x;
 }