Pull sn-handle-sc-powerdown into release branch

[linux-2.6-omap-h63xx.git] / include / linux / bitops.h

diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 6a2a19f14bb26bb3f4f49815b566c2a4e8353cab..208650b1ad3ac08a340d93e87729890d807a3bdb 100644 (file)
--- 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);
 }