From 1067a8241a585470f35d737ca1343352ec9ae047 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Mon, 4 Oct 2010 14:57:39 -0700
Subject: [PATCH] --- yaml --- r: 212743 b: refs/heads/master c:
 f1af98c7629a1b76fd7336decbc776acdeed2120 h: refs/heads/master i:   212741:
 f8b3e800a11916a1671ff5d573813f8f3648970f   212739:
 f540b5fb1f7d278dd0c9e875a5b1a9d635f00c97   212735:
 2a49a0350bff4f52c683dd55aede41a3843159e5 v: v3

---
 [refs]              | 2 +-
 trunk/mm/memblock.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2938a821dab2..763b2a10e0c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d931264af0f10649b35afa8fbd2e169da51ac08
+refs/heads/master: f1af98c7629a1b76fd7336decbc776acdeed2120
diff --git a/trunk/mm/memblock.c b/trunk/mm/memblock.c
index d5d63ac1fd83..9ad39690a2bd 100644
--- a/trunk/mm/memblock.c
+++ b/trunk/mm/memblock.c
@@ -105,13 +105,18 @@ static phys_addr_t __init memblock_find_region(phys_addr_t start, phys_addr_t en
 	phys_addr_t base, res_base;
 	long j;
 
+	/* In case, huge size is requested */
+	if (end < size)
+		return MEMBLOCK_ERROR;
+
+	base = memblock_align_down((end - size), align);
+
 	/* Prevent allocations returning 0 as it's also used to
 	 * indicate an allocation failure
 	 */
 	if (start == 0)
 		start = PAGE_SIZE;
 
-	base = memblock_align_down((end - size), align);
 	while (start <= base) {
 		j = memblock_overlaps_region(&memblock.reserved, base, size);
 		if (j < 0)