Commit 19373672 authored by Mathieu Malaterre's avatar Mathieu Malaterre Committed by Linus Torvalds

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

Commit 26f09e9b ("mm/memblock: add memblock memory allocation apis")
introduced two new function definitions:


and commit ea1f5f37 ("mm: define memblock_virt_alloc_try_nid_raw")
introduced the following function definition:


This commit adds an include of header file <linux/bootmem.h> to provide
the missing function prototypes.  This silences the following gcc warning

  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]

Also adds #ifdef blockers to prevent compilation failure on mips/ia64
where CONFIG_NO_BOOTMEM=n as could be seen in commit commit 6cc22dc0
("revert "mm/memblock: add missing include <linux/bootmem.h>"").

Because Makefile already does:

  obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o

The #ifdef has been simplified from:


to simply:

  #if defined(CONFIG_NO_BOOTMEM)

Link: default avatarMathieu Malaterre <>
Suggested-by: default avatarTony Luck <>
Suggested-by: default avatarMichal Hocko <>
Acked-by: default avatarMichal Hocko <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 28c20cc7
......@@ -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>
......@@ -1225,6 +1226,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
......@@ -1432,6 +1434,7 @@ void * __init memblock_virt_alloc_try_nid(
return NULL;
* __memblock_free_early - free boot memory block
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment