* [PATCH v2 1/6] arch: add #define for each of optimized find bitops [not found] <1303824223-3566-1-git-send-email-akinobu.mita@gmail.com> @ 2011-04-26 13:23 ` Akinobu Mita 2011-04-27 9:20 ` Russell King - ARM Linux 2011-04-26 13:23 ` [PATCH v2 2/6] bitops: add #ifndef for each of " Akinobu Mita 2011-04-26 13:23 ` [PATCH v2 4/6] arm: use asm-generic/bitops/le.h Akinobu Mita 2 siblings, 1 reply; 6+ messages in thread From: Akinobu Mita @ 2011-04-26 13:23 UTC (permalink / raw) To: linux-arm-kernel The style that we normally use in asm-generic is to test the macro itself for existence, so in asm-generic, do: #ifndef find_next_zero_bit_le extern unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, unsigned long offset); #endif and in the architectures, write static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, unsigned long offset) #define find_next_zero_bit_le find_next_zero_bit_le This adds the #define for each of the optimized find bitops in the architectures. Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Acked-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-arm-kernel at lists.infradead.org Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: linux390 at de.ibm.com Cc: linux-s390 at vger.kernel.org Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: linux-m68k at lists.linux-m68k.org Cc: Greg Ungerer <gerg@uclinux.org> --- Changes from previous submission: - Add Acked-by: line - Rebase to mainline arch/arm/include/asm/bitops.h | 3 +++ arch/avr32/include/asm/bitops.h | 15 +++++++++++++++ arch/m68k/include/asm/bitops_mm.h | 8 ++++++++ arch/m68k/include/asm/bitops_no.h | 1 + arch/s390/include/asm/bitops.h | 8 ++++++++ 5 files changed, 35 insertions(+), 0 deletions(-) diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h index 6b7403f..18a024b 100644 --- a/arch/arm/include/asm/bitops.h +++ b/arch/arm/include/asm/bitops.h @@ -326,16 +326,19 @@ static inline int find_first_zero_bit_le(const void *p, unsigned size) { return _find_first_zero_bit_le(p, size); } +#define find_first_zero_bit_le find_first_zero_bit_le static inline int find_next_zero_bit_le(const void *p, int size, int offset) { return _find_next_zero_bit_le(p, size, offset); } +#define find_next_zero_bit_le find_next_zero_bit_le static inline int find_next_bit_le(const void *p, int size, int offset) { return _find_next_bit_le(p, size, offset); } +#define find_next_bit_le find_next_bit_le /* * Ext2 is defined to use little-endian byte ordering. diff --git a/arch/avr32/include/asm/bitops.h b/arch/avr32/include/asm/bitops.h index 72444d9..b70c19b 100644 --- a/arch/avr32/include/asm/bitops.h +++ b/arch/avr32/include/asm/bitops.h @@ -270,14 +270,21 @@ static inline int __fls(unsigned long word) unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size); +#define find_first_zero_bit find_first_zero_bit + unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size, unsigned long offset); +#define find_next_zero_bit find_next_zero_bit + unsigned long find_first_bit(const unsigned long *addr, unsigned long size); +#define find_first_bit find_first_bit + unsigned long find_next_bit(const unsigned long *addr, unsigned long size, unsigned long offset); +#define find_next_bit find_next_bit /* * ffs: find first bit set. This is defined the same way as @@ -299,6 +306,14 @@ static inline int ffs(unsigned long word) #include <asm-generic/bitops/hweight.h> #include <asm-generic/bitops/lock.h> +extern unsigned long find_next_zero_bit_le(const void *addr, + unsigned long size, unsigned long offset); +#define find_next_zero_bit_le find_next_zero_bit_le + +extern unsigned long find_next_bit_le(const void *addr, + unsigned long size, unsigned long offset); +#define find_next_bit_le find_next_bit_le + #include <asm-generic/bitops/le.h> #include <asm-generic/bitops/ext2-atomic.h> diff --git a/arch/m68k/include/asm/bitops_mm.h b/arch/m68k/include/asm/bitops_mm.h index 9d69f6e..a938ebe 100644 --- a/arch/m68k/include/asm/bitops_mm.h +++ b/arch/m68k/include/asm/bitops_mm.h @@ -198,6 +198,7 @@ static inline int find_first_zero_bit(const unsigned long *vaddr, out: return ((long)p - (long)vaddr - 4) * 8 + res; } +#define find_first_zero_bit find_first_zero_bit static inline int find_next_zero_bit(const unsigned long *vaddr, int size, int offset) @@ -223,6 +224,7 @@ static inline int find_next_zero_bit(const unsigned long *vaddr, int size, res = find_first_zero_bit(p, size - ((long)p - (long)vaddr) * 8); return offset + res; } +#define find_next_zero_bit find_next_zero_bit static inline int find_first_bit(const unsigned long *vaddr, unsigned size) { @@ -245,6 +247,7 @@ static inline int find_first_bit(const unsigned long *vaddr, unsigned size) out: return ((long)p - (long)vaddr - 4) * 8 + res; } +#define find_first_bit find_first_bit static inline int find_next_bit(const unsigned long *vaddr, int size, int offset) @@ -270,6 +273,7 @@ static inline int find_next_bit(const unsigned long *vaddr, int size, res = find_first_bit(p, size - ((long)p - (long)vaddr) * 8); return offset + res; } +#define find_next_bit find_next_bit /* * ffz = Find First Zero in word. Undefined if no zero exists, @@ -384,6 +388,7 @@ static inline int find_first_zero_bit_le(const void *vaddr, unsigned size) break; return (p - addr) * 32 + res; } +#define find_first_zero_bit_le find_first_zero_bit_le static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, unsigned long offset) @@ -408,6 +413,7 @@ static inline unsigned long find_next_zero_bit_le(const void *addr, /* No zero yet, search remaining full bytes for a zero */ return offset + find_first_zero_bit_le(p, size - offset); } +#define find_next_zero_bit_le find_next_zero_bit_le static inline int find_first_bit_le(const void *vaddr, unsigned size) { @@ -429,6 +435,7 @@ static inline int find_first_bit_le(const void *vaddr, unsigned size) break; return (p - addr) * 32 + res; } +#define find_first_bit_le find_first_bit_le static inline unsigned long find_next_bit_le(const void *addr, unsigned long size, unsigned long offset) @@ -453,6 +460,7 @@ static inline unsigned long find_next_bit_le(const void *addr, /* No set bit yet, search remaining full bytes for a set bit */ return offset + find_first_bit_le(p, size - offset); } +#define find_next_bit_le find_next_bit_le /* Bitmap functions for the ext2 filesystem. */ diff --git a/arch/m68k/include/asm/bitops_no.h b/arch/m68k/include/asm/bitops_no.h index 7d3779f..614c613 100644 --- a/arch/m68k/include/asm/bitops_no.h +++ b/arch/m68k/include/asm/bitops_no.h @@ -335,6 +335,7 @@ found_first: found_middle: return result + ffz(__swab32(tmp)); } +#define find_next_zero_bit_le find_next_zero_bit_le #endif /* __KERNEL__ */ diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h index e1c8f3a..426c974 100644 --- a/arch/s390/include/asm/bitops.h +++ b/arch/s390/include/asm/bitops.h @@ -621,6 +621,7 @@ static inline unsigned long find_first_zero_bit(const unsigned long *addr, bits = __ffz_word(bytes*8, __load_ulong_be(addr, bytes)); return (bits < size) ? bits : size; } +#define find_first_zero_bit find_first_zero_bit /** * find_first_bit - find the first set bit in a memory region @@ -641,6 +642,7 @@ static inline unsigned long find_first_bit(const unsigned long * addr, bits = __ffs_word(bytes*8, __load_ulong_be(addr, bytes)); return (bits < size) ? bits : size; } +#define find_first_bit find_first_bit /** * find_next_zero_bit - find the first zero bit in a memory region @@ -677,6 +679,7 @@ static inline int find_next_zero_bit (const unsigned long * addr, } return offset + find_first_zero_bit(p, size); } +#define find_next_zero_bit find_next_zero_bit /** * find_next_bit - find the first set bit in a memory region @@ -713,6 +716,7 @@ static inline int find_next_bit (const unsigned long * addr, } return offset + find_first_bit(p, size); } +#define find_next_bit find_next_bit /* * Every architecture must define this function. It's the fastest @@ -787,6 +791,7 @@ static inline int find_first_zero_bit_le(void *vaddr, unsigned int size) bits = __ffz_word(bytes*8, __load_ulong_le(vaddr, bytes)); return (bits < size) ? bits : size; } +#define find_first_zero_bit_le find_first_zero_bit_le static inline int find_next_zero_bit_le(void *vaddr, unsigned long size, unsigned long offset) @@ -816,6 +821,7 @@ static inline int find_next_zero_bit_le(void *vaddr, unsigned long size, } return offset + find_first_zero_bit_le(p, size); } +#define find_next_zero_bit_le find_next_zero_bit_le static inline unsigned long find_first_bit_le(void *vaddr, unsigned long size) { @@ -827,6 +833,7 @@ static inline unsigned long find_first_bit_le(void *vaddr, unsigned long size) bits = __ffs_word(bytes*8, __load_ulong_le(vaddr, bytes)); return (bits < size) ? bits : size; } +#define find_first_bit_le find_first_bit_le static inline int find_next_bit_le(void *vaddr, unsigned long size, unsigned long offset) @@ -856,6 +863,7 @@ static inline int find_next_bit_le(void *vaddr, unsigned long size, } return offset + find_first_bit_le(p, size); } +#define find_next_bit_le find_next_bit_le #define ext2_set_bit_atomic(lock, nr, addr) \ test_and_set_bit_le(nr, addr) -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 1/6] arch: add #define for each of optimized find bitops 2011-04-26 13:23 ` [PATCH v2 1/6] arch: add #define for each of optimized find bitops Akinobu Mita @ 2011-04-27 9:20 ` Russell King - ARM Linux 0 siblings, 0 replies; 6+ messages in thread From: Russell King - ARM Linux @ 2011-04-27 9:20 UTC (permalink / raw) To: linux-arm-kernel On Tue, Apr 26, 2011 at 10:23:38PM +0900, Akinobu Mita wrote: > The style that we normally use in asm-generic is to test the macro itself > for existence, so in asm-generic, do: > > #ifndef find_next_zero_bit_le > extern unsigned long find_next_zero_bit_le(const void *addr, > unsigned long size, unsigned long offset); > #endif > > and in the architectures, write > > static inline unsigned long find_next_zero_bit_le(const void *addr, > unsigned long size, unsigned long offset) > #define find_next_zero_bit_le find_next_zero_bit_le > > This adds the #define for each of the optimized find bitops in the > architectures. > > Suggested-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> > Acked-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> > Cc: Russell King <linux@arm.linux.org.uk> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> > Cc: linux-arm-kernel at lists.infradead.org > Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> > Cc: Heiko Carstens <heiko.carstens@de.ibm.com> > Cc: linux390 at de.ibm.com > Cc: linux-s390 at vger.kernel.org > Cc: Geert Uytterhoeven <geert@linux-m68k.org> > Cc: linux-m68k at lists.linux-m68k.org > Cc: Greg Ungerer <gerg@uclinux.org> > --- > > Changes from previous submission: > - Add Acked-by: line > - Rebase to mainline > > arch/arm/include/asm/bitops.h | 3 +++ > arch/avr32/include/asm/bitops.h | 15 +++++++++++++++ > arch/m68k/include/asm/bitops_mm.h | 8 ++++++++ > arch/m68k/include/asm/bitops_no.h | 1 + > arch/s390/include/asm/bitops.h | 8 ++++++++ > 5 files changed, 35 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h > index 6b7403f..18a024b 100644 > --- a/arch/arm/include/asm/bitops.h > +++ b/arch/arm/include/asm/bitops.h > @@ -326,16 +326,19 @@ static inline int find_first_zero_bit_le(const void *p, unsigned size) > { > return _find_first_zero_bit_le(p, size); > } > +#define find_first_zero_bit_le find_first_zero_bit_le > > static inline int find_next_zero_bit_le(const void *p, int size, int offset) > { > return _find_next_zero_bit_le(p, size, offset); > } > +#define find_next_zero_bit_le find_next_zero_bit_le > > static inline int find_next_bit_le(const void *p, int size, int offset) > { > return _find_next_bit_le(p, size, offset); > } > +#define find_next_bit_le find_next_bit_le > > /* > * Ext2 is defined to use little-endian byte ordering. > diff --git a/arch/avr32/include/asm/bitops.h b/arch/avr32/include/asm/bitops.h > index 72444d9..b70c19b 100644 > --- a/arch/avr32/include/asm/bitops.h > +++ b/arch/avr32/include/asm/bitops.h > @@ -270,14 +270,21 @@ static inline int __fls(unsigned long word) > > unsigned long find_first_zero_bit(const unsigned long *addr, > unsigned long size); > +#define find_first_zero_bit find_first_zero_bit > + > unsigned long find_next_zero_bit(const unsigned long *addr, > unsigned long size, > unsigned long offset); > +#define find_next_zero_bit find_next_zero_bit > + > unsigned long find_first_bit(const unsigned long *addr, > unsigned long size); > +#define find_first_bit find_first_bit > + > unsigned long find_next_bit(const unsigned long *addr, > unsigned long size, > unsigned long offset); > +#define find_next_bit find_next_bit > > /* > * ffs: find first bit set. This is defined the same way as > @@ -299,6 +306,14 @@ static inline int ffs(unsigned long word) > #include <asm-generic/bitops/hweight.h> > #include <asm-generic/bitops/lock.h> > > +extern unsigned long find_next_zero_bit_le(const void *addr, > + unsigned long size, unsigned long offset); > +#define find_next_zero_bit_le find_next_zero_bit_le > + > +extern unsigned long find_next_bit_le(const void *addr, > + unsigned long size, unsigned long offset); > +#define find_next_bit_le find_next_bit_le > + > #include <asm-generic/bitops/le.h> > #include <asm-generic/bitops/ext2-atomic.h> > > diff --git a/arch/m68k/include/asm/bitops_mm.h b/arch/m68k/include/asm/bitops_mm.h > index 9d69f6e..a938ebe 100644 > --- a/arch/m68k/include/asm/bitops_mm.h > +++ b/arch/m68k/include/asm/bitops_mm.h > @@ -198,6 +198,7 @@ static inline int find_first_zero_bit(const unsigned long *vaddr, > out: > return ((long)p - (long)vaddr - 4) * 8 + res; > } > +#define find_first_zero_bit find_first_zero_bit > > static inline int find_next_zero_bit(const unsigned long *vaddr, int size, > int offset) > @@ -223,6 +224,7 @@ static inline int find_next_zero_bit(const unsigned long *vaddr, int size, > res = find_first_zero_bit(p, size - ((long)p - (long)vaddr) * 8); > return offset + res; > } > +#define find_next_zero_bit find_next_zero_bit > > static inline int find_first_bit(const unsigned long *vaddr, unsigned size) > { > @@ -245,6 +247,7 @@ static inline int find_first_bit(const unsigned long *vaddr, unsigned size) > out: > return ((long)p - (long)vaddr - 4) * 8 + res; > } > +#define find_first_bit find_first_bit > > static inline int find_next_bit(const unsigned long *vaddr, int size, > int offset) > @@ -270,6 +273,7 @@ static inline int find_next_bit(const unsigned long *vaddr, int size, > res = find_first_bit(p, size - ((long)p - (long)vaddr) * 8); > return offset + res; > } > +#define find_next_bit find_next_bit > > /* > * ffz = Find First Zero in word. Undefined if no zero exists, > @@ -384,6 +388,7 @@ static inline int find_first_zero_bit_le(const void *vaddr, unsigned size) > break; > return (p - addr) * 32 + res; > } > +#define find_first_zero_bit_le find_first_zero_bit_le > > static inline unsigned long find_next_zero_bit_le(const void *addr, > unsigned long size, unsigned long offset) > @@ -408,6 +413,7 @@ static inline unsigned long find_next_zero_bit_le(const void *addr, > /* No zero yet, search remaining full bytes for a zero */ > return offset + find_first_zero_bit_le(p, size - offset); > } > +#define find_next_zero_bit_le find_next_zero_bit_le > > static inline int find_first_bit_le(const void *vaddr, unsigned size) > { > @@ -429,6 +435,7 @@ static inline int find_first_bit_le(const void *vaddr, unsigned size) > break; > return (p - addr) * 32 + res; > } > +#define find_first_bit_le find_first_bit_le > > static inline unsigned long find_next_bit_le(const void *addr, > unsigned long size, unsigned long offset) > @@ -453,6 +460,7 @@ static inline unsigned long find_next_bit_le(const void *addr, > /* No set bit yet, search remaining full bytes for a set bit */ > return offset + find_first_bit_le(p, size - offset); > } > +#define find_next_bit_le find_next_bit_le > > /* Bitmap functions for the ext2 filesystem. */ > > diff --git a/arch/m68k/include/asm/bitops_no.h b/arch/m68k/include/asm/bitops_no.h > index 7d3779f..614c613 100644 > --- a/arch/m68k/include/asm/bitops_no.h > +++ b/arch/m68k/include/asm/bitops_no.h > @@ -335,6 +335,7 @@ found_first: > found_middle: > return result + ffz(__swab32(tmp)); > } > +#define find_next_zero_bit_le find_next_zero_bit_le > > #endif /* __KERNEL__ */ > > diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h > index e1c8f3a..426c974 100644 > --- a/arch/s390/include/asm/bitops.h > +++ b/arch/s390/include/asm/bitops.h > @@ -621,6 +621,7 @@ static inline unsigned long find_first_zero_bit(const unsigned long *addr, > bits = __ffz_word(bytes*8, __load_ulong_be(addr, bytes)); > return (bits < size) ? bits : size; > } > +#define find_first_zero_bit find_first_zero_bit > > /** > * find_first_bit - find the first set bit in a memory region > @@ -641,6 +642,7 @@ static inline unsigned long find_first_bit(const unsigned long * addr, > bits = __ffs_word(bytes*8, __load_ulong_be(addr, bytes)); > return (bits < size) ? bits : size; > } > +#define find_first_bit find_first_bit > > /** > * find_next_zero_bit - find the first zero bit in a memory region > @@ -677,6 +679,7 @@ static inline int find_next_zero_bit (const unsigned long * addr, > } > return offset + find_first_zero_bit(p, size); > } > +#define find_next_zero_bit find_next_zero_bit > > /** > * find_next_bit - find the first set bit in a memory region > @@ -713,6 +716,7 @@ static inline int find_next_bit (const unsigned long * addr, > } > return offset + find_first_bit(p, size); > } > +#define find_next_bit find_next_bit > > /* > * Every architecture must define this function. It's the fastest > @@ -787,6 +791,7 @@ static inline int find_first_zero_bit_le(void *vaddr, unsigned int size) > bits = __ffz_word(bytes*8, __load_ulong_le(vaddr, bytes)); > return (bits < size) ? bits : size; > } > +#define find_first_zero_bit_le find_first_zero_bit_le > > static inline int find_next_zero_bit_le(void *vaddr, unsigned long size, > unsigned long offset) > @@ -816,6 +821,7 @@ static inline int find_next_zero_bit_le(void *vaddr, unsigned long size, > } > return offset + find_first_zero_bit_le(p, size); > } > +#define find_next_zero_bit_le find_next_zero_bit_le > > static inline unsigned long find_first_bit_le(void *vaddr, unsigned long size) > { > @@ -827,6 +833,7 @@ static inline unsigned long find_first_bit_le(void *vaddr, unsigned long size) > bits = __ffs_word(bytes*8, __load_ulong_le(vaddr, bytes)); > return (bits < size) ? bits : size; > } > +#define find_first_bit_le find_first_bit_le > > static inline int find_next_bit_le(void *vaddr, unsigned long size, > unsigned long offset) > @@ -856,6 +863,7 @@ static inline int find_next_bit_le(void *vaddr, unsigned long size, > } > return offset + find_first_bit_le(p, size); > } > +#define find_next_bit_le find_next_bit_le > > #define ext2_set_bit_atomic(lock, nr, addr) \ > test_and_set_bit_le(nr, addr) > -- > 1.7.4.4 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/6] bitops: add #ifndef for each of find bitops [not found] <1303824223-3566-1-git-send-email-akinobu.mita@gmail.com> 2011-04-26 13:23 ` [PATCH v2 1/6] arch: add #define for each of optimized find bitops Akinobu Mita @ 2011-04-26 13:23 ` Akinobu Mita 2011-04-27 9:20 ` Russell King - ARM Linux 2011-04-26 13:23 ` [PATCH v2 4/6] arm: use asm-generic/bitops/le.h Akinobu Mita 2 siblings, 1 reply; 6+ messages in thread From: Akinobu Mita @ 2011-04-26 13:23 UTC (permalink / raw) To: linux-arm-kernel The style that we normally use in asm-generic is to test the macro itself for existence, so in asm-generic, do: #ifndef find_next_zero_bit_le extern unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, unsigned long offset); #endif and in the architectures, write static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, unsigned long offset) #define find_next_zero_bit_le find_next_zero_bit_le This adds the #ifndef for each of the find bitops in the generic header and source files. Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-arm-kernel at lists.infradead.org Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: linux390 at de.ibm.com Cc: linux-s390 at vger.kernel.org Cc: Greg Ungerer <gerg@uclinux.org> --- No change from previous submission include/asm-generic/bitops/find.h | 4 ++++ include/asm-generic/bitops/le.h | 7 +++++++ include/linux/bitops.h | 2 ++ lib/find_last_bit.c | 4 ++++ lib/find_next_bit.c | 12 ++++++++++++ 5 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/asm-generic/bitops/find.h b/include/asm-generic/bitops/find.h index 110fa70..71c7780 100644 --- a/include/asm-generic/bitops/find.h +++ b/include/asm-generic/bitops/find.h @@ -1,6 +1,7 @@ #ifndef _ASM_GENERIC_BITOPS_FIND_H_ #define _ASM_GENERIC_BITOPS_FIND_H_ +#ifndef find_next_bit /** * find_next_bit - find the next set bit in a memory region * @addr: The address to base the search on @@ -9,7 +10,9 @@ */ extern unsigned long find_next_bit(const unsigned long *addr, unsigned long size, unsigned long offset); +#endif +#ifndef find_next_zero_bit /** * find_next_zero_bit - find the next cleared bit in a memory region * @addr: The address to base the search on @@ -18,6 +21,7 @@ extern unsigned long find_next_bit(const unsigned long *addr, unsigned long */ extern unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size, unsigned long offset); +#endif #ifdef CONFIG_GENERIC_FIND_FIRST_BIT diff --git a/include/asm-generic/bitops/le.h b/include/asm-generic/bitops/le.h index 946a21b..f95c663 100644 --- a/include/asm-generic/bitops/le.h +++ b/include/asm-generic/bitops/le.h @@ -30,13 +30,20 @@ static inline unsigned long find_first_zero_bit_le(const void *addr, #define BITOP_LE_SWIZZLE ((BITS_PER_LONG-1) & ~0x7) +#ifndef find_next_zero_bit_le extern unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, unsigned long offset); +#endif + +#ifndef find_next_bit_le extern unsigned long find_next_bit_le(const void *addr, unsigned long size, unsigned long offset); +#endif +#ifndef find_first_zero_bit_le #define find_first_zero_bit_le(addr, size) \ find_next_zero_bit_le((addr), (size), 0) +#endif #else #error "Please fix <asm/byteorder.h>" diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 2184c6b..4829252 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -149,6 +149,7 @@ static inline unsigned long __ffs64(u64 word) #ifdef __KERNEL__ #ifdef CONFIG_GENERIC_FIND_LAST_BIT +#ifndef find_last_bit /** * find_last_bit - find the last set bit in a memory region * @addr: The address to start the search at @@ -158,6 +159,7 @@ static inline unsigned long __ffs64(u64 word) */ extern unsigned long find_last_bit(const unsigned long *addr, unsigned long size); +#endif #endif /* CONFIG_GENERIC_FIND_LAST_BIT */ #endif /* __KERNEL__ */ diff --git a/lib/find_last_bit.c b/lib/find_last_bit.c index 5d202e3..d903959 100644 --- a/lib/find_last_bit.c +++ b/lib/find_last_bit.c @@ -15,6 +15,8 @@ #include <asm/types.h> #include <asm/byteorder.h> +#ifndef find_last_bit + unsigned long find_last_bit(const unsigned long *addr, unsigned long size) { unsigned long words; @@ -43,3 +45,5 @@ found: return size; } EXPORT_SYMBOL(find_last_bit); + +#endif diff --git a/lib/find_next_bit.c b/lib/find_next_bit.c index b0a8767..c02d09f 100644 --- a/lib/find_next_bit.c +++ b/lib/find_next_bit.c @@ -17,6 +17,7 @@ #define BITOP_WORD(nr) ((nr) / BITS_PER_LONG) #ifdef CONFIG_GENERIC_FIND_NEXT_BIT +#ifndef find_next_bit /* * Find the next set bit in a memory region. */ @@ -59,7 +60,9 @@ found_middle: return result + __ffs(tmp); } EXPORT_SYMBOL(find_next_bit); +#endif +#ifndef find_next_zero_bit /* * This implementation of find_{first,next}_zero_bit was stolen from * Linus' asm-alpha/bitops.h. @@ -103,9 +106,11 @@ found_middle: return result + ffz(tmp); } EXPORT_SYMBOL(find_next_zero_bit); +#endif #endif /* CONFIG_GENERIC_FIND_NEXT_BIT */ #ifdef CONFIG_GENERIC_FIND_FIRST_BIT +#ifndef find_first_bit /* * Find the first set bit in a memory region. */ @@ -131,7 +136,9 @@ found: return result + __ffs(tmp); } EXPORT_SYMBOL(find_first_bit); +#endif +#ifndef find_first_zero_bit /* * Find the first cleared bit in a memory region. */ @@ -157,6 +164,7 @@ found: return result + ffz(tmp); } EXPORT_SYMBOL(find_first_zero_bit); +#endif #endif /* CONFIG_GENERIC_FIND_FIRST_BIT */ #ifdef __BIG_ENDIAN @@ -186,6 +194,7 @@ static inline unsigned long ext2_swab(const unsigned long y) #endif } +#ifndef find_next_zero_bit_le unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, unsigned long offset) { @@ -229,7 +238,9 @@ found_middle_swap: return result + ffz(ext2_swab(tmp)); } EXPORT_SYMBOL(find_next_zero_bit_le); +#endif +#ifndef find_next_bit_le unsigned long find_next_bit_le(const void *addr, unsigned long size, unsigned long offset) { @@ -274,6 +285,7 @@ found_middle_swap: return result + __ffs(ext2_swab(tmp)); } EXPORT_SYMBOL(find_next_bit_le); +#endif #endif /* CONFIG_GENERIC_FIND_BIT_LE */ #endif /* __BIG_ENDIAN */ -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/6] bitops: add #ifndef for each of find bitops 2011-04-26 13:23 ` [PATCH v2 2/6] bitops: add #ifndef for each of " Akinobu Mita @ 2011-04-27 9:20 ` Russell King - ARM Linux 0 siblings, 0 replies; 6+ messages in thread From: Russell King - ARM Linux @ 2011-04-27 9:20 UTC (permalink / raw) To: linux-arm-kernel On Tue, Apr 26, 2011 at 10:23:39PM +0900, Akinobu Mita wrote: > The style that we normally use in asm-generic is to test the macro itself > for existence, so in asm-generic, do: > > #ifndef find_next_zero_bit_le > extern unsigned long find_next_zero_bit_le(const void *addr, > unsigned long size, unsigned long offset); > #endif > > and in the architectures, write > > static inline unsigned long find_next_zero_bit_le(const void *addr, > unsigned long size, unsigned long offset) > #define find_next_zero_bit_le find_next_zero_bit_le > > This adds the #ifndef for each of the find bitops in the generic header > and source files. > > Suggested-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> > Cc: Russell King <linux@arm.linux.org.uk> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> > Cc: linux-arm-kernel at lists.infradead.org > Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> > Cc: Heiko Carstens <heiko.carstens@de.ibm.com> > Cc: linux390 at de.ibm.com > Cc: linux-s390 at vger.kernel.org > Cc: Greg Ungerer <gerg@uclinux.org> > --- > > No change from previous submission > > include/asm-generic/bitops/find.h | 4 ++++ > include/asm-generic/bitops/le.h | 7 +++++++ > include/linux/bitops.h | 2 ++ > lib/find_last_bit.c | 4 ++++ > lib/find_next_bit.c | 12 ++++++++++++ > 5 files changed, 29 insertions(+), 0 deletions(-) > > diff --git a/include/asm-generic/bitops/find.h b/include/asm-generic/bitops/find.h > index 110fa70..71c7780 100644 > --- a/include/asm-generic/bitops/find.h > +++ b/include/asm-generic/bitops/find.h > @@ -1,6 +1,7 @@ > #ifndef _ASM_GENERIC_BITOPS_FIND_H_ > #define _ASM_GENERIC_BITOPS_FIND_H_ > > +#ifndef find_next_bit > /** > * find_next_bit - find the next set bit in a memory region > * @addr: The address to base the search on > @@ -9,7 +10,9 @@ > */ > extern unsigned long find_next_bit(const unsigned long *addr, unsigned long > size, unsigned long offset); > +#endif > > +#ifndef find_next_zero_bit > /** > * find_next_zero_bit - find the next cleared bit in a memory region > * @addr: The address to base the search on > @@ -18,6 +21,7 @@ extern unsigned long find_next_bit(const unsigned long *addr, unsigned long > */ > extern unsigned long find_next_zero_bit(const unsigned long *addr, unsigned > long size, unsigned long offset); > +#endif > > #ifdef CONFIG_GENERIC_FIND_FIRST_BIT > > diff --git a/include/asm-generic/bitops/le.h b/include/asm-generic/bitops/le.h > index 946a21b..f95c663 100644 > --- a/include/asm-generic/bitops/le.h > +++ b/include/asm-generic/bitops/le.h > @@ -30,13 +30,20 @@ static inline unsigned long find_first_zero_bit_le(const void *addr, > > #define BITOP_LE_SWIZZLE ((BITS_PER_LONG-1) & ~0x7) > > +#ifndef find_next_zero_bit_le > extern unsigned long find_next_zero_bit_le(const void *addr, > unsigned long size, unsigned long offset); > +#endif > + > +#ifndef find_next_bit_le > extern unsigned long find_next_bit_le(const void *addr, > unsigned long size, unsigned long offset); > +#endif > > +#ifndef find_first_zero_bit_le > #define find_first_zero_bit_le(addr, size) \ > find_next_zero_bit_le((addr), (size), 0) > +#endif > > #else > #error "Please fix <asm/byteorder.h>" > diff --git a/include/linux/bitops.h b/include/linux/bitops.h > index 2184c6b..4829252 100644 > --- a/include/linux/bitops.h > +++ b/include/linux/bitops.h > @@ -149,6 +149,7 @@ static inline unsigned long __ffs64(u64 word) > #ifdef __KERNEL__ > > #ifdef CONFIG_GENERIC_FIND_LAST_BIT > +#ifndef find_last_bit > /** > * find_last_bit - find the last set bit in a memory region > * @addr: The address to start the search at > @@ -158,6 +159,7 @@ static inline unsigned long __ffs64(u64 word) > */ > extern unsigned long find_last_bit(const unsigned long *addr, > unsigned long size); > +#endif > #endif /* CONFIG_GENERIC_FIND_LAST_BIT */ > > #endif /* __KERNEL__ */ > diff --git a/lib/find_last_bit.c b/lib/find_last_bit.c > index 5d202e3..d903959 100644 > --- a/lib/find_last_bit.c > +++ b/lib/find_last_bit.c > @@ -15,6 +15,8 @@ > #include <asm/types.h> > #include <asm/byteorder.h> > > +#ifndef find_last_bit > + > unsigned long find_last_bit(const unsigned long *addr, unsigned long size) > { > unsigned long words; > @@ -43,3 +45,5 @@ found: > return size; > } > EXPORT_SYMBOL(find_last_bit); > + > +#endif > diff --git a/lib/find_next_bit.c b/lib/find_next_bit.c > index b0a8767..c02d09f 100644 > --- a/lib/find_next_bit.c > +++ b/lib/find_next_bit.c > @@ -17,6 +17,7 @@ > #define BITOP_WORD(nr) ((nr) / BITS_PER_LONG) > > #ifdef CONFIG_GENERIC_FIND_NEXT_BIT > +#ifndef find_next_bit > /* > * Find the next set bit in a memory region. > */ > @@ -59,7 +60,9 @@ found_middle: > return result + __ffs(tmp); > } > EXPORT_SYMBOL(find_next_bit); > +#endif > > +#ifndef find_next_zero_bit > /* > * This implementation of find_{first,next}_zero_bit was stolen from > * Linus' asm-alpha/bitops.h. > @@ -103,9 +106,11 @@ found_middle: > return result + ffz(tmp); > } > EXPORT_SYMBOL(find_next_zero_bit); > +#endif > #endif /* CONFIG_GENERIC_FIND_NEXT_BIT */ > > #ifdef CONFIG_GENERIC_FIND_FIRST_BIT > +#ifndef find_first_bit > /* > * Find the first set bit in a memory region. > */ > @@ -131,7 +136,9 @@ found: > return result + __ffs(tmp); > } > EXPORT_SYMBOL(find_first_bit); > +#endif > > +#ifndef find_first_zero_bit > /* > * Find the first cleared bit in a memory region. > */ > @@ -157,6 +164,7 @@ found: > return result + ffz(tmp); > } > EXPORT_SYMBOL(find_first_zero_bit); > +#endif > #endif /* CONFIG_GENERIC_FIND_FIRST_BIT */ > > #ifdef __BIG_ENDIAN > @@ -186,6 +194,7 @@ static inline unsigned long ext2_swab(const unsigned long y) > #endif > } > > +#ifndef find_next_zero_bit_le > unsigned long find_next_zero_bit_le(const void *addr, unsigned > long size, unsigned long offset) > { > @@ -229,7 +238,9 @@ found_middle_swap: > return result + ffz(ext2_swab(tmp)); > } > EXPORT_SYMBOL(find_next_zero_bit_le); > +#endif > > +#ifndef find_next_bit_le > unsigned long find_next_bit_le(const void *addr, unsigned > long size, unsigned long offset) > { > @@ -274,6 +285,7 @@ found_middle_swap: > return result + __ffs(ext2_swab(tmp)); > } > EXPORT_SYMBOL(find_next_bit_le); > +#endif > > #endif /* CONFIG_GENERIC_FIND_BIT_LE */ > #endif /* __BIG_ENDIAN */ > -- > 1.7.4.4 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 4/6] arm: use asm-generic/bitops/le.h [not found] <1303824223-3566-1-git-send-email-akinobu.mita@gmail.com> 2011-04-26 13:23 ` [PATCH v2 1/6] arch: add #define for each of optimized find bitops Akinobu Mita 2011-04-26 13:23 ` [PATCH v2 2/6] bitops: add #ifndef for each of " Akinobu Mita @ 2011-04-26 13:23 ` Akinobu Mita 2011-04-27 9:19 ` Russell King - ARM Linux 2 siblings, 1 reply; 6+ messages in thread From: Akinobu Mita @ 2011-04-26 13:23 UTC (permalink / raw) To: linux-arm-kernel The previous style change enables to use asm-generic/bitops/le.h on arm. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-arm-kernel at lists.infradead.org --- No change from previous submission arch/arm/include/asm/bitops.h | 43 ++++------------------------------------ 1 files changed, 5 insertions(+), 38 deletions(-) diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h index 18a024b..b4892a0 100644 --- a/arch/arm/include/asm/bitops.h +++ b/arch/arm/include/asm/bitops.h @@ -203,8 +203,6 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset); #define find_first_bit(p,sz) _find_first_bit_le(p,sz) #define find_next_bit(p,sz,off) _find_next_bit_le(p,sz,off) -#define WORD_BITOFF_TO_LE(x) ((x)) - #else /* * These are the big endian, atomic definitions. @@ -214,8 +212,6 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset); #define find_first_bit(p,sz) _find_first_bit_be(p,sz) #define find_next_bit(p,sz,off) _find_next_bit_be(p,sz,off) -#define WORD_BITOFF_TO_LE(x) ((x) ^ 0x18) - #endif #if __LINUX_ARM_ARCH__ < 5 @@ -287,40 +283,7 @@ static inline int fls(int x) #include <asm-generic/bitops/hweight.h> #include <asm-generic/bitops/lock.h> -static inline void __set_bit_le(int nr, void *addr) -{ - __set_bit(WORD_BITOFF_TO_LE(nr), addr); -} - -static inline void __clear_bit_le(int nr, void *addr) -{ - __clear_bit(WORD_BITOFF_TO_LE(nr), addr); -} - -static inline int __test_and_set_bit_le(int nr, void *addr) -{ - return __test_and_set_bit(WORD_BITOFF_TO_LE(nr), addr); -} - -static inline int test_and_set_bit_le(int nr, void *addr) -{ - return test_and_set_bit(WORD_BITOFF_TO_LE(nr), addr); -} - -static inline int __test_and_clear_bit_le(int nr, void *addr) -{ - return __test_and_clear_bit(WORD_BITOFF_TO_LE(nr), addr); -} - -static inline int test_and_clear_bit_le(int nr, void *addr) -{ - return test_and_clear_bit(WORD_BITOFF_TO_LE(nr), addr); -} - -static inline int test_bit_le(int nr, const void *addr) -{ - return test_bit(WORD_BITOFF_TO_LE(nr), addr); -} +#ifdef __ARMEB__ static inline int find_first_zero_bit_le(const void *p, unsigned size) { @@ -340,6 +303,10 @@ static inline int find_next_bit_le(const void *p, int size, int offset) } #define find_next_bit_le find_next_bit_le +#endif + +#include <asm-generic/bitops/le.h> + /* * Ext2 is defined to use little-endian byte ordering. */ -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 4/6] arm: use asm-generic/bitops/le.h 2011-04-26 13:23 ` [PATCH v2 4/6] arm: use asm-generic/bitops/le.h Akinobu Mita @ 2011-04-27 9:19 ` Russell King - ARM Linux 0 siblings, 0 replies; 6+ messages in thread From: Russell King - ARM Linux @ 2011-04-27 9:19 UTC (permalink / raw) To: linux-arm-kernel On Tue, Apr 26, 2011 at 10:23:41PM +0900, Akinobu Mita wrote: > The previous style change enables to use asm-generic/bitops/le.h > on arm. > > Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> > Cc: Russell King <linux@arm.linux.org.uk> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> > Cc: linux-arm-kernel at lists.infradead.org > --- > > No change from previous submission > > arch/arm/include/asm/bitops.h | 43 ++++------------------------------------ > 1 files changed, 5 insertions(+), 38 deletions(-) > > diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h > index 18a024b..b4892a0 100644 > --- a/arch/arm/include/asm/bitops.h > +++ b/arch/arm/include/asm/bitops.h > @@ -203,8 +203,6 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset); > #define find_first_bit(p,sz) _find_first_bit_le(p,sz) > #define find_next_bit(p,sz,off) _find_next_bit_le(p,sz,off) > > -#define WORD_BITOFF_TO_LE(x) ((x)) > - > #else > /* > * These are the big endian, atomic definitions. > @@ -214,8 +212,6 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset); > #define find_first_bit(p,sz) _find_first_bit_be(p,sz) > #define find_next_bit(p,sz,off) _find_next_bit_be(p,sz,off) > > -#define WORD_BITOFF_TO_LE(x) ((x) ^ 0x18) > - > #endif > > #if __LINUX_ARM_ARCH__ < 5 > @@ -287,40 +283,7 @@ static inline int fls(int x) > #include <asm-generic/bitops/hweight.h> > #include <asm-generic/bitops/lock.h> > > -static inline void __set_bit_le(int nr, void *addr) > -{ > - __set_bit(WORD_BITOFF_TO_LE(nr), addr); > -} > - > -static inline void __clear_bit_le(int nr, void *addr) > -{ > - __clear_bit(WORD_BITOFF_TO_LE(nr), addr); > -} > - > -static inline int __test_and_set_bit_le(int nr, void *addr) > -{ > - return __test_and_set_bit(WORD_BITOFF_TO_LE(nr), addr); > -} > - > -static inline int test_and_set_bit_le(int nr, void *addr) > -{ > - return test_and_set_bit(WORD_BITOFF_TO_LE(nr), addr); > -} > - > -static inline int __test_and_clear_bit_le(int nr, void *addr) > -{ > - return __test_and_clear_bit(WORD_BITOFF_TO_LE(nr), addr); > -} > - > -static inline int test_and_clear_bit_le(int nr, void *addr) > -{ > - return test_and_clear_bit(WORD_BITOFF_TO_LE(nr), addr); > -} > - > -static inline int test_bit_le(int nr, const void *addr) > -{ > - return test_bit(WORD_BITOFF_TO_LE(nr), addr); > -} > +#ifdef __ARMEB__ > > static inline int find_first_zero_bit_le(const void *p, unsigned size) > { > @@ -340,6 +303,10 @@ static inline int find_next_bit_le(const void *p, int size, int offset) > } > #define find_next_bit_le find_next_bit_le > > +#endif > + > +#include <asm-generic/bitops/le.h> > + > /* > * Ext2 is defined to use little-endian byte ordering. > */ > -- > 1.7.4.4 > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-04-27 9:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1303824223-3566-1-git-send-email-akinobu.mita@gmail.com>
2011-04-26 13:23 ` [PATCH v2 1/6] arch: add #define for each of optimized find bitops Akinobu Mita
2011-04-27 9:20 ` Russell King - ARM Linux
2011-04-26 13:23 ` [PATCH v2 2/6] bitops: add #ifndef for each of " Akinobu Mita
2011-04-27 9:20 ` Russell King - ARM Linux
2011-04-26 13:23 ` [PATCH v2 4/6] arm: use asm-generic/bitops/le.h Akinobu Mita
2011-04-27 9:19 ` Russell King - ARM Linux
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).