From 30422924ee5b8fa40046fbc6725803e0d0f96cec Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Dec 2011 22:06:55 -0800
Subject: [PATCH] --- yaml --- r: 276623 b: refs/heads/master c:
 13c07b0286d340275f2d97adf085cecda37ede37 h: refs/heads/master i:   276621:
 3601c9dbe812ca5e1f80cc27ab8a1ec000c8857f   276619:
 ceb4f3806983711b5fe58028252cd48eab581e03   276615:
 5dc52cbf8653cc54199b59bfaa70f6e67603eb32   276607:
 53df5b3927dcf5b0d48598703961628512e46ef5 v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/log2.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

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)		\
  )