From mboxrd@z Thu Jan 1 00:00:00 1970 Message-Id: <20080530194739.627414261@saeurebad.de> References: <20080530194220.286976884@saeurebad.de> Date: Fri, 30 May 2008 21:42:32 +0200 From: Johannes Weiner Subject: [PATCH -mm 12/14] bootmem: Make __alloc_bootmem_low_node fall back to other nodes Content-Disposition: inline; filename=bootmem-make__alloc_bootmem_low_node-fall-back-to-other-nodes.patch Sender: owner-linux-mm@kvack.org Return-Path: To: Andrew Morton Cc: Ingo Molnar , Yinghai Lu , Andi Kleen , linux-kernel@vger.kernel.org, linux-mm@kvack.org List-ID: __alloc_bootmem_node already does this, make the interface consistent. Signed-off-by: Johannes Weiner CC: Ingo Molnar CC: Yinghai Lu CC: Andi Kleen --- mm/bootmem.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) --- a/mm/bootmem.c +++ b/mm/bootmem.c @@ -595,6 +595,19 @@ void * __init __alloc_bootmem_low(unsign return ___alloc_bootmem(size, align, goal, ARCH_LOW_ADDRESS_LIMIT); } +static void * __init ___alloc_bootmem_node(bootmem_data_t *bdata, + unsigned long size, unsigned long align, + unsigned long goal, unsigned long limit) +{ + void *ptr; + + ptr = alloc_bootmem_core(bdata, size, align, goal, limit); + if (ptr) + return ptr; + + return ___alloc_bootmem(size, align, goal, limit); +} + /** * __alloc_bootmem_node - allocate boot memory from a specific node * @pgdat: node to allocate from @@ -613,13 +626,7 @@ void * __init __alloc_bootmem_low(unsign void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal) { - void *ptr; - - ptr = alloc_bootmem_core(pgdat->bdata, size, align, goal, 0); - if (ptr) - return ptr; - - return __alloc_bootmem(size, align, goal); + return ___alloc_bootmem_node(pgdat->bdata, size, align, goal, 0); } /** @@ -640,8 +647,8 @@ void * __init __alloc_bootmem_node(pg_da void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal) { - return alloc_bootmem_core(pgdat->bdata, size, align, goal, - ARCH_LOW_ADDRESS_LIMIT); + return ___alloc_bootmem_node(pgdat->bdata, size, align, + goal, ARCH_LOW_ADDRESS_LIMIT); } #ifdef CONFIG_SPARSEMEM -- -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org