From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by kanga.kvack.org (Postfix) with ESMTP id CF8526B0010 for ; Mon, 25 Jun 2018 14:07:20 -0400 (EDT) Received: by mail-ed1-f70.google.com with SMTP id g22-v6so1669397eds.22 for ; Mon, 25 Jun 2018 11:07:20 -0700 (PDT) Received: from mx2.suse.de (mx2.suse.de. [195.135.220.15]) by mx.google.com with ESMTPS id z19-v6si1630837edb.71.2018.06.25.11.07.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Jun 2018 11:07:19 -0700 (PDT) Date: Mon, 25 Jun 2018 20:07:17 +0200 From: Michal Hocko Subject: Re: [PATCH v2] mm/memblock: add missing include Message-ID: <20180625180717.GS28965@dhcp22.suse.cz> References: <20180622210542.2025-1-malat@debian.org> <20180625171513.31845-1-malat@debian.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180625171513.31845-1-malat@debian.org> Sender: owner-linux-mm@kvack.org List-ID: To: Mathieu Malaterre Cc: Andrew Morton , Tony Luck , Pavel Tatashin , Daniel Jordan , Steven Sistare , Daniel Vacek , Stefan Agner , Joe Perches , Andy Shevchenko , linux-mm@kvack.org, linux-kernel@vger.kernel.org On Mon 25-06-18 19:15:12, Mathieu Malaterre wrote: > Commit 26f09e9b3a06 ("mm/memblock: add memblock memory allocation apis") > introduced two new function definitions: > > memblock_virt_alloc_try_nid_nopanic() > memblock_virt_alloc_try_nid() > > Commit ea1f5f3712af ("mm: define memblock_virt_alloc_try_nid_raw") > introduced the following function definition: > > memblock_virt_alloc_try_nid_raw() > > This commit adds an include of header file to provide > the missing function prototypes. Silence the following gcc warning > (W=1): > > mm/memblock.c:1334:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_raw' [-Wmissing-prototypes] > mm/memblock.c:1371:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_nopanic' [-Wmissing-prototypes] > mm/memblock.c:1407:15: warning: no previous prototype for `memblock_virt_alloc_try_nid' [-Wmissing-prototypes] > > It also adds #ifdef blockers to prevent compilation failure on mips/ia64 > where CONFIG_NO_BOOTMEM=n. Because Makefile already does: > > obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o > > The #ifdef has been simplified from: > > #if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM) > > to simply: > > #if defined(CONFIG_NO_BOOTMEM) Well, I would apreciate an explanation why do we need NO_BOOTMEM guard in the first place rather than why HAVE_MEMBLOCK is not needed. > Suggested-by: Tony Luck > Suggested-by: Michal Hocko > Signed-off-by: Mathieu Malaterre Anyway this looks better. I wish we can actually get rid of bootmem allocator which would simplify this as well but that is another topic. Acked-by: Michal Hocko > --- > v2: Simplify #ifdef > > mm/memblock.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/mm/memblock.c b/mm/memblock.c > index 03d48d8835ba..611a970ac902 100644 > --- a/mm/memblock.c > +++ b/mm/memblock.c > @@ -20,6 +20,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -1224,6 +1225,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i > return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE); > } > > +#if defined(CONFIG_NO_BOOTMEM) > /** > * memblock_virt_alloc_internal - allocate boot memory block > * @size: size of memory block to be allocated in bytes > @@ -1431,6 +1433,7 @@ void * __init memblock_virt_alloc_try_nid( > (u64)max_addr); > return NULL; > } > +#endif > > /** > * __memblock_free_early - free boot memory block > -- > 2.11.0 > -- Michal Hocko SUSE Labs