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

Commit 97e94c3a authored by Mike Frysinger's avatar Mike Frysinger
Browse files

Blackfin: fix hweight breakage 



The recent commit to add constant optimization to hweight implicitly broke
the Blackfin arch.  Seems we were missed when all the other arches were
fixed with renames.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 9ee47476

arch/blackfin/include/asm/bitops.h

+10 −7
Original line number Original line Diff line number Diff line
@@ -22,7 +22,9 @@ 




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

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

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

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

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

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

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



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

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

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

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

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

#include <asm-generic/bitops/minix.h>
@@ -115,7 +117,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr) 
 * of bits set) of a N-bit word

 * of bits set) of a N-bit word

 */

 */





static inline unsigned int hweight32(unsigned int w)

static inline unsigned int __arch_hweight32(unsigned int w)

{

{

	unsigned int res;

	unsigned int res;
@@ -125,19 +127,20 @@ static inline unsigned int hweight32(unsigned int w) 
	return res;

	return res;

}

}





static inline unsigned int hweight64(__u64 w)

static inline unsigned int __arch_hweight64(__u64 w)

{

{

	return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w);

	return __arch_hweight32((unsigned int)(w >> 32)) +

	       __arch_hweight32((unsigned int)w);

}

}





static inline unsigned int hweight16(unsigned int w)

static inline unsigned int __arch_hweight16(unsigned int w)

{

{

	return hweight32(w & 0xffff);

	return __arch_hweight32(w & 0xffff);

}

}





static inline unsigned int hweight8(unsigned int w)

static inline unsigned int __arch_hweight8(unsigned int w)

{

{

	return hweight32(w & 0xff);

	return __arch_hweight32(w & 0xff);

}

}





#endif				/* _BLACKFIN_BITOPS_H */
 
#endif				/* _BLACKFIN_BITOPS_H */