From efcbe9bba09d398a9e2ed0cdcc4951ea118424a1 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 6 Jul 2010 15:39:18 -0700
Subject: [PATCH] --- yaml --- r: 212710 b: refs/heads/master c:
 918fe8d60331f679519ab8239a7232272126da9e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 33770737de90..d61e913b826c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d1e24928e6a0728d1c7c76818ccbd11b93e7ac9
+refs/heads/master: 918fe8d60331f679519ab8239a7232272126da9e
diff --git a/trunk/mm/memblock.c b/trunk/mm/memblock.c
index 1802d97c7284..9de5fcdf8e28 100644
--- a/trunk/mm/memblock.c
+++ b/trunk/mm/memblock.c
@@ -546,7 +546,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i
 
 	if (res)
 		return res;
-	return memblock_alloc(size, align);
+	return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ANYWHERE);
 }