---

yaml --- r: 212743 b: refs/heads/master c: f1af98c h: refs/heads/master i: 212741: f8b3e80 212739: f540b5f 212735: 2a49a03 v: v3
git-mirror · Oct 6, 2010 · 1067a82 · 1067a82
1 parent 650e994
commit 1067a82
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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)