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 /arch | |
| parent | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (diff) | |
arch/tile: Rename the hweight() implementations to __arch_hweight()
See commit 1527bc8b928dd1399c3d3467dd47d9ede210978a.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch')
| -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 84600f3514da..6832b4be8990 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) | |||
| 98 | return (sizeof(__u64) * 8) - __builtin_clzll(w); | 98 | return (sizeof(__u64) * 8) - __builtin_clzll(w); |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | static inline unsigned int hweight32(unsigned int w) | 101 | static inline unsigned int __arch_hweight32(unsigned int w) |
| 102 | { | 102 | { |
| 103 | return __builtin_popcount(w); | 103 | return __builtin_popcount(w); |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | static inline unsigned int hweight16(unsigned int w) | 106 | static inline unsigned int __arch_hweight16(unsigned int w) |
| 107 | { | 107 | { |
| 108 | return __builtin_popcount(w & 0xffff); | 108 | return __builtin_popcount(w & 0xffff); |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | static inline unsigned int hweight8(unsigned int w) | 111 | static inline unsigned int __arch_hweight8(unsigned int w) |
| 112 | { | 112 | { |
| 113 | return __builtin_popcount(w & 0xff); | 113 | return __builtin_popcount(w & 0xff); |
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | static inline unsigned long hweight64(__u64 w) | 116 | static inline unsigned long __arch_hweight64(__u64 w) |
| 117 | { | 117 | { |
| 118 | return __builtin_popcountll(w); | 118 | return __builtin_popcountll(w); |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | #include <asm-generic/bitops/const_hweight.h> | ||
| 121 | #include <asm-generic/bitops/lock.h> | 122 | #include <asm-generic/bitops/lock.h> |
| 122 | #include <asm-generic/bitops/sched.h> | 123 | #include <asm-generic/bitops/sched.h> |
| 123 | #include <asm-generic/bitops/ext2-non-atomic.h> | 124 | #include <asm-generic/bitops/ext2-non-atomic.h> |