From: Andrei Warkentin Date: Thu, 8 Dec 2011 04:41:56 +0000 (+1100) Subject: include/log2.h: fix rounddown_pow_of_two(1) X-Git-Tag: next-20111209~3^2~123 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=48eaa157e415b63ca0f6169b529b04a16d620d39;p=karo-tx-linux.git include/log2.h: fix rounddown_pow_of_two(1) 1 is a power of two, therefore rounddown_pow_of_two(1) should return 1. It does in case the argument is a variable but in case it's a constant it behaves wrong and returns 0. Probably nobody ever did it so this was never noticed, however net/drivers/vmxnet3 with latest GCC does and breaks on unicpu systems. This is similar to Rolf's patch to roundup_pow_of_two(1). Cc: Rolf Eike Beer Reviewed-by: Jesper Juhl Signed-off-by: Andrei Warkentin Signed-off-by: Andrew Morton --- diff --git a/include/linux/log2.h b/include/linux/log2.h index 25b808631cd9..ccda848411c8 100644 --- a/include/linux/log2.h +++ b/include/linux/log2.h @@ -185,7 +185,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) #define rounddown_pow_of_two(n) \ ( \ __builtin_constant_p(n) ? ( \ - (n == 1) ? 0 : \ + (n == 1) ? 1 : \ (1UL << ilog2(n))) : \ __rounddown_pow_of_two(n) \ )