Skip to content

Commit

Permalink
revert "mm/memblock: add missing include <linux/bootmem.h>"
Browse files Browse the repository at this point in the history 
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 26f09e9 ("mm/memblock: add missing include
<linux/bootmem.h>") while a full fix can be worked on.

Fixes: 26f09e9 ("mm/memblock: add missing include <linux/bootmem.h>")
Reported-by: Tony Luck <[email protected]>
Cc: Mathieu Malaterre <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
@akpm00 @torvalds
akpm00 authored and torvalds committed Jun 18, 2018
1 parent 73c4b15 commit 6cc22dc
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion mm/memblock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 6cc22dc

Please sign in to comment.