| commit | 0f672f6c0b52b7b0700b0915c72b540721af4465 | [log] [tgz] |
|---|---|---|
| author | David Brazdil <dbrazdil@google.com> | Tue Dec 10 10:32:29 2019 +0000 |
| committer | David Brazdil <dbrazdil@google.com> | Tue Dec 10 19:03:18 2019 +0000 |
| tree | 85c8cba019caa205e4f8920d72d93f6d6deaf29c | |
| parent | 3a0ad55d848b50499b68d7141d4eca997fce28ef [diff] |
Update Linux to v5.4.2 Change-Id: Idf6911045d9d382da2cfe01b1edff026404ac8fd
diff --git a/include/asm-generic/bitops/builtin-fls.h b/include/asm-generic/bitops/builtin-fls.h index 62daf94..c8455cc 100644 --- a/include/asm-generic/bitops/builtin-fls.h +++ b/include/asm-generic/bitops/builtin-fls.h
@@ -9,7 +9,7 @@ * This is defined the same way as ffs. * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. */ -static __always_inline int fls(int x) +static __always_inline int fls(unsigned int x) { return x ? sizeof(x) * 8 - __builtin_clz(x) : 0; }
diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h index 753aeca..b168bb1 100644 --- a/include/asm-generic/bitops/fls.h +++ b/include/asm-generic/bitops/fls.h
@@ -10,7 +10,7 @@ * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. */ -static __always_inline int fls(int x) +static __always_inline int fls(unsigned int x) { int r = 32;