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

Commit d6a0aa31 authored by Akinobu Mita's avatar Akinobu Mita Committed by Chris Metcalf
Browse files

tile: use asm-generic/bitops/builtin-*.h 



The definisions of __ffs(), __fls(), and ffs() for tile are almost same
as asm-generic/bitops-*.h.  The only difference is that it is defined
as __always_inline or inline.  So this switches to use those headers.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> [moved #includes to end]
parent f6f380df

arch/tile/include/asm/bitops.h

+3 −38
Original line number Diff line number Diff line
@@ -28,17 +28,6 @@ 
#include <asm/bitops_32.h>

#endif



/**

 * __ffs - find first set bit in word

 * @word: The word to search

 *

 * Undefined if no set bit exists, so code should check against 0 first.

 */

static inline unsigned long __ffs(unsigned long word)

{

	return __builtin_ctzl(word);

}



/**

 * ffz - find first zero bit in word

 * @word: The word to search
@@ -50,33 +39,6 @@ static inline unsigned long ffz(unsigned long word) 
	return __builtin_ctzl(~word);

}



/**

 * __fls - find last set bit in word

 * @word: The word to search

 *

 * Undefined if no set bit exists, so code should check against 0 first.

 */

static inline unsigned long __fls(unsigned long word)

{

	return (sizeof(word) * 8) - 1 - __builtin_clzl(word);

}



/**

 * ffs - find first set bit in word

 * @x: the word to search

 *

 * This is defined the same way as the libc and compiler builtin ffs

 * routines, therefore differs in spirit from the other bitops.

 *

 * ffs(value) returns 0 if value is 0 or the position of the first

 * set bit if value is nonzero. The first (least significant) bit

 * is at position 1.

 */

static inline int ffs(int x)

{

	return __builtin_ffs(x);

}



static inline int fls64(__u64 w)

{

	return (sizeof(__u64) * 8) - __builtin_clzll(w);
@@ -118,6 +80,9 @@ static inline unsigned long __arch_hweight64(__u64 w) 
	return __builtin_popcountll(w);

}



#include <asm-generic/bitops/builtin-__ffs.h>

#include <asm-generic/bitops/builtin-__fls.h>

#include <asm-generic/bitops/builtin-ffs.h>

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

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

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