Commit 9f1d62be authored by Chris Metcalf's avatar Chris Metcalf

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: default avatarChris Metcalf <cmetcalf@tilera.com>
parent acd1a19e
...@@ -77,6 +77,11 @@ static inline int ffs(int x) ...@@ -77,6 +77,11 @@ static inline int ffs(int x)
return __builtin_ffs(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 * fls - find last set bit in word
* @x: the word to search * @x: the word to search
...@@ -90,12 +95,7 @@ static inline int ffs(int x) ...@@ -90,12 +95,7 @@ static inline int ffs(int x)
*/ */
static inline int fls(int x) static inline int fls(int x)
{ {
return (sizeof(int) * 8) - __builtin_clz(x); return fls64((unsigned int) x);
}
static inline int fls64(__u64 w)
{
return (sizeof(__u64) * 8) - __builtin_clzll(w);
} }
static inline unsigned int __arch_hweight32(unsigned int w) static inline unsigned int __arch_hweight32(unsigned int w)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment