From mboxrd@z Thu Jan 1 00:00:00 1970 From: Akinobu Mita Subject: [PATCH v3 21/22] m68k: remove inline asm from minix_find_first_zero_bit Date: Tue, 23 Nov 2010 22:38:23 +0900 Message-ID: <1290519504-3958-22-git-send-email-akinobu.mita@gmail.com> References: <1290519504-3958-1-git-send-email-akinobu.mita@gmail.com> Return-path: In-Reply-To: <1290519504-3958-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-m68k-owner@vger.kernel.org To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Andrew Morton Cc: Akinobu Mita , Geert Uytterhoeven , Roman Zippel , Andreas Schwab , linux-m68k@lists.linux-m68k.org List-Id: linux-arch.vger.kernel.org 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 Cc: linux-m68k@lists.linux-m68k.org --- No change from previous submission 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 831d626..f31ed5a 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.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pv0-f174.google.com ([74.125.83.174]:39926 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754576Ab0KWNkb (ORCPT ); Tue, 23 Nov 2010 08:40:31 -0500 From: Akinobu Mita Subject: [PATCH v3 21/22] m68k: remove inline asm from minix_find_first_zero_bit Date: Tue, 23 Nov 2010 22:38:23 +0900 Message-ID: <1290519504-3958-22-git-send-email-akinobu.mita@gmail.com> In-Reply-To: <1290519504-3958-1-git-send-email-akinobu.mita@gmail.com> References: <1290519504-3958-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, Andrew Morton Cc: Akinobu Mita , Geert Uytterhoeven , Roman Zippel , Andreas Schwab , linux-m68k@lists.linux-m68k.org Message-ID: <20101123133823.S62n83GMJMOU8L6LH5FDW22G7fnvSQVUz_yscNJHLvE@z> 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 Cc: linux-m68k@lists.linux-m68k.org --- No change from previous submission 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 831d626..f31ed5a 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.2