LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Akinobu Mita <akinobu.mita@gmail.com>
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
	akpm@linux-foundation.org
Cc: Akinobu Mita <akinobu.mita@gmail.com>,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	Roman Zippel <zippel@linux-m68k.org>,
	Andreas Schwab <schwab@linux-m68k.org>
Subject: [PATCH v5 26/27] m68k: remove inline asm from minix_find_first_zero_bit
Date: Sat, 22 Jan 2011 22:13:58 +0900	[thread overview]
Message-ID: <1295702039-23186-27-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1295702039-23186-1-git-send-email-akinobu.mita@gmail.com>

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

Change from v4:
 - no changes

The whole series is available in the git branch at:
 git://git.kernel.org/pub/scm/linux/kernel/git/mita/linux-2.6.git le-bitops-v5

 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 645a4d5..497e711 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


  parent reply	other threads:[~2011-01-22 13:15 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-22 13:13 [PATCH v5 00/27] Introduce little-endian bitops Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 01/27] kvm: stop including asm-generic/bitops/le.h directly Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 02/27] rds: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 03/27] bitops: merge little and big endian definisions in asm-generic/bitops/le.h Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 04/27] asm-generic: rename generic little-endian bitops functions Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 05/27] asm-generic: change little-endian bitops to take any pointer types Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 06/27] powerpc: introduce little-endian bitops Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 07/27] s390: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 08/27] arm: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 09/27] m68k: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 10/27] bitops: introduce CONFIG_GENERIC_FIND_BIT_LE Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 11/27] m68knommu: introduce little-endian bitops Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 12/27] bitops: introduce little-endian bitops for most architectures Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 13/27] asm-generic: use little-endian bitops Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 14/27] kvm: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 15/27] rds: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 16/27] ext3: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 17/27] ext4: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 18/27] ocfs2: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 19/27] nilfs2: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 20/27] reiserfs: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 21/27] udf: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 22/27] ufs: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 23/27] md: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 24/27] dm: " Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 25/27] bitops: remove ext2 non-atomic bitops from asm/bitops.h Akinobu Mita
2011-01-22 13:13 ` Akinobu Mita [this message]
2011-01-22 13:13 ` [PATCH v5 27/27] bitops: remove minix " Akinobu Mita

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1295702039-23186-27-git-send-email-akinobu.mita@gmail.com \
    --to=akinobu.mita@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=geert@linux-m68k.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=schwab@linux-m68k.org \
    --cc=zippel@linux-m68k.org \
    --subject='Re: [PATCH v5 26/27] m68k: remove inline asm from minix_find_first_zero_bit' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).