diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2018-06-18 14:15:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-19 07:43:44 +0900 |
| commit | 6cc22dc08a247b7b4a173e4561e39705a557d300 (patch) | |
| tree | f853271c8221c1d9dd88b91be461c52c97ab380e /mm | |
| parent | 73c4b15eff163f633a86589c5baf071f41af26b1 (diff) | |
| download | op-kernel-dev-6cc22dc08a247b7b4a173e4561e39705a557d300.zip op-kernel-dev-6cc22dc08a247b7b4a173e4561e39705a557d300.tar.gz | |
revert "mm/memblock: add missing include <linux/bootmem.h>"
The patch fixed a W=1 warning but broke the 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
Because inlcude/linux/bootmem.h says
#if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM)
whereas mm/Makefile says
obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
So revert 26f09e9b3a06 ("mm/memblock: add missing include
<linux/bootmem.h>") while a full fix can be worked on.
Fixes: 26f09e9b3a06 ("mm/memblock: add missing include <linux/bootmem.h>")
Reported-by: Tony Luck <tony.luck@gmail.com>
Cc: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memblock.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index cc16d70..03d48d8 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -20,7 +20,6 @@ #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> |
