Commit 840b22ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-6.19-2025-12-10' of... 

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
parents 5c179cac 31b931be

include/linux/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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;