superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dma-mapping fixes for Linux 6.19: 

- last minute fix for missing parenthesis in the recently merged code
 (Hans de Goede) and removal of the excessive, non-fatal warnings (Dave
 Kleikamp)
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQSrngzkoBtlA8uaaJ+Jp1EFxbsSRAUCaTmllwAKCRCJp1EFxbsS
 RNDxAQCZJ9/D9nJ+hbC2oVPyoenmhSfMqc9ZniiR8/z8UqBfqgEAsWWayVyJXiwp
 aIWXvW6lnUGzgNZ64ZKeNWvKK3uJOgg=
 =9lhd
 -----END PGP SIGNATURE-----

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
pull/1354/merge
Linus Torvalds 2025-12-11 08:14:23 +09:00
parent 5c179cac05 31b931bebd
commit 840b22edd5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/dma-mapping.h
View File

@ -90,7 +90,7 @@
*/ */
#define DMA_MAPPING_ERROR (~(dma_addr_t)0) #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 { struct dma_iova_state {
dma_addr_t addr; dma_addr_t addr;

2
kernel/dma/pool.c
View File

@ -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, page = dma_alloc_from_contiguous(NULL, 1 << order,
order, false); order, false);
if (!page) if (!page)
page = alloc_pages(gfp, order); page = alloc_pages(gfp | __GFP_NOWARN, order);
} while (!page && order-- > 0); } while (!page && order-- > 0);
if (!page) if (!page)
goto out; goto out;