From 9085d5e825136dc2085b84abf72c9bc205a4ac9b Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Thu, 10 Feb 2011 15:01:30 -0800
Subject: [PATCH] --- yaml --- r: 233142 b: refs/heads/master c:
 e6d2e2b2b1e1455df16d68a78f4a3874c7b3ad20 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/mm/memblock.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ed2091b69c26..fbd8154e7202 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de1f016f882e52facc3c8609599f827bcdd14af9
+refs/heads/master: e6d2e2b2b1e1455df16d68a78f4a3874c7b3ad20
diff --git a/trunk/mm/memblock.c b/trunk/mm/memblock.c
index bdba245d8afd..4618fda975a0 100644
--- a/trunk/mm/memblock.c
+++ b/trunk/mm/memblock.c
@@ -137,8 +137,6 @@ static phys_addr_t __init_memblock memblock_find_base(phys_addr_t size,
 
 	BUG_ON(0 == size);
 
-	size = memblock_align_up(size, align);
-
 	/* Pump up max_addr */
 	if (end == MEMBLOCK_ALLOC_ACCESSIBLE)
 		end = memblock.current_limit;