Re: linux-next: build failure after merge of the akpm tree
From: Michael Ellerman <mpe@ellerman.id.au>
Date: 2018-10-05 12:02:49
Also in:
linux-next, lkml
Stephen Rothwell [off-list ref] writes:
Hi Andrew,
After merging the akpm tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
arch/powerpc/kernel/setup-common.c:36:10: fatal error: linux/bootmem.h: No such file or directory
#include <linux/bootmem.h>
^~~~~~~~~~~~~~~~~
Caused by commit
49353a51a758 ("mm: remove include/linux/bootmem.h")
interacting with commit
d90fe2acd9b2 ("powerpc: Wire up memtest")
from the powerpc tree.Ah fudge, what are the chances we add a new include of bootmem.h just as Mike's removing bootmem.
quoted hunk ↗ jump to hunk
I applied the following patch for today: From: Stephen Rothwell <redacted> Date: Fri, 5 Oct 2018 16:09:34 +1000 Subject: [PATCH] powerpc: fix up for removal of linux/bootmem.h Signed-off-by: Stephen Rothwell <redacted> --- arch/powerpc/kernel/setup-common.c | 1 - 1 file changed, 1 deletion(-)diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 2b56d1f30387..93ee3703b42f 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c@@ -33,7 +33,6 @@ #include <linux/serial_8250.h> #include <linux/percpu.h> #include <linux/memblock.h> -#include <linux/bootmem.h> #include <linux/of_platform.h> #include <linux/hugetlb.h> #include <asm/debugfs.h>
I could just apply that to my tree. memblock.h is where early_memtest() is actually defined anyway. cheers