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

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

Linus Torvalds committed 11 months ago

Commit 840b22e2 parents 5c179ca 31b931b2 files · +2 −2Browse files

Unified · Split

2 files

include/linux/dma-mapping.h +1 −1
kernel/dma/pool.c +1 −1

include/linux/dma-mapping.h+1−1

@@ -90,7 +90,7 @@ · 89 unmodified lines
90	*/	90	*/
91	#define DMA_MAPPING_ERROR (~(dma_addr_t)0)	91	#define DMA_MAPPING_ERROR (~(dma_addr_t)0)
92		92
93	#define DMA_BIT_MASK(n) GENMASK_ULL(n - 1, 0)	93	#define DMA_BIT_MASK(n) GENMASK_ULL((n) - 1, 0)
94		94
95	struct dma_iova_state {	95	struct dma_iova_state {
96	dma_addr_t addr;	96	dma_addr_t addr;

kernel/dma/pool.c+1−1

@@ -93,7 +93,7 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size, · 92 unmodified lines
93	page = dma_alloc_from_contiguous(NULL, 1 << order,	93	page = dma_alloc_from_contiguous(NULL, 1 << order,
94	order, false);	94	order, false);
95	if (!page)	95	if (!page)
96	page = alloc_pages(gfp, order);	96	page = alloc_pages(gfp \| __GFP_NOWARN, order);
97	} while (!page && order-- > 0);	97	} while (!page && order-- > 0);
98	if (!page)	98	if (!page)
99	goto out;	99	goto out;