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

[Tony Luck <tony.luck@gmail.com>]

On Wed, Jun 6, 2018 at 12:41 PM, Mathieu Malaterre <malat@debian.org> 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@debian.org>

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

-Tony