Re: [PATCH] mm/memblock: add missing include <linux/bootmem.h>

[Andrew Morton]

On Fri, 15 Jun 2018 11:59:10 -0700 Tony Luck <tony.luck@xxxxxxxxx> wrote:

> On Wed, Jun 6, 2018 at 12:41 PM, Mathieu Malaterre <malat@xxxxxxxxxx> wrote:
> > Commit 26f09e9b3a06 ("mm/memblock: add memblock memory allocation apis")
> > introduced two new function definitions:
> >   âmemblock_virt_alloc_try_nid_nopanicâ
> > and
> >   âmemblock_virt_alloc_try_nidâ.
> > Commit ea1f5f3712af ("mm: define memblock_virt_alloc_try_nid_raw")
> > introduced the following function definition:
> >   âmemblock_virt_alloc_try_nid_rawâ
> >
> > This commit adds an includeof header file <linux/bootmem.h> to provide the
> > missing function prototypes. Silence the following gcc warning (W=1):
> >
> >   mm/memblock.c:1334:15: warning: no previous prototype for âmemblock_virt_alloc_try_nid_rawâ [-Wmissing-prototypes]
> >   mm/memblock.c:1371:15: warning: no previous prototype for âmemblock_virt_alloc_try_nid_nopanicâ [-Wmissing-prototypes]
> >   mm/memblock.c:1407:15: warning: no previous prototype for âmemblock_virt_alloc_try_nidâ [-Wmissing-prototypes]
> >
> > Signed-off-by: Mathieu Malaterre <malat@xxxxxxxxxx>
> 
> Sadly that breaks ia64 build:
> 
>   CC      mm/memblock.o
> mm/memblock.c:1340: error: redefinition of âmemblock_virt_alloc_try_nid_rawâ
> ./include/linux/bootmem.h:335: error: previous definition of
> âmemblock_virt_alloc_try_nid_rawâ was here
> mm/memblock.c:1377: error: redefinition of âmemblock_virt_alloc_try_nid_nopanicâ
> ./include/linux/bootmem.h:343: error: previous definition of
> âmemblock_virt_alloc_try_nid_nopanicâ was here
> mm/memblock.c:1413: error: redefinition of âmemblock_virt_alloc_try_nidâ
> ./include/linux/bootmem.h:327: error: previous definition of
> âmemblock_virt_alloc_try_nidâ was here
> make[1]: *** [mm/memblock.o] Error 1
> make: *** [mm/memblock.o] Error 2

Huh.  How did that ever work.  I guess it's either this:

--- a/mm/Makefile~a
+++ a/mm/Makefile
@@ -45,6 +45,7 @@ obj-y += init-mm.o
 
 ifdef CONFIG_NO_BOOTMEM
 	obj-y		+= nobootmem.o
+	obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
 else
 	obj-y		+= bootmem.o
 endif
@@ -53,7 +54,6 @@ obj-$(CONFIG_ADVISE_SYSCALLS)	+= fadvise
 ifdef CONFIG_MMU
 	obj-$(CONFIG_ADVISE_SYSCALLS)	+= madvise.o
 endif
-obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
 
 obj-$(CONFIG_SWAP)	+= page_io.o swap_state.o swapfile.o swap_slots.o
 obj-$(CONFIG_FRONTSWAP)	+= frontswap.o


or this:

--- a/include/linux/bootmem.h~a
+++ a/include/linux/bootmem.h
@@ -154,7 +154,7 @@ extern void *__alloc_bootmem_low_node(pg
 	__alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)
 
 
-#if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM)
+#if defined(CONFIG_HAVE_MEMBLOCK)
 
 /* FIXME: use MEMBLOCK_ALLOC_* variants here */
 #define BOOTMEM_ALLOC_ACCESSIBLE	0


and I'm not sure which.  I think I'll just revert $subject for now.