---

yaml --- r: 331479 b: refs/heads/master c: 7ac68a4 h: refs/heads/master i: 331477: dc0666c 331475: 29a2992 331471: ead6460 v: v3
git-mirror · Aug 12, 2012 · 7c17280 · 7c17280
1 parent 9f6d198
commit 7c17280
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b7cc3df955cf510a0d4174553fe0410f9fbdd4a
+refs/heads/master: 7ac68a4c1de6aac5b0bb231fe6d8505ebe5686d9
diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c
@@ -324,7 +324,7 @@ phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align)
 
 	BUG_ON(!arm_memblock_steal_permitted);
 
-	phys = memblock_alloc(size, align);
+	phys = memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ANYWHERE);
 	memblock_free(phys, size);
 	memblock_remove(phys, size);