Messages in this thread Patch in this message | | | From | Yinghai Lu <> | Subject | [PATCH 25/49] memblock: Make memblock_alloc_try_nid() fallback to MEMBLOCK_ALLOC_ANYWHERE | Date | Tue, 6 Jul 2010 15:39:18 -0700 |
| |
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
memblock_alloc_nid() used to fallback to allocating anywhere by using memblock_alloc() as a fallback.
However, some of my previous patches limit memblock_alloc() to the region covered by MEMBLOCK_ALLOC_ACCESSIBLE which is not quite what we want for memblock_alloc_try_nid().
So we fix it by explicitely using MEMBLOCK_ALLOC_ANYWHERE.
Not that so far only sparc uses memblock_alloc_nid() and it hasn't been updated to clamp the accessible zone yet. Thus the temporary "breakage" should have no effect.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- mm/memblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/mm/memblock.c b/mm/memblock.c index 4e3e9ff..00f62a2 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -537,7 +537,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); } -- 1.6.4.2
| |