diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-17 21:45:05 +0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-17 21:45:05 +0300 |
commit | 056c1722014104b70d36fe71b683f71637f1a708 (patch) | |
tree | 8236ab2e3f32d9dd2f82ca6045a6f82bd1b0d1e9 /include/linux/log2.h | |
parent | 8366f0d268c20929d82d4b1407bd4c6f9232bdec (diff) | |
parent | 5925fa68fe8244651b3f78a88c4af99190a88f0d (diff) | |
download | linux-056c1722014104b70d36fe71b683f71637f1a708.tar.xz |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'include/linux/log2.h')
-rw-r--r-- | include/linux/log2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/log2.h b/include/linux/log2.h index 83a4a3ca3e8a..c619ec6eff4a 100644 --- a/include/linux/log2.h +++ b/include/linux/log2.h @@ -173,7 +173,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) #define roundup_pow_of_two(n) \ ( \ __builtin_constant_p(n) ? ( \ - (n == 1) ? 1 : \ + ((n) == 1) ? 1 : \ (1UL << (ilog2((n) - 1) + 1)) \ ) : \ __roundup_pow_of_two(n) \ |