From mboxrd@z Thu Jan 1 00:00:00 1970 From: Akinobu Mita Subject: [PATCH v4 23/24] m68k: remove inline asm from minix_find_first_zero_bit Date: Sun, 16 Jan 2011 22:08:52 +0900 Message-ID: <1295183333-13802-24-git-send-email-akinobu.mita@gmail.com> References: <1295183333-13802-1-git-send-email-akinobu.mita@gmail.com> Return-path: Received: from mail-iw0-f174.google.com ([209.85.214.174]:49634 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752915Ab1APNJe (ORCPT ); Sun, 16 Jan 2011 08:09:34 -0500 In-Reply-To: <1295183333-13802-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, akpm@linux-foundation.org Cc: Akinobu Mita , Geert Uytterhoeven , Roman Zippel , Andreas Schwab 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 Cc: Geert Uytterhoeven Cc: Roman Zippel Cc: Andreas Schwab Signed-off-by: Andrew Morton --- Change from v3: - No change The whole series is available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mita/linux-2.6.git le-bitops-v4 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 fecd9f3..f6c7dea 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)) -- 1.7.3.4