lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m68k: remove inline asm from minix_find_first_zero_bit

Browse Source 
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>
This commit is contained in:
Akinobu Mita
2011-03-23 16:42:15 -07:00
committed by Linus Torvalds
parent f312eff816
commit 3fca5af786
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/m68k/include/asm/bitops_mm.h
View File

@@ -330,23 +330,19 @@ static inline int __fls(int x)
static inline int minix_find_first_zero_bit(const void *vaddr, unsigned size) static inline int minix_find_first_zero_bit(const void *vaddr, unsigned size)
{ {
const unsigned short *p = vaddr, *addr = vaddr; const unsigned short *p = vaddr, *addr = vaddr;
int res;
unsigned short num; unsigned short num;
if (!size) if (!size)
return 0; return 0;
size = (size >> 4) + ((size & 15) > 0); size = (size >> 4) + ((size & 15) > 0);
while (*p++ == 0xffff) while (*p++ == 0xffff) {
{
if (--size == 0) if (--size == 0)
return (p - addr) << 4; return (p - addr) << 4;
} }
num = ~*--p; num = *--p;
__asm__ __volatile__ ("bfffo %1{#16,#16},%0" return ((p - addr) << 4) + ffz(num);
: "=d" (res) : "d" (num & -num));
return ((p - addr) << 4) + (res ^ 31);
} }
#define minix_test_and_set_bit(nr, addr) __test_and_set_bit((nr) ^ 16, (unsigned long *)(addr)) #define minix_test_and_set_bit(nr, addr) __test_and_set_bit((nr) ^ 16, (unsigned long *)(addr))