[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAKgT0UcC-GTtyPK9ynvj6r3YFqy8kE40iMJxzPowbNoXGf9iWg@mail.gmail.com>
Date: Wed, 26 Sep 2018 17:34:32 -0700
From: Alexander Duyck <alexander.duyck@...il.com>
To: rppt@...ux.vnet.ibm.com
Cc: linux-mm <linux-mm@...ck.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Catalin Marinas <catalin.marinas@....com>, chris@...kel.net,
David Miller <davem@...emloft.net>,
Geert Uytterhoeven <geert@...ux-m68k.org>, green.hu@...il.com,
Greg KH <gregkh@...uxfoundation.org>, gxt@....edu.cn,
Ingo Molnar <mingo@...hat.com>, jejb@...isc-linux.org,
jonas@...thpole.se, Jonathan Corbet <corbet@....net>,
lftan@...era.com, msalter@...hat.com,
Martin Schwidefsky <schwidefsky@...ibm.com>,
mattst88@...il.com, mpe@...erman.id.au,
Michal Hocko <mhocko@...e.com>, monstr@...str.eu,
palmer@...ive.com, paul.burton@...s.com, rkuo@...eaurora.org,
richard@....at, dalias@...c.org,
Russell King - ARM Linux <linux@...linux.org.uk>,
fancer.lancer@...il.com, Thomas Gleixner <tglx@...utronix.de>,
Tony Luck <tony.luck@...el.com>, vgupta@...opsys.com,
Yoshinori Sato <ysato@...rs.sourceforge.jp>,
linux-alpha@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-c6x-dev@...ux-c6x.org, linux-hexagon@...r.kernel.org,
linux-ia64@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
linux-m68k@...ts.linux-m68k.org, linux-mips@...ux-mips.org,
linux-parisc@...r.kernel.org,
"open list:LINUX FOR POWERPC (32-BIT AND 64-BIT)"
<linuxppc-dev@...ts.ozlabs.org>, linux-riscv@...ts.infradead.org,
linux-s390@...r.kernel.org, linux-sh@...r.kernel.org,
linux-snps-arc@...ts.infradead.org, linux-um@...ts.infradead.org,
nios2-dev@...ts.rocketboards.org, openrisc@...ts.librecores.org,
sparclinux@...r.kernel.org, uclinux-h8-devel@...ts.sourceforge.jp
Subject: Re: [PATCH 03/30] mm: remove CONFIG_HAVE_MEMBLOCK
On Wed, Sep 26, 2018 at 11:32 AM Mike Rapoport <rppt@...ux.vnet.ibm.com> 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 <rppt@...ux.vnet.ibm.com> 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 <rppt@...ux.vnet.ibm.com>
> >
> > <snip>
> >
> > > 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.
- Alex
Powered by blists - more mailing lists