The patch titled
m68k: remove inline asm from minix_find_first_zero_bit
has been removed from the -mm tree. Its filename was
m68k-remove-inline-asm-from-minix_find_first_zero_bit.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: m68k: remove inline asm from minix_find_first_zero_bit
From: Akinobu Mita <akinobu.mita@xxxxxxxxx>
As a preparation for moving minix bit operations from asm/bitops.h to
architecture independent code in minix file system, this removes inline
asm from minix_find_first_zero_bit() for m68k.
Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Cc: Andreas Schwab <schwab@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/m68k/include/asm/bitops_mm.h | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff -puN arch/m68k/include/asm/bitops_mm.h~m68k-remove-inline-asm-from-minix_find_first_zero_bit arch/m68k/include/asm/bitops_mm.h
--- a/arch/m68k/include/asm/bitops_mm.h~m68k-remove-inline-asm-from-minix_find_first_zero_bit
+++ a/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))
_
Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are
origin.patch
bitops-remove-minix-bitops-from-asm-bitopsh.patch
bitops-use-find_first_zero_bit-instead-of-find_next_zero_bitaddr-size-0.patch
spufs-use-simple_write_to_buffer.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
