On Tue, Jun 26, 2018 at 11:44 AM, Mathieu Malaterre <malat@xxxxxxxxxx> wrote: > Because Makefile already does: > > obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o > > The #ifdef has been simplified from: > > #if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM) > > to simply: > > #if defined(CONFIG_NO_BOOTMEM) Is this sitting in a queue somewhere ready to go to Linus? I don't see it upstream yet. > > Suggested-by: Tony Luck <tony.luck@xxxxxxxxx> > Suggested-by: Michal Hocko <mhocko@xxxxxxxxxx> > Acked-by: Michal Hocko <mhocko@xxxxxxxx> > Signed-off-by: Mathieu Malaterre <malat@xxxxxxxxxx> > --- > v3: Add missing reference to commit 6cc22dc08a24 > v2: Simplify #ifdef > > mm/memblock.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/mm/memblock.c b/mm/memblock.c > index 03d48d8835ba..611a970ac902 100644 > --- a/mm/memblock.c > +++ b/mm/memblock.c > @@ -20,6 +20,7 @@ > #include <linux/kmemleak.h> > #include <linux/seq_file.h> > #include <linux/memblock.h> > +#include <linux/bootmem.h> > > #include <asm/sections.h> > #include <linux/io.h> > @@ -1224,6 +1225,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_NO_BOOTMEM) > /** > * memblock_virt_alloc_internal - allocate boot memory block > * @size: size of memory block to be allocated in bytes > @@ -1431,6 +1433,7 @@ void * __init memblock_virt_alloc_try_nid( > (u64)max_addr); > return NULL; > } > +#endif > > /** > * __memblock_free_early - free boot memory block > -- > 2.11.0 >
