Commit 97e94c3a57c5999dde878449f17238ae98f74e42
1 parent
9ee47476d6
Exists in
master
and in
4 other branches
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: Mike Frysinger <vapier@gentoo.org>
Showing 1 changed file with 10 additions and 7 deletions Side-by-side Diff
arch/blackfin/include/asm/bitops.h
| ... | ... | @@ -22,7 +22,9 @@ |
| 22 | 22 | |
| 23 | 23 | #include <asm-generic/bitops/sched.h> |
| 24 | 24 | #include <asm-generic/bitops/ffs.h> |
| 25 | +#include <asm-generic/bitops/const_hweight.h> | |
| 25 | 26 | #include <asm-generic/bitops/lock.h> |
| 27 | + | |
| 26 | 28 | #include <asm-generic/bitops/ext2-non-atomic.h> |
| 27 | 29 | #include <asm-generic/bitops/ext2-atomic.h> |
| 28 | 30 | #include <asm-generic/bitops/minix.h> |
| ... | ... | @@ -115,7 +117,7 @@ |
| 115 | 117 | * of bits set) of a N-bit word |
| 116 | 118 | */ |
| 117 | 119 | |
| 118 | -static inline unsigned int hweight32(unsigned int w) | |
| 120 | +static inline unsigned int __arch_hweight32(unsigned int w) | |
| 119 | 121 | { |
| 120 | 122 | unsigned int res; |
| 121 | 123 | |
| 122 | 124 | |
| 123 | 125 | |
| 124 | 126 | |
| 125 | 127 | |
| 126 | 128 | |
| ... | ... | @@ -125,19 +127,20 @@ |
| 125 | 127 | return res; |
| 126 | 128 | } |
| 127 | 129 | |
| 128 | -static inline unsigned int hweight64(__u64 w) | |
| 130 | +static inline unsigned int __arch_hweight64(__u64 w) | |
| 129 | 131 | { |
| 130 | - return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w); | |
| 132 | + return __arch_hweight32((unsigned int)(w >> 32)) + | |
| 133 | + __arch_hweight32((unsigned int)w); | |
| 131 | 134 | } |
| 132 | 135 | |
| 133 | -static inline unsigned int hweight16(unsigned int w) | |
| 136 | +static inline unsigned int __arch_hweight16(unsigned int w) | |
| 134 | 137 | { |
| 135 | - return hweight32(w & 0xffff); | |
| 138 | + return __arch_hweight32(w & 0xffff); | |
| 136 | 139 | } |
| 137 | 140 | |
| 138 | -static inline unsigned int hweight8(unsigned int w) | |
| 141 | +static inline unsigned int __arch_hweight8(unsigned int w) | |
| 139 | 142 | { |
| 140 | - return hweight32(w & 0xff); | |
| 143 | + return __arch_hweight32(w & 0xff); | |
| 141 | 144 | } |
| 142 | 145 | |
| 143 | 146 | #endif /* _BLACKFIN_BITOPS_H */ |