Commit 19de85ef authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

bitops: add #ifndef for each of 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 #ifndef for each of the find bitops in the generic header
and source files.

Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a2812e17

include/asm-generic/bitops/find.h

+4 −0
Original line number Diff line number Diff line 
#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

include/asm-generic/bitops/le.h

+7 −0
Original line number Diff line number Diff line
@@ -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>"

include/linux/bitops.h

+2 −0
Original line number Diff line number Diff line
@@ -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__ */

lib/find_last_bit.c

+4 −0
Original line number Diff line number Diff line
@@ -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

lib/find_next_bit.c

+12 −0
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE