| Message ID | 20190902214011.2a5400c9@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: build failure after merge of the powerpc tree | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch next (c317052c95bef1f977b023158e5aa929215f443d) |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
On Mon, Sep 02, 2019 at 09:40:11PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the powerpc tree, today's linux-next build (powerpc > ppc44x_defconfig) failed like this: Yes, this conflict is expected and we dicussed it before. I'll make sure Linus is in the loop when sending the pull request.
diff --git a/arch/microblaze/mm/consistent.c b/arch/microblaze/mm/consistent.c index 0e0f733eb846..8c5f0c332d8b 100644 --- a/arch/microblaze/mm/consistent.c +++ b/arch/microblaze/mm/consistent.c @@ -56,10 +56,4 @@ void *cached_kernel_address(void *ptr) return (void *)(addr & ~UNCACHED_SHADOW_MASK); } -#else /* CONFIG_MMU */ -static int __init atomic_pool_init(void) -{ - return dma_atomic_pool_init(GFP_KERNEL, pgprot_noncached(PAGE_KERNEL)); -} -postcore_initcall(atomic_pool_init); #endif /* CONFIG_MMU */ diff --git a/arch/powerpc/mm/dma-noncoherent.c b/arch/powerpc/mm/dma-noncoherent.c index 4272ca5e8159..2a82984356f8 100644 --- a/arch/powerpc/mm/dma-noncoherent.c +++ b/arch/powerpc/mm/dma-noncoherent.c @@ -122,9 +122,3 @@ void arch_dma_prep_coherent(struct page *page, size_t size) flush_dcache_range(kaddr, kaddr + size); } - -static int __init atomic_pool_init(void) -{ - return dma_atomic_pool_init(GFP_KERNEL, pgprot_noncached(PAGE_KERNEL)); -} -postcore_initcall(atomic_pool_init);
Hi all, After merging the powerpc tree, today's linux-next build (powerpc ppc44x_defconfig) failed like this: arch/powerpc/mm/dma-noncoherent.c: In function 'atomic_pool_init': arch/powerpc/mm/dma-noncoherent.c:128:9: error: implicit declaration of function 'dma_atomic_pool_init'; did you mean 'atomic_pool_init'? [-Werror=implicit-function-declaration] 128 | return dma_atomic_pool_init(GFP_KERNEL, pgprot_noncached(PAGE_KERNEL)); | ^~~~~~~~~~~~~~~~~~~~ | atomic_pool_init Caused by commit f2902a2fb40c ("powerpc: use the generic dma coherent remap allocator") interacting with commit 8e3a68fb55e0 ("dma-mapping: make dma_atomic_pool_init self-contained") from the dma-mapping tree. I have applied the following patch for today (I did the microblaze update as well): From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 2 Sep 2019 21:23:11 +1000 Subject: [PATCH] merge fixes for "dma-mapping: make dma_atomic_pool_init self-contained" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/microblaze/mm/consistent.c | 6 ------ arch/powerpc/mm/dma-noncoherent.c | 6 ------ 2 files changed, 12 deletions(-)