From: Akinobu Mita <mita@miraclelinux.com>
To: linux-kernel@vger.kernel.org
Cc: Russell King <rmk@arm.linux.org.uk>,
Akinobu Mita <mita@miraclelinux.com>
Subject: [patch 19/44] arm: use generic bitops
Date: Wed, 01 Feb 2006 18:02:43 +0900 [thread overview]
Message-ID: <20060201090327.060870000@localhost.localdomain> (raw)
In-Reply-To: 20060201090224.536581000@localhost.localdomain
[-- Attachment #1: arm-2.patch --]
[-- Type: text/plain, Size: 6696 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>
include/asm-arm/bitops.h | 146 +++--------------------------------------------
1 files changed, 10 insertions(+), 136 deletions(-)
Index: 2.6-git/include/asm-arm/bitops.h
===================================================================
--- 2.6-git.orig/include/asm-arm/bitops.h
+++ 2.6-git/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) \
--
next prev parent reply other threads:[~2006-02-01 9:15 UTC|newest]
Thread overview: 145+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-01 9:02 [patch 00/44] generic bitops Akinobu Mita
2006-02-01 9:02 ` [patch 01/44] ia64: use cpu_set() instead of __set_bit() Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` [patch 02/44] parisc: add ()-pair in __ffz() macro Akinobu Mita
2006-02-01 9:02 ` [patch 03/44] cris: remove unnecessary local_irq_restore() Akinobu Mita
2006-02-01 9:02 ` [patch 04/44] use non atomic operations for minix_*_bit() and ext2_*_bit() Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` [patch 05/44] generic {,test_and_}{set,clear,change}_bit() Akinobu Mita
2006-02-03 9:55 ` Martin Waitz
2006-02-06 23:07 ` Russell King
2006-02-01 9:02 ` [patch 06/44] generic __{,test_and_}{set,clear,change}_bit() and test_bit() Akinobu Mita
2006-02-01 9:02 ` [patch 06/44] generic __{, test_and_}{set, clear, change}_bit() " Akinobu Mita
2006-02-01 9:02 ` [patch 06/44] generic __{,test_and_}{set,clear,change}_bit() " Akinobu Mita
2006-02-01 9:02 ` [patch 07/44] generic __ffs() Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` [patch 08/44] generic ffz() Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` [patch 09/44] generic fls() Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` [patch 10/44] generic fls64() Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-02 15:05 ` Rune Torgersen
2006-02-02 15:05 ` Rune Torgersen
2006-02-02 15:05 ` Rune Torgersen
2006-02-02 15:05 ` Rune Torgersen
2006-02-02 15:05 ` Rune Torgersen
2006-02-02 15:05 ` Rune Torgersen
2006-02-03 1:27 ` [PATCH] fix generic_fls64() Akinobu Mita
2006-02-03 1:27 ` Akinobu Mita
2006-02-03 1:27 ` Akinobu Mita
2006-02-03 1:27 ` Akinobu Mita
2006-02-03 1:27 ` Akinobu Mita
2006-02-01 9:02 ` [patch 11/44] generic find_{next,first}{,_zero}_bit() Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-06 10:26 ` David Howells
2006-02-07 2:02 ` Akinobu Mita
2006-02-07 2:02 ` Akinobu Mita
2006-02-01 9:02 ` [patch 12/44] generic sched_find_first_bit() Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-03 3:58 ` [parisc-linux] " Grant Grundler
2006-02-03 3:58 ` Grant Grundler
2006-02-03 3:58 ` Grant Grundler
2006-02-03 3:58 ` Grant Grundler
2006-02-03 3:58 ` Grant Grundler
2006-02-03 3:58 ` Grant Grundler
2006-02-01 9:02 ` [patch 13/44] generic ffs() Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` [patch 14/44] generic hweight{64,32,16,8}() Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:06 ` Andi Kleen
2006-02-01 9:06 ` Andi Kleen
2006-02-01 9:06 ` Andi Kleen
2006-02-01 9:06 ` Andi Kleen
2006-02-01 9:06 ` Andi Kleen
2006-02-01 9:26 ` Michael Tokarev
2006-02-01 9:26 ` Michael Tokarev
2006-02-01 9:26 ` Michael Tokarev
2006-02-01 9:26 ` Michael Tokarev
2006-02-01 9:26 ` Michael Tokarev
2006-02-01 10:24 ` Andi Kleen
2006-02-01 10:24 ` Andi Kleen
2006-02-01 10:24 ` Andi Kleen
2006-02-01 10:24 ` Andi Kleen
2006-02-01 10:24 ` Andi Kleen
2006-02-02 12:50 ` Akinobu Mita
2006-02-02 12:50 ` Akinobu Mita
2006-02-02 12:50 ` Akinobu Mita
2006-02-02 12:50 ` Akinobu Mita
2006-02-02 12:50 ` Akinobu Mita
2006-02-09 5:55 ` [PATCH] alpha: remove __alpha_cix__ and __alpha_fix__ Akinobu Mita
2006-02-09 19:12 ` Richard Henderson
2006-02-10 5:40 ` Akinobu Mita
2006-02-02 1:26 ` [patch 14/44] generic hweight{64,32,16,8}() Gabriel Paubert
2006-02-02 1:26 ` Gabriel Paubert
2006-02-02 1:26 ` Gabriel Paubert
2006-02-06 11:52 ` Akinobu Mita
2006-02-06 11:52 ` Akinobu Mita
2006-02-06 11:52 ` Akinobu Mita
2006-02-03 8:31 ` Ulrich Eckhardt
2006-02-03 8:31 ` Ulrich Eckhardt
2006-02-03 8:31 ` Ulrich Eckhardt
2006-02-03 8:31 ` Ulrich Eckhardt
2006-02-03 8:31 ` Ulrich Eckhardt
2006-02-01 9:02 ` [patch 15/44] generic ext2_{set,clear,test,find_first_zero,find_next_zero}_bit() Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 11:27 ` Roman Zippel
2006-02-01 11:27 ` Roman Zippel
2006-02-06 11:47 ` Akinobu Mita
2006-02-06 11:47 ` Akinobu Mita
2006-02-08 10:41 ` Akinobu Mita
2006-02-08 10:41 ` Akinobu Mita
2006-02-01 9:02 ` [patch 16/44] generic ext2_{set,clear}_bit_atomic() Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` [patch 17/44] generic minix_{test,set,test_and_clear,test,find_first_zero}_bit() Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` [patch 18/44] alpha: use generic bitops Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita [this message]
2006-02-01 9:02 ` [patch 20/44] arm26: " Akinobu Mita
2006-02-01 9:02 ` [patch 21/44] cris: " Akinobu Mita
2006-02-01 9:02 ` [patch 22/44] frv: " Akinobu Mita
2006-02-01 9:02 ` [patch 23/44] h8300: " Akinobu Mita
2006-02-01 9:02 ` [patch 24/44] i386: " Akinobu Mita
2006-02-01 9:02 ` [patch 25/44] ia64: " Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` [patch 26/44] m32r: " Akinobu Mita
2006-02-01 9:02 ` [patch 27/44] m68k: " Akinobu Mita
2006-02-01 9:02 ` [patch 28/44] m68knommu: " Akinobu Mita
2006-02-01 9:02 ` [patch 29/44] mips: " Akinobu Mita
2006-02-01 9:02 ` [patch 30/44] parisc: " Akinobu Mita
2006-02-01 9:02 ` [patch 31/44] powerpc: " Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:02 ` [patch 32/44] s390: " Akinobu Mita
2006-02-01 9:02 ` [patch 33/44] sh: " Akinobu Mita
2006-02-01 9:02 ` [patch 34/44] sh64: " Akinobu Mita
2006-02-01 9:02 ` [patch 35/44] sparc: " Akinobu Mita
2006-02-01 9:02 ` Akinobu Mita
2006-02-01 9:03 ` [patch 36/44] sparc64: " Akinobu Mita
2006-02-01 9:03 ` Akinobu Mita
2006-02-01 9:03 ` [patch 37/44] v850: " Akinobu Mita
2006-02-01 9:03 ` [patch 38/44] x86_64: " Akinobu Mita
2006-02-01 9:03 ` [patch 39/44] xtensa: " Akinobu Mita
2006-02-01 9:03 ` [patch 40/44] update include/asm-generic/bitops.h Akinobu Mita
2006-02-01 9:03 ` [patch 41/44] make thread_info.flags an unsigned long Akinobu Mita
2006-02-01 9:03 ` Akinobu Mita
2006-02-01 18:17 ` Luck, Tony
2006-02-01 18:17 ` Luck, Tony
2006-02-02 1:37 ` Akinobu Mita
2006-02-02 1:37 ` Akinobu Mita
2006-02-01 9:03 ` [patch 42/44] ia64: make partial_page.bitmap " Akinobu Mita
2006-02-01 9:03 ` Akinobu Mita
2006-02-01 9:03 ` [patch 43/44] ntfs: remove generic_ffs() Akinobu Mita
2006-02-01 9:03 ` [patch 44/44] remove unused generic bitops in include/linux/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=20060201090327.060870000@localhost.localdomain \
--to=mita@miraclelinux.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.