aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAkinobu Mita <mita@miraclelinux.com>2006-02-03 03:03:46 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 08:32:00 -0800
commitf434baf4c6ae4a392b7c34843825af0894c89db2 (patch)
tree1b2773fde539d62d3a19ba11ac5828d3fb20340d /include/linux
parentc9ab8b68e2abb1eff7ac0f8d118a8765130b967d (diff)
[PATCH] fix generic_fls64()
Noticed by Rune Torgersen. Fix generic_fls64(). tcp_cubic is using fls64(). Signed-off-by: Akinobu Mita <mita@miraclelinux.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/bitops.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 6a2a19f14bb..208650b1ad3 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -81,7 +81,7 @@ static inline int generic_fls64(__u64 x)
{
__u32 h = x >> 32;
if (h)
- return fls(x) + 32;
+ return fls(h) + 32;
return fls(x);
}