| Message ID | 20181005161406.73ef8727@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: build failure after merge of the akpm tree | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
| snowpatch_ozlabs/checkpatch | fail | Test checkpatch on branch next |
| snowpatch_ozlabs/build-ppc64le | fail | Test build-ppc64le on branch next |
| snowpatch_ozlabs/build-ppc64be | fail | Test build-ppc64be on branch next |
| snowpatch_ozlabs/build-ppc64e | fail | Test build-ppc64e on branch next |
| snowpatch_ozlabs/build-ppc32 | fail | Test build-ppc32 on branch next |
Stephen Rothwell <sfr@canb.auug.org.au> 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. > I applied the following patch for today: > > From: Stephen Rothwell <sfr@canb.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@canb.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> I could just apply that to my tree. memblock.h is where early_memtest() is actually defined anyway. cheers
Hi Michael, On Fri, 05 Oct 2018 22:02:45 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote: > > Ah fudge, what are the chances we add a new include of bootmem.h just as > Mike's removing bootmem. In my experience, it was almost certain ... almost every API removal conflicts with new added uses. :-) > I could just apply that to my tree. memblock.h is where early_memtest() is > actually defined anyway. However min_low_pfn and max_low_pfn are defined in bootmem.h until after it is removed.
Stephen Rothwell <sfr@canb.auug.org.au> writes: > Hi Michael, > > On Fri, 05 Oct 2018 22:02:45 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote: >> >> Ah fudge, what are the chances we add a new include of bootmem.h just as >> Mike's removing bootmem. > > In my experience, it was almost certain ... almost every API removal > conflicts with new added uses. :-) I suppose. Though the last time we added a new include of bootmem.h was 2015, and that should have actually been memblock.h. >> I could just apply that to my tree. memblock.h is where early_memtest() is >> actually defined anyway. > > However min_low_pfn and max_low_pfn are defined in bootmem.h until > after it is removed. OK. I guess I'll leave it for Andrew to squash in to the series. cheers
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>
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@canb.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@canb.auug.org.au> --- arch/powerpc/kernel/setup-common.c | 1 - 1 file changed, 1 deletion(-)