Path: csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: zijun_hu Newsgroups: linux.kernel Subject: [PATCH 2/2] mm/bootmem.c: replace kzalloc() by kzalloc_node() Date: Mon, 29 Aug 2016 15:30:02 +0200 Message-ID: Domainkey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=to:cc:from:subject:message-id:date:user-agent:mime-version:content-type; b=bYmOO47yr2KkMYCPzmCFuvRSnSS5Xy+7+AtY1ENCxKwuU6uBCAz95QSno47yQmZK6u6uMpEWXse9 upSXU2isKItEyoLpJU+7gvcsXFO5d3TO5io+gacc5WgKcM2+e3Fm User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 64 Organization: linux.* mail to news gateway X-Original-Cc: linux-mm@kvack.org, "linux-kernel@vger.kernel.org" , zijun_hu@htc.com X-Original-Date: Mon, 29 Aug 2016 21:21:42 +0800 X-Original-Message-ID: <1f487f12-6af4-5e4f-a28c-1de2361cdcd8@zoho.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1471837 From: zijun_hu in ___alloc_bootmem_node_nopanic(), replace kzalloc() by kzalloc_node() in order to allocate memory within given node preferentially when slab is available Signed-off-by: zijun_hu --- mm/bootmem.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/mm/bootmem.c b/mm/bootmem.c index 0aa7dda52402..a869f84f44d3 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c @@ -11,15 +11,12 @@ #include #include #include -#include #include #include #include -#include #include #include - -#include +#include #include "internal.h" @@ -712,7 +709,7 @@ void * __init ___alloc_bootmem_node_nopanic(pg_data_t *pgdat, void *ptr; if (WARN_ON_ONCE(slab_is_available())) - return kzalloc(size, GFP_NOWAIT); + return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id); again: /* do not panic in alloc_bootmem_bdata() */ @@ -738,9 +735,6 @@ again: void * __init __alloc_bootmem_node_nopanic(pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal) { - if (WARN_ON_ONCE(slab_is_available())) - return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id); - return ___alloc_bootmem_node_nopanic(pgdat, size, align, goal, 0); } @@ -812,10 +806,6 @@ void * __init __alloc_bootmem_node_high(pg_data_t *pgdat, unsigned long size, } -#ifndef ARCH_LOW_ADDRESS_LIMIT -#define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL -#endif - /** * __alloc_bootmem_low - allocate low boot memory * @size: size of the request in bytes -- 1.9.1