diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /include/linux/bitops.h | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'include/linux/bitops.h')
| -rw-r--r-- | include/linux/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 6a2a19f14bb2..208650b1ad3a 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h | |||
| @@ -81,7 +81,7 @@ static inline int generic_fls64(__u64 x) | |||
| 81 | { | 81 | { |
| 82 | __u32 h = x >> 32; | 82 | __u32 h = x >> 32; |
| 83 | if (h) | 83 | if (h) |
| 84 | return fls(x) + 32; | 84 | return fls(h) + 32; |
| 85 | return fls(x); | 85 | return fls(x); |
| 86 | } | 86 | } |
| 87 | 87 | ||