diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:58:59 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:58:59 -0500 |
| commit | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (patch) | |
| tree | 73cd85e5529a01fa2338ab6d58b99c36dd666cbe /include/linux/bitops.h | |
| parent | ddef9bb367b19383df627e388cb4c01c86ddba6c (diff) | |
| parent | 0bdd340c092b0936f78a54bdbd3927463ed4fca3 (diff) | |
Merge branch 'master'
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 | ||