|
@@ -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))
|