From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) by kanga.kvack.org (Postfix) with ESMTP id 636468E0001 for ; Thu, 27 Sep 2018 00:50:43 -0400 (EDT) Received: by mail-oi1-f198.google.com with SMTP id t3-v6so197359oif.20 for ; Wed, 26 Sep 2018 21:50:43 -0700 (PDT) Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com. [148.163.158.5]) by mx.google.com with ESMTPS id t10-v6si441679oth.341.2018.09.26.21.50.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Sep 2018 21:50:42 -0700 (PDT) Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w8R4nKVj018615 for ; Thu, 27 Sep 2018 00:50:41 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0b-001b2d01.pphosted.com with ESMTP id 2mrr1411au-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Sep 2018 00:50:41 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 27 Sep 2018 05:50:38 +0100 Date: Thu, 27 Sep 2018 07:50:20 +0300 From: Mike Rapoport Subject: Re: [PATCH 03/30] mm: remove CONFIG_HAVE_MEMBLOCK References: <1536927045-23536-1-git-send-email-rppt@linux.vnet.ibm.com> <1536927045-23536-4-git-send-email-rppt@linux.vnet.ibm.com> <20180926183152.GA4597@rapoport-lnx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Message-Id: <20180927045019.GA16740@rapoport-lnx> Sender: owner-linux-mm@kvack.org List-ID: To: Alexander Duyck Cc: linux-mm , Andrew Morton , Catalin Marinas , chris@zankel.net, David Miller , Geert Uytterhoeven , green.hu@gmail.com, Greg KH , gxt@pku.edu.cn, Ingo Molnar , jejb@parisc-linux.org, jonas@southpole.se, Jonathan Corbet , lftan@altera.com, msalter@redhat.com, Martin Schwidefsky , mattst88@gmail.com, mpe@ellerman.id.au, Michal Hocko , monstr@monstr.eu, palmer@sifive.com, paul.burton@mips.com, rkuo@codeaurora.org, richard@nod.at, dalias@libc.org, Russell King - ARM Linux , fancer.lancer@gmail.com, Thomas Gleixner , Tony Luck , vgupta@synopsys.com, Yoshinori Sato , linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, LKML , linux-m68k@lists.linux-m68k.org, linux-mips@linux-mips.org, linux-parisc@vger.kernel.org, "open list:LINUX FOR POWERPC (32-BIT AND 64-BIT)" , linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-um@lists.infradead.org, nios2-dev@lists.rocketboards.org, openrisc@lists.librecores.org, sparclinux@vger.kernel.org, uclinux-h8-devel@lists.sourceforge.jp On Wed, Sep 26, 2018 at 05:34:32PM -0700, Alexander Duyck wrote: > On Wed, Sep 26, 2018 at 11:32 AM Mike Rapoport wrote: > > > > On Wed, Sep 26, 2018 at 09:58:41AM -0700, Alexander Duyck wrote: > > > On Fri, Sep 14, 2018 at 5:11 AM Mike Rapoport wrote: > > > > > > > > All architecures use memblock for early memory management. There is no need > > > > for the CONFIG_HAVE_MEMBLOCK configuration option. > > > > > > > > Signed-off-by: Mike Rapoport > > > > > > > > > > > > > diff --git a/include/linux/memblock.h b/include/linux/memblock.h > > > > index 5169205..4ae91fc 100644 > > > > --- a/include/linux/memblock.h > > > > +++ b/include/linux/memblock.h > > > > @@ -2,7 +2,6 @@ > > > > #define _LINUX_MEMBLOCK_H > > > > #ifdef __KERNEL__ > > > > > > > > -#ifdef CONFIG_HAVE_MEMBLOCK > > > > /* > > > > * Logical memory blocks. > > > > * > > > > @@ -460,7 +459,6 @@ static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t align) > > > > { > > > > return 0; > > > > } > > > > -#endif /* CONFIG_HAVE_MEMBLOCK */ > > > > > > > > #endif /* __KERNEL__ */ > > > > > > There was an #else above this section and I believe it and the code > > > after it needs to be stripped as well. > > > > Right, I've already sent the fix [1] and it's in mmots. > > > > [1] https://lkml.org/lkml/2018/9/19/416 > > > > Are you sure? The patch you reference appears to be for > drivers/of/fdt.c, and the bit I pointed out here is in > include/linux/memblock.h. Ah, sorry. You are right, will fix. Thanks for spotting it! > - Alex > -- Sincerely yours, Mike.