diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2011-03-23 16:42:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-23 19:46:21 -0700 |
| commit | 3fca5af7860f87eb2cd706c2d7dda4ad03230a07 (patch) | |
| tree | f89b0df7317c250ccd6998fa2b1fa2f91ade4353 | |
| parent | f312eff8164879e04923d41e9dd23e7850937d85 (diff) | |
m68k: remove inline asm from minix_find_first_zero_bit
As a preparation for moving minix bit operations from asm/bitops.h to
architecture independent code in minix filesystem, this removes inline asm
from minix_find_first_zero_bit() for m68k.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/m68k/include/asm/bitops_mm.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/m68k/include/asm/bitops_mm.h b/arch/m68k/include/asm/bitops_mm.h index 3d16871402a..a403b5e69aa 100644 --- a/arch/m68k/include/asm/bitops_mm.h +++ b/arch/m68k/include/asm/bitops_mm.h @@ -330,23 +330,19 @@ static inline int __fls(int x) static inline int minix_find_first_zero_bit(const void *vaddr, unsigned size) { const unsigned short *p = vaddr, *addr = vaddr; - int res; unsigned short num; if (!size) return 0; size = (size >> 4) + ((size & 15) > 0); - while (*p++ == 0xffff) - { + while (*p++ == 0xffff) { if (--size == 0) return (p - addr) << 4; } - num = ~*--p; - __asm__ __volatile__ ("bfffo %1{#16,#16},%0" - : "=d" (res) : "d" (num & -num)); - return ((p - addr) << 4) + (res ^ 31); + num = *--p; + return ((p - addr) << 4) + ffz(num); } #define minix_test_and_set_bit(nr, addr) __test_and_set_bit((nr) ^ 16, (unsigned long *)(addr)) |