diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
| commit | 3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb (patch) | |
| tree | 7f8d84353852401ec74e005f6f0b1eb958b9a70d /include/linux/bitops.h | |
| parent | c0d3c0c0ce94d3db893577ae98e64414d92e49d8 (diff) | |
| parent | c03296a868ae7c91aa2d8b372184763b18f16d7a (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 | ||