summaryrefslogtreecommitdiffstats
path: root/include/linux/bitops.h
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-03-25 03:08:01 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 08:22:58 -0800
commit962749af67b145c57917bfbff3c303ebd7d5988c (patch)
treece454f8a1cb0beb89c875a11d31426a4b44ca0ba /include/linux/bitops.h
parent231bed205879236357171e50bd8965e70797ecdc (diff)
[PATCH] roundup_pow_of_two() 64-bit fix
fls() takes an integer, so roundup_pow_of_two() is busted for ulongs larger than 2^32-1. Fix this by implementing and using fls_long(). (Why does roundup_pow_of_two() return a long?) (Why is roundup_pow_of_two() __attribute_const__ whereas long_log2() is __attribute_pure__?) (Why does long_log2() suck so much? Because we were missing fls_long()?) Cc: Roland Dreier <rdreier@cisco.com> Cc: "Chen, Kenneth W" <kenneth.w.chen@intel.com> Cc: John Hawkes <hawkes@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/bitops.h')
-rw-r--r--include/linux/bitops.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 208650b1ad3..f17525a963d 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -175,4 +175,11 @@ static inline __u32 ror32(__u32 word, unsigned int shift)
return (word >> shift) | (word << (32 - shift));
}
+static inline unsigned fls_long(unsigned long l)
+{
+ if (sizeof(l) == 4)
+ return fls(l);
+ return fls64(l);
+}
+
#endif