From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 42L6422MQXzF3LK for ; Thu, 27 Sep 2018 04:32:18 +1000 (AEST) Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w8QIT8Qu008539 for ; Wed, 26 Sep 2018 14:32:15 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0b-001b2d01.pphosted.com with ESMTP id 2mre6nuynb-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 26 Sep 2018 14:32:15 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 26 Sep 2018 19:32:12 +0100 Date: Wed, 26 Sep 2018 21:31:53 +0300 From: Mike Rapoport 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 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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: Message-Id: <20180926183152.GA4597@rapoport-lnx> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 -- Sincerely yours, Mike.