Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 708ff2a0 authored by Akinobu Mita's avatar Akinobu Mita Committed by Arnd Bergmann
Browse files

bitops: make asm-generic/bitops/find.h more generic 



asm-generic/bitops/find.h has the extern declarations of find_next_bit()
and find_next_zero_bit() and the macro definitions of find_first_bit()
and find_first_zero_bit(). It is only usable by the architectures which
enables CONFIG_GENERIC_FIND_NEXT_BIT and disables
CONFIG_GENERIC_FIND_FIRST_BIT.

x86 and tile enable both CONFIG_GENERIC_FIND_NEXT_BIT and
CONFIG_GENERIC_FIND_FIRST_BIT. These architectures cannot include
asm-generic/bitops/find.h in their asm/bitops.h. So ifdefed extern
declarations of find_first_bit and find_first_zero_bit() are put in
linux/bitops.h.

This makes asm-generic/bitops/find.h usable by these architectures
and use it. Also this change is needed for the forthcoming duplicated
extern declarations cleanup.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Chris Metcalf <cmetcalf@tilera.com>
parent c24cef0b

arch/tile/include/asm/bitops.h

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ static inline unsigned long __arch_hweight64(__u64 w) 


#include <asm-generic/bitops/const_hweight.h>

#include <asm-generic/bitops/lock.h>

#include <asm-generic/bitops/find.h>

#include <asm-generic/bitops/sched.h>

#include <asm-generic/bitops/ext2-non-atomic.h>

#include <asm-generic/bitops/minix.h>

arch/x86/include/asm/bitops.h

+2 −0
Original line number Diff line number Diff line
@@ -440,6 +440,8 @@ static inline int fls(int x) 


#ifdef __KERNEL__



#include <asm-generic/bitops/find.h>



#include <asm-generic/bitops/sched.h>



#define ARCH_HAS_FAST_MULTIPLIER 1

include/asm-generic/bitops/find.h

+25 −0
Original line number Diff line number Diff line
@@ -9,7 +9,32 @@ extern unsigned long find_next_zero_bit(const unsigned long *addr, unsigned 
		long size, unsigned long offset);

#endif



#ifdef CONFIG_GENERIC_FIND_FIRST_BIT



/**

 * find_first_bit - find the first set bit in a memory region

 * @addr: The address to start the search at

 * @size: The maximum size to search

 *

 * Returns the bit number of the first set bit.

 */

extern unsigned long find_first_bit(const unsigned long *addr,

				    unsigned long size);



/**

 * find_first_zero_bit - find the first cleared bit in a memory region

 * @addr: The address to start the search at

 * @size: The maximum size to search

 *

 * Returns the bit number of the first cleared bit.

 */

extern unsigned long find_first_zero_bit(const unsigned long *addr,

					 unsigned long size);

#else /* CONFIG_GENERIC_FIND_FIRST_BIT */



#define find_first_bit(addr, size) find_next_bit((addr), (size), 0)

#define find_first_zero_bit(addr, size) find_next_zero_bit((addr), (size), 0)



#endif /* CONFIG_GENERIC_FIND_FIRST_BIT */



#endif /*_ASM_GENERIC_BITOPS_FIND_H_ */

include/linux/bitops.h

+0 −22
Original line number Diff line number Diff line
@@ -136,28 +136,6 @@ static inline unsigned long __ffs64(u64 word) 
}



#ifdef __KERNEL__

#ifdef CONFIG_GENERIC_FIND_FIRST_BIT



/**

 * find_first_bit - find the first set bit in a memory region

 * @addr: The address to start the search at

 * @size: The maximum size to search

 *

 * Returns the bit number of the first set bit.

 */

extern unsigned long find_first_bit(const unsigned long *addr,

				    unsigned long size);



/**

 * find_first_zero_bit - find the first cleared bit in a memory region

 * @addr: The address to start the search at

 * @size: The maximum size to search

 *

 * Returns the bit number of the first cleared bit.

 */

extern unsigned long find_first_zero_bit(const unsigned long *addr,

					 unsigned long size);

#endif /* CONFIG_GENERIC_FIND_FIRST_BIT */



#ifdef CONFIG_GENERIC_FIND_LAST_BIT

/**