mm/memblock: add missing include <linux/bootmem.h>

Commit Message

Mathieu Malaterre June 6, 2018, 7:41 p.m. UTC

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 <[e-mail]>
---
 mm/memblock.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Tony Luck June 15, 2018, 6:59 p.m. UTC | #1

On Wed, Jun 6, 2018 at 12:41 PM, Mathieu Malaterre <[e-mail]> 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 <[e-mail]>

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

Patch

diff --git a/mm/memblock.c b/mm/memblock.c
index feb9185d391e..c5fb9c846890 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>