From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22FE7C43144 for ; Mon, 25 Jun 2018 14:26:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA4FC25B5E for ; Mon, 25 Jun 2018 14:26:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA4FC25B5E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934356AbeFYO0j (ORCPT ); Mon, 25 Jun 2018 10:26:39 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:41052 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934317AbeFYO0i (ORCPT ); Mon, 25 Jun 2018 10:26:38 -0400 Received: by mail-oi0-f65.google.com with SMTP id 21-v6so1996207oip.8 for ; Mon, 25 Jun 2018 07:26:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=q+74MtXgcTFlOsStp4rBTYitomZc4tvyFx54gWFpxkw=; b=pt7ziJXPEL5+5tAVcMZ0e9oY8ITYIcvjYUckOpEgBANdHLwO6GxngHUiRSGIrakHyI Puh/ca7g400oz9AMxgUGaEMGdEx2pWyZiWTlN4QkKsNeVEsw0EoRHgwbTx8z/DhydHCg 0wcbSRtKMrXJ8E2AllXUix0+jDIqJJ0jfmHkEsQQztuqQ1BLmwTMDqV+TlwRwBXdGVf2 9UtDFNGi1+ZjDwIH9rLr3mNv2ABtffI4c7YXMs4xVtbwuQq/0Ks1Al5nWArRAiDZKggm ukrc+Dtr91gajWLDM1dqZWqQRRsCK4zr5J2HYZ0fotxpznOtOIZnIAYrT4keko73ZOKx S2gQ== X-Gm-Message-State: APt69E3l6xJ1MsynwqObhXKOB17Tpy5prPLmvS8pLCEQTJu91PLEUBGA D/iJOrGWuLSQ3UYhBifQA0VRbetV6EzCPIfDRBM= X-Google-Smtp-Source: ADUXVKLtnAakgKAJUNwQHZem+5rJiEd/IcEJUZdnqUsLPVIxu4OXhvmThmfOwUZxiORlCTEA5vMJGrr0kevdwwdUp8w= X-Received: by 2002:aca:45d5:: with SMTP id s204-v6mr6649982oia.289.1529936797912; Mon, 25 Jun 2018 07:26:37 -0700 (PDT) MIME-Version: 1.0 References: <20180622210542.2025-1-malat@debian.org> <20180625140346.GM28965@dhcp22.suse.cz> In-Reply-To: <20180625140346.GM28965@dhcp22.suse.cz> From: Mathieu Malaterre Date: Mon, 25 Jun 2018 16:26:24 +0200 Message-ID: Subject: Re: [PATCH] mm/memblock: add missing include and #ifdef To: Michal Hocko Cc: Andrew Morton , Tony Luck , Pavel Tatashin , Daniel Jordan , Steven Sistare , Daniel Vacek , Stefan Agner , Joe Perches , Andy Shevchenko , linux-mm@kvack.org, LKML Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 25, 2018 at 4:03 PM Michal Hocko wrote: > > On Fri 22-06-18 23:05:41, 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] > > > > As seen in commit 6cc22dc08a24 ("revert "mm/memblock: add missing include > > "") #ifdef blockers were missing which lead to compilation > > failure on mips/ia64 where CONFIG_NO_BOOTMEM=n. > > > > Suggested-by: Tony Luck > > Signed-off-by: Mathieu Malaterre > > I was not aware of -Wmissing-prototypes (not tested) sparse would report something like: symbol 'memblock_virt_alloc_try_nid_raw' was not declared. Should it be static? > > --- > > mm/memblock.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/mm/memblock.c b/mm/memblock.c > > index 4c98672bc3e2..f4b6766d7907 100644 > > --- a/mm/memblock.c > > +++ b/mm/memblock.c > > @@ -20,6 +20,7 @@ > > #include > > #include > > #include > > +#include > > > > #include > > #include > > @@ -1226,6 +1227,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_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM) > > Why do you need CONFIG_HAVE_MEMBLOCK dependency? > mm/Makefile says > obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o > > so we even do not compile this code for !HAVE_MEMBLOCK AFAICS. Right, that can be simplified. I took it directly from Tony. I originally found it more readable since it matched sentinels used for the prototypes in $ grep -B 7 memblock_virt_alloc_try_nid_raw include/linux/bootmem.h | head -1 #if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM) I'll send a v2 shortly. > > /** > > * memblock_virt_alloc_internal - allocate boot memory block > > * @size: size of memory block to be allocated in bytes > > @@ -1433,6 +1435,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