diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-12-18 10:35:16 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-12-18 10:35:16 +0100 |
commit | 6e5ed276374c329b93a968d640f4d26c8c05411b (patch) | |
tree | 3b0d42269f0f52ea7764511de3a58b01d12bcb23 /include/linux/log2.h | |
parent | d79a8869d8a4b565b12a88faeff834b09a36368c (diff) | |
parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) |
Merge commit 'v3.2-rc6' into x86/platform
Diffstat (limited to 'include/linux/log2.h')
-rw-r--r-- | include/linux/log2.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/log2.h b/include/linux/log2.h index 25b808631cd..fd7ff3d91e6 100644 --- a/include/linux/log2.h +++ b/include/linux/log2.h @@ -185,7 +185,6 @@ unsigned long __rounddown_pow_of_two(unsigned long n) #define rounddown_pow_of_two(n) \ ( \ __builtin_constant_p(n) ? ( \ - (n == 1) ? 0 : \ (1UL << ilog2(n))) : \ __rounddown_pow_of_two(n) \ ) |