From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Rapoport Date: Wed, 26 Sep 2018 21:31:53 +0300 Subject: [OpenRISC] [PATCH 03/30] mm: remove CONFIG_HAVE_MEMBLOCK In-Reply-To: References: <1536927045-23536-1-git-send-email-rppt@linux.vnet.ibm.com> <1536927045-23536-4-git-send-email-rppt@linux.vnet.ibm.com> Message-ID: <20180926183152.GA4597@rapoport-lnx> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: openrisc@lists.librecores.org 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.