From: Akinobu Mita <mita@miraclelinux.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@osdl.org, Russell King <rmk@arm.linux.org.uk>,
Akinobu Mita <mita@miraclelinux.com>
Subject: [patch 20/47] arm: use generic bitops
Date: Tue, 14 Feb 2006 14:04:11 +0900 [thread overview]
Message-ID: <20060214050445.590692000@localhost.localdomain> (raw)
In-Reply-To: 20060214050351.252615000@localhost.localdomain
[-- Attachment #1: arm-2.patch --]
[-- Type: text/plain, Size: 7074 bytes --]
- remove __{,test_and_}{set,clear,change}_bit() and test_bit()
- if __LINUX_ARM_ARCH__ < 5
- remove ffz()
- remove __ffs()
- remove generic_fls()
- remove generic_ffs()
- remove generic_fls64()
- remove sched_find_first_bit()
- remove generic_hweight{32,16,8}()
Signed-off-by: Akinobu Mita <mita@miraclelinux.com>
arch/arm/Kconfig | 4 +
include/asm-arm/bitops.h | 146 +++--------------------------------------------
2 files changed, 14 insertions(+), 136 deletions(-)
Index: 2.6-rc/include/asm-arm/bitops.h
===================================================================
--- 2.6-rc.orig/include/asm-arm/bitops.h
+++ 2.6-rc/include/asm-arm/bitops.h
@@ -117,65 +117,7 @@ ____atomic_test_and_change_bit(unsigned
return res & mask;
}
-/*
- * Now the non-atomic variants. We let the compiler handle all
- * optimisations for these. These are all _native_ endian.
- */
-static inline void __set_bit(int nr, volatile unsigned long *p)
-{
- p[nr >> 5] |= (1UL << (nr & 31));
-}
-
-static inline void __clear_bit(int nr, volatile unsigned long *p)
-{
- p[nr >> 5] &= ~(1UL << (nr & 31));
-}
-
-static inline void __change_bit(int nr, volatile unsigned long *p)
-{
- p[nr >> 5] ^= (1UL << (nr & 31));
-}
-
-static inline int __test_and_set_bit(int nr, volatile unsigned long *p)
-{
- unsigned long oldval, mask = 1UL << (nr & 31);
-
- p += nr >> 5;
-
- oldval = *p;
- *p = oldval | mask;
- return oldval & mask;
-}
-
-static inline int __test_and_clear_bit(int nr, volatile unsigned long *p)
-{
- unsigned long oldval, mask = 1UL << (nr & 31);
-
- p += nr >> 5;
-
- oldval = *p;
- *p = oldval & ~mask;
- return oldval & mask;
-}
-
-static inline int __test_and_change_bit(int nr, volatile unsigned long *p)
-{
- unsigned long oldval, mask = 1UL << (nr & 31);
-
- p += nr >> 5;
-
- oldval = *p;
- *p = oldval ^ mask;
- return oldval & mask;
-}
-
-/*
- * This routine doesn't need to be atomic.
- */
-static inline int __test_bit(int nr, const volatile unsigned long * p)
-{
- return (p[nr >> 5] >> (nr & 31)) & 1UL;
-}
+#include <asm-generic/bitops/non-atomic.h>
/*
* A note about Endian-ness.
@@ -261,7 +203,6 @@ extern int _find_next_bit_be(const unsig
#define test_and_set_bit(nr,p) ATOMIC_BITOP_LE(test_and_set_bit,nr,p)
#define test_and_clear_bit(nr,p) ATOMIC_BITOP_LE(test_and_clear_bit,nr,p)
#define test_and_change_bit(nr,p) ATOMIC_BITOP_LE(test_and_change_bit,nr,p)
-#define test_bit(nr,p) __test_bit(nr,p)
#define find_first_zero_bit(p,sz) _find_first_zero_bit_le(p,sz)
#define find_next_zero_bit(p,sz,off) _find_next_zero_bit_le(p,sz,off)
#define find_first_bit(p,sz) _find_first_bit_le(p,sz)
@@ -280,7 +221,6 @@ extern int _find_next_bit_be(const unsig
#define test_and_set_bit(nr,p) ATOMIC_BITOP_BE(test_and_set_bit,nr,p)
#define test_and_clear_bit(nr,p) ATOMIC_BITOP_BE(test_and_clear_bit,nr,p)
#define test_and_change_bit(nr,p) ATOMIC_BITOP_BE(test_and_change_bit,nr,p)
-#define test_bit(nr,p) __test_bit(nr,p)
#define find_first_zero_bit(p,sz) _find_first_zero_bit_be(p,sz)
#define find_next_zero_bit(p,sz,off) _find_next_zero_bit_be(p,sz,off)
#define find_first_bit(p,sz) _find_first_bit_be(p,sz)
@@ -292,55 +232,10 @@ extern int _find_next_bit_be(const unsig
#if __LINUX_ARM_ARCH__ < 5
-/*
- * ffz = Find First Zero in word. Undefined if no zero exists,
- * so code should check against ~0UL first..
- */
-static inline unsigned long ffz(unsigned long word)
-{
- int k;
-
- word = ~word;
- k = 31;
- if (word & 0x0000ffff) { k -= 16; word <<= 16; }
- if (word & 0x00ff0000) { k -= 8; word <<= 8; }
- if (word & 0x0f000000) { k -= 4; word <<= 4; }
- if (word & 0x30000000) { k -= 2; word <<= 2; }
- if (word & 0x40000000) { k -= 1; }
- return k;
-}
-
-/*
- * ffz = Find First Zero in word. Undefined if no zero exists,
- * so code should check against ~0UL first..
- */
-static inline unsigned long __ffs(unsigned long word)
-{
- int k;
-
- k = 31;
- if (word & 0x0000ffff) { k -= 16; word <<= 16; }
- if (word & 0x00ff0000) { k -= 8; word <<= 8; }
- if (word & 0x0f000000) { k -= 4; word <<= 4; }
- if (word & 0x30000000) { k -= 2; word <<= 2; }
- if (word & 0x40000000) { k -= 1; }
- return k;
-}
-
-/*
- * fls: find last bit set.
- */
-
-#define fls(x) generic_fls(x)
-#define fls64(x) generic_fls64(x)
-
-/*
- * ffs: find first bit set. This is defined the same way as
- * the libc and compiler builtin ffs routines, therefore
- * differs in spirit from the above ffz (man ffs).
- */
-
-#define ffs(x) generic_ffs(x)
+#include <asm-generic/bitops/ffz.h>
+#include <asm-generic/bitops/__ffs.h>
+#include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/ffs.h>
#else
@@ -352,37 +247,16 @@ static inline unsigned long __ffs(unsign
#define fls(x) \
( __builtin_constant_p(x) ? generic_fls(x) : \
({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) )
-#define fls64(x) generic_fls64(x)
#define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); })
#define __ffs(x) (ffs(x) - 1)
#define ffz(x) __ffs( ~(x) )
#endif
-/*
- * Find first bit set in a 168-bit bitmap, where the first
- * 128 bits are unlikely to be set.
- */
-static inline int sched_find_first_bit(const unsigned long *b)
-{
- unsigned long v;
- unsigned int off;
-
- for (off = 0; v = b[off], off < 4; off++) {
- if (unlikely(v))
- break;
- }
- return __ffs(v) + off * 32;
-}
-
-/*
- * hweightN: returns the hamming weight (i.e. the number
- * of bits set) of a N-bit word
- */
+#include <asm-generic/bitops/fls64.h>
-#define hweight32(x) generic_hweight32(x)
-#define hweight16(x) generic_hweight16(x)
-#define hweight8(x) generic_hweight8(x)
+#include <asm-generic/bitops/sched.h>
+#include <asm-generic/bitops/hweight.h>
/*
* Ext2 is defined to use little-endian byte ordering.
@@ -397,7 +271,7 @@ static inline int sched_find_first_bit(c
#define ext2_clear_bit_atomic(lock,nr,p) \
test_and_clear_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
#define ext2_test_bit(nr,p) \
- __test_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
+ test_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
#define ext2_find_first_zero_bit(p,sz) \
_find_first_zero_bit_le(p,sz)
#define ext2_find_next_zero_bit(p,sz,off) \
@@ -410,7 +284,7 @@ static inline int sched_find_first_bit(c
#define minix_set_bit(nr,p) \
__set_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
#define minix_test_bit(nr,p) \
- __test_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
+ test_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
#define minix_test_and_set_bit(nr,p) \
__test_and_set_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
#define minix_test_and_clear_bit(nr,p) \
Index: 2.6-rc/arch/arm/Kconfig
===================================================================
--- 2.6-rc.orig/arch/arm/Kconfig
+++ 2.6-rc/arch/arm/Kconfig
@@ -53,6 +53,10 @@ config RWSEM_GENERIC_SPINLOCK
config RWSEM_XCHGADD_ALGORITHM
bool
+config GENERIC_HWEIGHT
+ bool
+ default y
+
config GENERIC_CALIBRATE_DELAY
bool
default y
--
next prev parent reply other threads:[~2006-02-14 5:20 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-14 5:03 [patch 00/47] generic bitops Akinobu Mita
2006-02-14 5:03 ` [patch 01/47] alpha: use config options instead of __alpha_fix__ and __alpha_cix__ Akinobu Mita
2006-02-14 5:03 ` [patch 02/47] ia64: use cpu_set() instead of __set_bit() Akinobu Mita
2006-02-14 5:03 ` [patch 03/47] parisc: add ()-pair in __ffz() macro Akinobu Mita
2006-02-14 5:03 ` [patch 04/47] cris: remove unnecessary local_irq_restore() Akinobu Mita
2006-02-14 5:03 ` [patch 05/47] use non atomic operations for minix_*_bit() and ext2_*_bit() Akinobu Mita
2006-02-14 5:03 ` [patch 06/47] generic {,test_and_}{set,clear,change}_bit() Akinobu Mita
2006-02-14 5:03 ` [patch 07/47] generic __{,test_and_}{set,clear,change}_bit() and test_bit() Akinobu Mita
2006-02-14 5:03 ` [patch 08/47] generic __ffs() Akinobu Mita
2006-02-14 5:04 ` [patch 09/47] generic ffz() Akinobu Mita
2006-02-14 5:04 ` [patch 10/47] generic fls() Akinobu Mita
2006-02-14 5:04 ` [patch 11/47] generic fls64() Akinobu Mita
2006-02-14 5:04 ` [patch 12/47] generic find_{next,first}{,_zero}_bit() Akinobu Mita
2006-02-14 5:04 ` [patch 13/47] generic sched_find_first_bit() Akinobu Mita
2006-02-14 5:04 ` [patch 14/47] generic ffs() Akinobu Mita
2006-02-14 5:04 ` [patch 15/47] generic hweight{64,32,16,8}() Akinobu Mita
2006-02-14 5:04 ` [patch 16/47] generic ext2_{set,clear,test,find_first_zero,find_next_zero}_bit() Akinobu Mita
2006-02-14 5:04 ` [patch 17/47] generic ext2_{set,clear}_bit_atomic() Akinobu Mita
2006-02-14 5:04 ` [patch 18/47] generic minix_{test,set,test_and_clear,test,find_first_zero}_bit() Akinobu Mita
2006-02-14 5:04 ` [patch 19/47] alpha: use generic bitops Akinobu Mita
2006-02-14 5:04 ` Akinobu Mita [this message]
2006-02-14 5:04 ` [patch 21/47] arm26: " Akinobu Mita
2006-02-14 5:04 ` [patch 22/47] cris: " Akinobu Mita
2006-02-14 5:04 ` [patch 23/47] frv: " Akinobu Mita
2006-02-14 5:04 ` [patch 24/47] h8300: " Akinobu Mita
2006-02-14 5:04 ` [patch 25/47] i386: " Akinobu Mita
2006-02-14 5:04 ` [patch 26/47] ia64: " Akinobu Mita
2006-02-14 5:04 ` [patch 27/47] m32r: " Akinobu Mita
2006-02-14 5:04 ` [patch 28/47] m68k: " Akinobu Mita
2006-02-14 5:04 ` [patch 29/47] m68knommu: " Akinobu Mita
2006-02-14 5:04 ` [patch 30/47] mips: " Akinobu Mita
2006-02-14 5:04 ` [patch 31/47] parisc: " Akinobu Mita
2006-02-14 5:04 ` [patch 32/47] powerpc: " Akinobu Mita
2006-02-14 5:04 ` [patch 33/47] s390: " Akinobu Mita
2006-02-14 5:04 ` [patch 34/47] sh: " Akinobu Mita
2006-02-14 5:04 ` [patch 35/47] sh64: " Akinobu Mita
2006-02-14 5:04 ` [patch 36/47] sparc: " Akinobu Mita
2006-02-14 5:04 ` [patch 37/47] sparc64: " Akinobu Mita
2006-02-14 5:04 ` [patch 38/47] v850: " Akinobu Mita
2006-02-14 5:04 ` [patch 39/47] x86_64: " Akinobu Mita
2006-02-14 5:04 ` [patch 40/47] xtensa: " Akinobu Mita
2006-02-14 5:04 ` [patch 41/47] update include/asm-generic/bitops.h Akinobu Mita
2006-02-14 5:04 ` [patch 42/47] make thread_info.flags an unsigned long Akinobu Mita
2006-02-14 5:04 ` [patch 43/47] ia64: make partial_page.bitmap " Akinobu Mita
2006-02-14 5:04 ` [patch 44/47] ntfs: remove generic_ffs() Akinobu Mita
2006-02-14 5:04 ` [patch 45/47] remove unused generic bitops in include/linux/bitops.h Akinobu Mita
2006-02-14 5:04 ` [patch 46/47] hweight() related cleanup Akinobu Mita
2006-02-14 5:04 ` [patch 47/47] hweight() speedup 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=20060214050445.590692000@localhost.localdomain \
--to=mita@miraclelinux.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox