diff --git a/[refs] b/[refs]
index d898977bd259..189d646f29b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18963c01b8abf381f102752ce024c3582a716125
+refs/heads/master: 1a06a52ee1b0cdb65222474ba6186f3991df68b0
diff --git a/trunk/include/linux/log2.h b/trunk/include/linux/log2.h
index 57e641e19a81..1b8a2c1cb0e3 100644
--- a/trunk/include/linux/log2.h
+++ b/trunk/include/linux/log2.h
@@ -159,7 +159,7 @@ unsigned long __roundup_pow_of_two(unsigned long n)
 #define roundup_pow_of_two(n)			\
 (						\
 	__builtin_constant_p(n) ? (		\
-		(n == 1) ? 0 :			\
+		(n == 1) ? 1 :			\
 		(1UL << (ilog2((n) - 1) + 1))	\
 				   ) :		\
 	__roundup_pow_of_two(n)			\