Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939372AbYCSV4y (ORCPT ); Wed, 19 Mar 2008 17:56:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759503AbYCSUWo (ORCPT ); Wed, 19 Mar 2008 16:22:44 -0400 Received: from gir.skynet.ie ([193.1.99.77]:59729 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932661AbYCSUWn (ORCPT ); Wed, 19 Mar 2008 16:22:43 -0400 Date: Tue, 18 Mar 2008 15:54:14 +0000 From: Mel Gorman To: Andi Kleen Cc: linux-kernel@vger.kernel.org, pj@sgi.com, linux-mm@kvack.org, nickpiggin@yahoo.com.au Subject: Re: [PATCH] [8/18] Add a __alloc_bootmem_node_nopanic Message-ID: <20080318155414.GH23866@csn.ul.ie> References: <20080317258.659191058@firstfloor.org> <20080317015821.F18431B41E0@basil.firstfloor.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <20080317015821.F18431B41E0@basil.firstfloor.org> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2435 Lines: 72 On (17/03/08 02:58), Andi Kleen didst pronounce: > Straight forward variant of the existing __alloc_bootmem_node, only > Signed-off-by: Andi Kleen > > difference is that it doesn't panic on failure Seems to be a bit of cut&paste jumbling there. > > Signed-off-by: Andi Kleen > --- > include/linux/bootmem.h | 4 ++++ > mm/bootmem.c | 12 ++++++++++++ > 2 files changed, 16 insertions(+) > > Index: linux/mm/bootmem.c > =================================================================== > --- linux.orig/mm/bootmem.c > +++ linux/mm/bootmem.c > @@ -471,6 +471,18 @@ void * __init __alloc_bootmem_node(pg_da > return __alloc_bootmem(size, align, goal); > } > > +void * __init __alloc_bootmem_node_nopanic(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_nopanic(size, align, goal); > +} Straight-forward. Mildly irritating that there are multiple variants that only differ by whether they panic on allocation failure or not. Probably should be a seperate removal of duplicated code there but outside the scope of this patch. > + > #ifndef ARCH_LOW_ADDRESS_LIMIT > #define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL > #endif > Index: linux/include/linux/bootmem.h > =================================================================== > --- linux.orig/include/linux/bootmem.h > +++ linux/include/linux/bootmem.h > @@ -90,6 +90,10 @@ extern void *__alloc_bootmem_node(pg_dat > unsigned long size, > unsigned long align, > unsigned long goal); > +extern void *__alloc_bootmem_node_nopanic(pg_data_t *pgdat, > + unsigned long size, > + unsigned long align, > + unsigned long goal); > extern unsigned long init_bootmem_node(pg_data_t *pgdat, > unsigned long freepfn, > unsigned long startpfn, > Acked-by: Mel Gorman -- Mel Gorman Part-time Phd Student Linux Technology Center University of Limerick IBM Dublin Software Lab -- 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/