diff --git a/[refs] b/[refs] index a8203bc29cc5..495142b266f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12870da5c3ace563902babdfa10d824fdbd4ce88 +refs/heads/master: 13c07b0286d340275f2d97adf085cecda37ede37 diff --git a/trunk/include/linux/log2.h b/trunk/include/linux/log2.h index 25b808631cd9..fd7ff3d91e6a 100644 --- a/trunk/include/linux/log2.h +++ b/trunk/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) \ )