Skip to content

Commit 840b22e

Browse files
committed
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
2 parents 5c179ca + 31b931b commit 840b22e

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

include/linux/dma-mapping.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
*/
9191
#define DMA_MAPPING_ERROR (~(dma_addr_t)0)
9292

93-
#define DMA_BIT_MASK(n) GENMASK_ULL(n - 1, 0)
93+
#define DMA_BIT_MASK(n) GENMASK_ULL((n) - 1, 0)
9494

9595
struct dma_iova_state {
9696
dma_addr_t addr;

kernel/dma/pool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size,
9393
page = dma_alloc_from_contiguous(NULL, 1 << order,
9494
order, false);
9595
if (!page)
96-
page = alloc_pages(gfp, order);
96+
page = alloc_pages(gfp | __GFP_NOWARN, order);
9797
} while (!page && order-- > 0);
9898
if (!page)
9999
goto out;

0 commit comments

Comments
 (0)