summaryrefslogtreecommitdiffstats
path: root/arch/tile/include/asm/bitops.h
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2012-05-25 12:32:09 -0400
committerChris Metcalf <cmetcalf@tilera.com>2012-05-25 15:00:43 -0400
commit9f1d62bed7f015d11b9164078b7fea433b474114 (patch)
tree951254ba2d3ed4fef376351c4ed68b06be3b928d /arch/tile/include/asm/bitops.h
parentacd1a19e002790dd127b3ff86f95a4d269e7f1d0 (diff)
tile: fix bug where fls(0) was not returning 0
This is because __builtin_clz(0) returns 64 for the "undefined" case of 0, since the builtin just does a right-shift 32 and "clz" instruction. So, use the alpha approach of casting to u32 and using __builtin_clzll(). Cc: stable@vger.kernel.org Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile/include/asm/bitops.h')
-rw-r--r--arch/tile/include/asm/bitops.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/tile/include/asm/bitops.h b/arch/tile/include/asm/bitops.h
index 16f1fa51fea..bd186c4eaa5 100644
--- a/arch/tile/include/asm/bitops.h
+++ b/arch/tile/include/asm/bitops.h
@@ -77,6 +77,11 @@ static inline int ffs(int x)
return __builtin_ffs(x);
}
+static inline int fls64(__u64 w)
+{
+ return (sizeof(__u64) * 8) - __builtin_clzll(w);
+}
+
/**
* fls - find last set bit in word
* @x: the word to search
@@ -90,12 +95,7 @@ static inline int ffs(int x)
*/
static inline int fls(int x)
{
- return (sizeof(int) * 8) - __builtin_clz(x);
-}
-
-static inline int fls64(__u64 w)
-{
- return (sizeof(__u64) * 8) - __builtin_clzll(w);
+ return fls64((unsigned int) x);
}
static inline unsigned int __arch_hweight32(unsigned int w)