x86: change x86 to use generic find_next_bit

[deliverable/linux.git] / include / asm-x86 / bitops_32.h

diff --git a/include/asm-x86/bitops_32.h b/include/asm-x86/bitops_32.h
index e4d75fcf9c03000d6e4fcb1e92a35aef59f90884..7c9ed759afb29176c4a7334f987de134b7264713 100644 (file)
--- a/include/asm-x86/bitops_32.h
+++ b/include/asm-x86/bitops_32.h
@@ -20,31 +20,25 @@ static inline int find_first_zero_bit(const unsigned long *addr, unsigned size)
 
        if (!size)
                return 0;
-       /* This looks at memory. Mark it volatile to tell gcc not to move it around */
-       __asm__ __volatile__(
-               "movl $-1,%%eax\n\t"
-               "xorl %%edx,%%edx\n\t"
-               "repe; scasl\n\t"
-               "je 1f\n\t"
-               "xorl -4(%%edi),%%eax\n\t"
-               "subl $4,%%edi\n\t"
-               "bsfl %%eax,%%edx\n"
-               "1:\tsubl %%ebx,%%edi\n\t"
-               "shll $3,%%edi\n\t"
-               "addl %%edi,%%edx"
-               :"=d" (res), "=&c" (d0), "=&D" (d1), "=&a" (d2)
-               :"1" ((size + 31) >> 5), "2" (addr), "b" (addr) : "memory");
+       /* This looks at memory.
+        * Mark it volatile to tell gcc not to move it around
+        */
+       asm volatile("movl $-1,%%eax\n\t"
+                    "xorl %%edx,%%edx\n\t"
+                    "repe; scasl\n\t"
+                    "je 1f\n\t"
+                    "xorl -4(%%edi),%%eax\n\t"
+                    "subl $4,%%edi\n\t"
+                    "bsfl %%eax,%%edx\n"
+                    "1:\tsubl %%ebx,%%edi\n\t"
+                    "shll $3,%%edi\n\t"
+                    "addl %%edi,%%edx"
+                    : "=d" (res), "=&c" (d0), "=&D" (d1), "=&a" (d2)
+                    : "1" ((size + 31) >> 5), "2" (addr),
+                      "b" (addr) : "memory");
        return res;
 }
 
-/**
- * find_next_zero_bit - find the first zero bit in a memory region
- * @addr: The address to base the search on
- * @offset: The bit number to start searching at
- * @size: The maximum size to search
- */
-int find_next_zero_bit(const unsigned long *addr, int size, int offset);
-
 /**
  * __ffs - find first bit in word.
  * @word: The word to search
@@ -75,19 +69,11 @@ static inline unsigned find_first_bit(const unsigned long *addr, unsigned size)
                unsigned long val = *addr++;
                if (val)
                        return __ffs(val) + x;
-               x += (sizeof(*addr)<<3);
+               x += sizeof(*addr) << 3;
        }
        return x;
 }
 
-/**
- * find_next_bit - find the first set bit in a memory region
- * @addr: The address to base the search on
- * @offset: The bit number to start searching at
- * @size: The maximum size to search
- */
-int find_next_bit(const unsigned long *addr, int size, int offset);
-
 /**
  * ffz - find first zero in word.
  * @word: The word to search
@@ -152,10 +138,10 @@ static inline int fls(int x)
 
 #include <asm-generic/bitops/ext2-non-atomic.h>
 
-#define ext2_set_bit_atomic(lock, nr, addr) \
-               test_and_set_bit((nr), (unsigned long *)addr)
-#define ext2_clear_bit_atomic(lock, nr, addr) \
-               test_and_clear_bit((nr), (unsigned long *)addr)
+#define ext2_set_bit_atomic(lock, nr, addr)                    \
+       test_and_set_bit((nr), (unsigned long *)(addr))
+#define ext2_clear_bit_atomic(lock, nr, addr)                  \
+       test_and_clear_bit((nr), (unsigned long *)(addr))
 
 #include <asm-generic/bitops/minix.h>