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>,
	Greg Ungerer <gerg@uclinux.org>,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	Roman Zippel <zippel@linux-m68k.org>,
	Andreas Schwab <schwab@linux-m68k.org>,
	Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH v5 11/27] m68knommu: introduce little-endian bitops
Date: Sat, 22 Jan 2011 22:13:43 +0900	[thread overview]
Message-ID: <1295702039-23186-12-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1295702039-23186-1-git-send-email-akinobu.mita@gmail.com>

Introduce little-endian bit operations by renaming native ext2 bit
operations.  The ext2 bit operations are kept as wrapper macros using
little-endian bit operations to maintain bisectability until the
conversions are finished.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Andreas Schwab <schwab@linux-m68k.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

Change from v4:
 - add casts in the macro to take any pointer types
 - drop acked-by line because enough changes has been made

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_no.h |   33 +++++++++++++++++++++++----------
 arch/m68knommu/Kconfig            |    4 ----
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/arch/m68k/include/asm/bitops_no.h b/arch/m68k/include/asm/bitops_no.h
index 58c67aa..e2209ac 100644
--- a/arch/m68k/include/asm/bitops_no.h
+++ b/arch/m68k/include/asm/bitops_no.h
@@ -196,7 +196,15 @@ static __inline__ int __test_bit(int nr, const volatile unsigned long * addr)
 #include <asm-generic/bitops/hweight.h>
 #include <asm-generic/bitops/lock.h>
 
-static __inline__ int ext2_set_bit(int nr, volatile void * addr)
+#define BITOP_LE_SWIZZLE	((BITS_PER_LONG-1) & ~0x7)
+
+#define __set_bit_le(nr, addr) \
+	__set_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr))
+
+#define __clear_bit_le(nr, addr) \
+	__clear_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr))
+
+static inline int __test_and_set_bit_le(int nr, volatile void *addr)
 {
 	char retval;
 
@@ -215,7 +223,7 @@ static __inline__ int ext2_set_bit(int nr, volatile void * addr)
 	return retval;
 }
 
-static __inline__ int ext2_clear_bit(int nr, volatile void * addr)
+static inline int __test_and_clear_bit_le(int nr, volatile void *addr)
 {
 	char retval;
 
@@ -238,7 +246,7 @@ static __inline__ int ext2_clear_bit(int nr, volatile void * addr)
 	({						\
 		int ret;				\
 		spin_lock(lock);			\
-		ret = ext2_set_bit((nr), (addr));	\
+		ret = __test_and_set_bit_le((nr), (addr));	\
 		spin_unlock(lock);			\
 		ret;					\
 	})
@@ -247,12 +255,12 @@ static __inline__ int ext2_clear_bit(int nr, volatile void * addr)
 	({						\
 		int ret;				\
 		spin_lock(lock);			\
-		ret = ext2_clear_bit((nr), (addr));	\
+		ret = __test_and_clear_bit_le((nr), (addr));	\
 		spin_unlock(lock);			\
 		ret;					\
 	})
 
-static __inline__ int ext2_test_bit(int nr, const volatile void * addr)
+static inline int test_bit_le(int nr, const volatile void *addr)
 {
 	char retval;
 
@@ -271,10 +279,10 @@ static __inline__ int ext2_test_bit(int nr, const volatile void * addr)
 	return retval;
 }
 
-#define ext2_find_first_zero_bit(addr, size) \
-        ext2_find_next_zero_bit((addr), (size), 0)
+#define find_first_zero_bit_le(addr, size)	\
+	find_next_zero_bit_le((addr), (size), 0)
 
-static __inline__ unsigned long ext2_find_next_zero_bit(void *addr, unsigned long size, unsigned long offset)
+static inline unsigned long find_next_zero_bit_le(void *addr, unsigned long size, unsigned long offset)
 {
 	unsigned long *p = ((unsigned long *) addr) + (offset >> 5);
 	unsigned long result = offset & ~31UL;
@@ -324,8 +332,13 @@ found_middle:
 	return result + ffz(__swab32(tmp));
 }
 
-#define ext2_find_next_bit(addr, size, off) \
-	find_next_bit_le((unsigned long *)(addr), (size), (off))
+#define ext2_set_bit __test_and_set_bit_le
+#define ext2_clear_bit __test_and_clear_bit_le
+#define ext2_test_bit test_bit_le
+#define ext2_find_first_zero_bit find_first_zero_bit_le
+#define ext2_find_next_zero_bit find_next_zero_bit_le
+#define ext2_find_next_bit find_next_bit_le
+
 #include <asm-generic/bitops/minix.h>
 
 #endif /* __KERNEL__ */
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 5ba4f15..704e7b9 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -40,10 +40,6 @@ config GENERIC_FIND_NEXT_BIT
 	bool
 	default y
 
-config GENERIC_FIND_BIT_LE
-	bool
-	default y
-
 config GENERIC_GPIO
 	bool
 	default n
-- 
1.7.3.4


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

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-22 13:13 [PATCH v5 00/27] Introduce " 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 ` Akinobu Mita [this message]
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 ` [PATCH v5 26/27] m68k: remove inline asm from minix_find_first_zero_bit Akinobu Mita
2011-01-22 13:13 ` [PATCH v5 27/27] bitops: remove minix bitops from asm/bitops.h 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-12-git-send-email-akinobu.mita@gmail.com \
    --to=akinobu.mita@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=geert@linux-m68k.org \
    --cc=gerg@uclinux.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 11/27] m68knommu: introduce little-endian bitops' \
    /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).