Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 -2
+1 -1
include/linux/dma-mapping.h
··· 90 90 */ 91 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 95 struct dma_iova_state { 96 96 dma_addr_t addr;
+1 -1
kernel/dma/pool.c
··· 93 93 page = dma_alloc_from_contiguous(NULL, 1 << order, 94 94 order, false); 95 95 if (!page) 96 - page = alloc_pages(gfp, order); 96 + page = alloc_pages(gfp | __GFP_NOWARN, order); 97 97 } while (!page && order-- > 0); 98 98 if (!page) 99 99 goto out;