diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2011-05-26 19:26:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 20:12:38 -0400 |
commit | a2812e178321132811a53f7be40fe7e9bbffd9e0 (patch) | |
tree | 5e1ae6d683d964cce8b4f107d8032522ac69b372 /arch/s390 | |
parent | e0819410dba141338ebf6ab1057c1863be6247ab (diff) |
arch: add #define for each of optimized find bitops
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>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/include/asm/bitops.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h index e1c8f3a49884..426c97459f68 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, | |||
621 | bits = __ffz_word(bytes*8, __load_ulong_be(addr, bytes)); | 621 | bits = __ffz_word(bytes*8, __load_ulong_be(addr, bytes)); |
622 | return (bits < size) ? bits : size; | 622 | return (bits < size) ? bits : size; |
623 | } | 623 | } |
624 | #define find_first_zero_bit find_first_zero_bit | ||
624 | 625 | ||
625 | /** | 626 | /** |
626 | * find_first_bit - find the first set bit in a memory region | 627 | * 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, | |||
641 | bits = __ffs_word(bytes*8, __load_ulong_be(addr, bytes)); | 642 | bits = __ffs_word(bytes*8, __load_ulong_be(addr, bytes)); |
642 | return (bits < size) ? bits : size; | 643 | return (bits < size) ? bits : size; |
643 | } | 644 | } |
645 | #define find_first_bit find_first_bit | ||
644 | 646 | ||
645 | /** | 647 | /** |
646 | * find_next_zero_bit - find the first zero bit in a memory region | 648 | * 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, | |||
677 | } | 679 | } |
678 | return offset + find_first_zero_bit(p, size); | 680 | return offset + find_first_zero_bit(p, size); |
679 | } | 681 | } |
682 | #define find_next_zero_bit find_next_zero_bit | ||
680 | 683 | ||
681 | /** | 684 | /** |
682 | * find_next_bit - find the first set bit in a memory region | 685 | * 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, | |||
713 | } | 716 | } |
714 | return offset + find_first_bit(p, size); | 717 | return offset + find_first_bit(p, size); |
715 | } | 718 | } |
719 | #define find_next_bit find_next_bit | ||
716 | 720 | ||
717 | /* | 721 | /* |
718 | * Every architecture must define this function. It's the fastest | 722 | * 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) | |||
787 | bits = __ffz_word(bytes*8, __load_ulong_le(vaddr, bytes)); | 791 | bits = __ffz_word(bytes*8, __load_ulong_le(vaddr, bytes)); |
788 | return (bits < size) ? bits : size; | 792 | return (bits < size) ? bits : size; |
789 | } | 793 | } |
794 | #define find_first_zero_bit_le find_first_zero_bit_le | ||
790 | 795 | ||
791 | static inline int find_next_zero_bit_le(void *vaddr, unsigned long size, | 796 | static inline int find_next_zero_bit_le(void *vaddr, unsigned long size, |
792 | unsigned long offset) | 797 | unsigned long offset) |
@@ -816,6 +821,7 @@ static inline int find_next_zero_bit_le(void *vaddr, unsigned long size, | |||
816 | } | 821 | } |
817 | return offset + find_first_zero_bit_le(p, size); | 822 | return offset + find_first_zero_bit_le(p, size); |
818 | } | 823 | } |
824 | #define find_next_zero_bit_le find_next_zero_bit_le | ||
819 | 825 | ||
820 | static inline unsigned long find_first_bit_le(void *vaddr, unsigned long size) | 826 | static inline unsigned long find_first_bit_le(void *vaddr, unsigned long size) |
821 | { | 827 | { |
@@ -827,6 +833,7 @@ static inline unsigned long find_first_bit_le(void *vaddr, unsigned long size) | |||
827 | bits = __ffs_word(bytes*8, __load_ulong_le(vaddr, bytes)); | 833 | bits = __ffs_word(bytes*8, __load_ulong_le(vaddr, bytes)); |
828 | return (bits < size) ? bits : size; | 834 | return (bits < size) ? bits : size; |
829 | } | 835 | } |
836 | #define find_first_bit_le find_first_bit_le | ||
830 | 837 | ||
831 | static inline int find_next_bit_le(void *vaddr, unsigned long size, | 838 | static inline int find_next_bit_le(void *vaddr, unsigned long size, |
832 | unsigned long offset) | 839 | unsigned long offset) |
@@ -856,6 +863,7 @@ static inline int find_next_bit_le(void *vaddr, unsigned long size, | |||
856 | } | 863 | } |
857 | return offset + find_first_bit_le(p, size); | 864 | return offset + find_first_bit_le(p, size); |
858 | } | 865 | } |
866 | #define find_next_bit_le find_next_bit_le | ||
859 | 867 | ||
860 | #define ext2_set_bit_atomic(lock, nr, addr) \ | 868 | #define ext2_set_bit_atomic(lock, nr, addr) \ |
861 | test_and_set_bit_le(nr, addr) | 869 | test_and_set_bit_le(nr, addr) |