Messages in this thread | | | Date | Mon, 15 Oct 2018 18:14:45 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: build failure after merge of the akpm tree |
| |
Hi all,
On Mon, 8 Oct 2018 19:03:41 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > After merging the akpm tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > arch/x86/mm/kaslr.c:26:10: fatal error: linux/bootmem.h: No such file or directory > #include <linux/bootmem.h> > ^~~~~~~~~~~~~~~~~ > > Caused by patch > > "mm: remove include/linux/bootmem.h" > > interacting with commit > > 3a387c6d96e6 ("x86/kaslr, ACPI/NUMA: Fix KASLR build error") > > from the tip tree. > > I have added the following patch for today: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Mon, 8 Oct 2018 18:57:00 +1100 > Subject: [PATCH] x86/kaslr, ACPI/NUMA: fix for linux/bootmem.h removal > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > arch/x86/mm/kaslr.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c > index b3471388288d..ad80bdc690c1 100644 > --- a/arch/x86/mm/kaslr.c > +++ b/arch/x86/mm/kaslr.c > @@ -23,7 +23,7 @@ > #include <linux/kernel.h> > #include <linux/init.h> > #include <linux/random.h> > -#include <linux/bootmem.h> > +#include <linux/memblock.h> > > #include <asm/pgalloc.h> > #include <asm/pgtable.h> > --
So the above tip tree patch no longer exists, so this one is also no longer needed and I have removed it from the akpm tree today.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |