diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2019-02-11 09:17:23 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2019-02-11 09:17:23 +0100 |
commit | e65372124cd749ebbe4ac2abe5a511d7d1ac68db (patch) | |
tree | 1f9fd7cec6ffba19c76fff1e82c562fa1adae5da /lib/int_sqrt.c | |
parent | a3240f09307ac978270d423b542f229e2ccc07b8 (diff) | |
parent | d13937116f1e82bf508a6325111b322c30c85eb9 (diff) | |
download | linux-e65372124cd749ebbe4ac2abe5a511d7d1ac68db.tar.gz |
Merge tag 'v5.0-rc6' into devel
Linux 5.0-rc6
Diffstat (limited to 'lib/int_sqrt.c')
-rw-r--r-- | lib/int_sqrt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/int_sqrt.c b/lib/int_sqrt.c index 14436f4ca6bd..30e0f9770f88 100644 --- a/lib/int_sqrt.c +++ b/lib/int_sqrt.c @@ -52,7 +52,7 @@ u32 int_sqrt64(u64 x) if (x <= ULONG_MAX) return int_sqrt((unsigned long) x); - m = 1ULL << (fls64(x) & ~1ULL); + m = 1ULL << ((fls64(x) - 1) & ~1ULL); while (m != 0) { b = y + m; y >>= 1; |