Merge tag 'dma-mapping-6.19-2025-12-10' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux

840b22ed · Linus Torvalds <[email protected]> · 2025-12-11 08:14:23 +09:00

Pull dma-mapping fixes from Marek Szyprowski:

 - last minute fix for missing parenthesis in recently merged code (Hans
   de Goede)

 - removal of excessive, non-fatal warnings (Dave Kleikamp)

* tag 'dma-mapping-6.19-2025-12-10' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux:
  dma-mapping: Fix DMA_BIT_MASK() macro being broken
  dma/pool: eliminate alloc_pages warning in atomic_pool_expand

Commit: 840b22edd5adf9dda46f4e701815eadce8f2f3eb
Parents: 5c179cac · 31b931be

Merge commit. Changes below are compared with the first parent: 5c179cac.

Changes

2 files changed · +2 −2

File	Status	Add	Del	Content
include/linux/dma-mapping.h	modified	+1	−1	View file
kernel/dma/pool.c	modified	+1	−1	View file

include/linux/dma-mapping.h

View file

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 2ceda49..aa36a0d 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -90,7 +90,7 @@
  */
 #define DMA_MAPPING_ERROR		(~(dma_addr_t)0)
 
-#define DMA_BIT_MASK(n)	GENMASK_ULL(n - 1, 0)
+#define DMA_BIT_MASK(n)	GENMASK_ULL((n) - 1, 0)
 
 struct dma_iova_state {
 	dma_addr_t addr;

kernel/dma/pool.c

View file

diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c
index ee45dee..26392ba 100644
--- a/kernel/dma/pool.c
+++ b/kernel/dma/pool.c
@@ -93,7 +93,7 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size,
 			page = dma_alloc_from_contiguous(NULL, 1 << order,
 							 order, false);
 		if (!page)
-			page = alloc_pages(gfp, order);
+			page = alloc_pages(gfp | __GFP_NOWARN, order);
 	} while (!page && order-- > 0);
 	if (!page)
 		goto out;