[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20181005161406.73ef8727@canb.auug.org.au>
Date: Fri, 5 Oct 2018 16:14:06 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>,
Michael Ellerman <mpe@...erman.id.au>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
PowerPC <linuxppc-dev@...ts.ozlabs.org>
Cc: Linux-Next Mailing List <linux-next@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Christophe Leroy <christophe.leroy@....fr>
Subject: linux-next: build failure after merge of the akpm tree
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.
I applied the following patch for today:
From: Stephen Rothwell <sfr@...b.auug.org.au>
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 <sfr@...b.auug.org.au>
---
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>
--
2.18.0
--
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists