diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 20:32:41 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 20:45:54 -0400 |
| commit | 947e7dc1aed0532478e10988328bfd7426e0c2bd (patch) | |
| tree | 4bafd2b326b7a86879456bd0496cf8bb9d950a72 | |
| parent | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (diff) | |
arch/tile: Rename the hweight() implementations to __arch_hweight()
See commit 1527bc8b928dd1399c3d3467dd47d9ede210978a.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
| -rw-r--r-- | arch/tile/include/asm/bitops.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/tile/include/asm/bitops.h b/arch/tile/include/asm/bitops.h index 84600f3514d..6832b4be899 100644 --- a/arch/tile/include/asm/bitops.h +++ b/arch/tile/include/asm/bitops.h @@ -98,26 +98,27 @@ static inline int fls64(__u64 w) return (sizeof(__u64) * 8) - __builtin_clzll(w); } -static inline unsigned int hweight32(unsigned int w) +static inline unsigned int __arch_hweight32(unsigned int w) { return __builtin_popcount(w); } -static inline unsigned int hweight16(unsigned int w) +static inline unsigned int __arch_hweight16(unsigned int w) { return __builtin_popcount(w & 0xffff); } -static inline unsigned int hweight8(unsigned int w) +static inline unsigned int __arch_hweight8(unsigned int w) { return __builtin_popcount(w & 0xff); } -static inline unsigned long hweight64(__u64 w) +static inline unsigned long __arch_hweight64(__u64 w) { return __builtin_popcountll(w); } +#include <asm-generic/bitops/const_hweight.h> #include <asm-generic/bitops/lock.h> #include <asm-generic/bitops/sched.h> #include <asm-generic/bitops/ext2-non-atomic.h> |