From patchwork Mon Sep 2 11:40:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1156603 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46MSq91QRZz9s7T for ; Mon, 2 Sep 2019 21:41:57 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="i+i/DkaB"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 46MSq86x5PzDqgB for ; Mon, 2 Sep 2019 21:41:56 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 46MSnB1QjNzDqXv for ; Mon, 2 Sep 2019 21:40:14 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="i+i/DkaB"; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 46MSn91xDnz9sDQ; Mon, 2 Sep 2019 21:40:13 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1567424413; bh=YtBEn8N30LNig4IjM3QSpseznRYqbL0O14mcZ15x0/k=; h=Date:From:To:Cc:Subject:From; b=i+i/DkaBxJ+/ummk7mmRsfrU3c9NMQt9egwJ/BygIxh0SfgsClGY+6CunnOiC+h8g fNd5EHxk5z8WX/6vGKvPP54x7V/W+00P3HVeL/40SBIVp7YVvmawIfp6LnQ/ieOPYz IZuw2UneUmNoVJnJCgh6hqX5ZTyVeP09nJh6OJiGKanwCwl1idAcBFqCkwpWWasIAZ g+w7f6caXiKRxPXiUM7o7Hz0KjIPEhB9taoGDuG5W2CvAnGZA4+ATMdqXbTF1NPFQa BpNe3yEWZhrNV27QTLCv+KKPAyWKqaGUtTUHUFbT06hgKXleOcO/BDSAAx2A2AaE62 NFfJGPo9J6X3w== Date: Mon, 2 Sep 2019 21:40:11 +1000 From: Stephen Rothwell To: Michael Ellerman , PowerPC Subject: linux-next: build failure after merge of the powerpc tree Message-ID: <20190902214011.2a5400c9@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Simek , Linux Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 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 --- arch/microblaze/mm/consistent.c | 6 ------ arch/powerpc/mm/dma-noncoherent.c | 6 ------ 2 files changed, 12 deletions(-) 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);