Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764104AbYFEXLp (ORCPT ); Thu, 5 Jun 2008 19:11:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1763245AbYFEXIi (ORCPT ); Thu, 5 Jun 2008 19:08:38 -0400 Received: from saeurebad.de ([85.214.36.134]:38651 "EHLO saeurebad.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763019AbYFEXIh (ORCPT ); Thu, 5 Jun 2008 19:08:37 -0400 X-Mailbox-Line: From hannes@saeurebad.de Fri Jun 6 00:57:21 2008 Message-Id: <20080605225721.235854722@saeurebad.de> References: <20080605224940.434439989@saeurebad.de> User-Agent: quilt/0.46-1 Date: Fri, 06 Jun 2008 00:49:52 +0200 From: Johannes Weiner To: Andrew Morton Cc: Ingo Molnar , Yinghai Lu , Andi Kleen , Yasunori Goto , linux-kernel@vger.kernel.org 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 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.1.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2022 Lines: 67 __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 @@ -610,6 +610,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 @@ -628,13 +641,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); } /** @@ -655,8 +662,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 from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/