From mboxrd@z Thu Jan 1 00:00:00 1970 From: Akinobu Mita Subject: [PATCH v2 06/22] m68knommu: introduce little-endian bitops Date: Thu, 21 Oct 2010 23:41:01 +0900 Message-ID: <1287672077-5797-7-git-send-email-akinobu.mita__28814.4724480391$1287672825$gmane$org@gmail.com> References: <1287672077-5797-1-git-send-email-akinobu.mita@gmail.com> Return-path: In-Reply-To: <1287672077-5797-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-m68k-owner@vger.kernel.org List-Id: linux-m68k@vger.kernel.org To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Arnd Bergmann , Christoph Hellwig , Andrew Morton Cc: Akinobu Mita , Greg Ungerer , Geert Uytterhoeven , Roman Zippel , Andreas Schwab , linux-m68k@lists.linux-m68k.org 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 Cc: Greg Ungerer 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_no.h | 40 +++++++++++++++++++++++++++++------- 1 files changed, 32 insertions(+), 8 deletions(-) diff --git a/arch/m68k/include/asm/bitops_no.h b/arch/m68k/include/asm/bitops_no.h index 292e1ce..9f5eb02 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 #include -static __inline__ int ext2_set_bit(int nr, volatile void * addr) +#define BITOP_LE_SWIZZLE ((BITS_PER_LONG-1) & ~0x7) + +#define __set_le_bit(nr, addr) \ + __set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr)) + +#define __clear_le_bit(nr, addr) \ + __clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr)) + +static inline int __test_and_set_le_bit(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_le_bit(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_le_bit((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_le_bit((nr), (addr)); \ spin_unlock(lock); \ ret; \ }) -static __inline__ int ext2_test_bit(int nr, const volatile void * addr) +static inline int test_le_bit(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_le_bit(addr, size) \ + find_next_zero_le_bit((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_le_bit(void *addr, unsigned long size, unsigned long offset) { unsigned long *p = ((unsigned long *) addr) + (offset >> 5); unsigned long result = offset & ~31UL; @@ -324,8 +332,24 @@ found_middle: return result + ffz(__swab32(tmp)); } +#define ext2_set_bit(nr, addr) \ + __test_and_set_le_bit(nr, addr) + +#define ext2_clear_bit(nr, addr) \ + test_and_clear_le_bit(nr, addr) + +#define ext2_test_bit(nr, addr) \ + test_le_bit(nr, addr) + +#define ext2_find_first_zero_bit(addr, size) \ + find_first_zero_le_bit(addr, size) + +#define ext2_find_next_zero_bit(addr, size, offset) \ + find_next_zero_le_bit(addr, size, offset) + #define ext2_find_next_bit(addr, size, off) \ find_next_le_bit((unsigned long *)(addr), (size), (off)) + #include #endif /* __KERNEL__ */ -- 1.7.1.231.gd0b16