Received-SPF: pass (google.com: domain of linux-kernel+bounces-172770-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Wed, 8 May 2024 08:51:02 +0200
From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoph Hellwig <hch@lst.de>,
	Alexander Lobakin <aleksander.lobakin@intel.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the dma-mapping tree
Message-ID: <20240508065102.GC10736@lst.de>
References: <20240508091631.1ec34a25@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240508091631.1ec34a25@canb.auug.org.au>
User-Agent: Mutt/1.5.17 (2007-11-01)

On Wed, May 08, 2024 at 09:16:31AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the dma-mapping tree, today's linux-next build (x86_64
> allmodconfig) failed like this:

Thanks.  I'll fold in the patch below to drop two consts for now.
Alexander, if you want to pass the consts through we'll also need to
modify page_pool_get_dma_addr, which looks doable.  If you want that,
please send an incremental patch.

diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index 8836aaaf23855f..4f9d1bd7f4d187 100644
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@ -399,7 +399,7 @@ static struct page *__page_pool_get_cached(struct page_pool *pool)
 }
 
 static void __page_pool_dma_sync_for_device(const struct page_pool *pool,
-					    const struct page *page,
+					    struct page *page,
 					    u32 dma_sync_size)
 {
 #if defined(CONFIG_HAS_DMA) && defined(CONFIG_DMA_NEED_SYNC)
@@ -413,7 +413,7 @@ static void __page_pool_dma_sync_for_device(const struct page_pool *pool,
 
 static __always_inline void
 page_pool_dma_sync_for_device(const struct page_pool *pool,
-			      const struct page *page,
+			      struct page *page,
 			      u32 dma_sync_size)
 {
 	if (pool->dma_sync && dma_dev_need_sync(pool->p.dev))