diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2025-09-12 00:04:09 +0200 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2025-09-12 00:04:09 +0200 |
| commit | b9a62320d83863c40973d548dcd379cd6390da20 (patch) | |
| tree | 5ba51bf79bf9d5bdc5b2ae8165e214f80bf74141 /kernel/dma/pool.c | |
| parent | swiotlb: Remove redundant __GFP_NOWARN (diff) | |
| parent | dma-debug: don't enforce dma mapping check on noncoherent allocations (diff) | |
| download | linux-b9a62320d83863c40973d548dcd379cd6390da20.tar.gz linux-b9a62320d83863c40973d548dcd379cd6390da20.zip | |
Merge tag 'dma-mapping-6.17-2025-09-09' into HEAD
dma-mapping fix for Linux 6.17
- one more fix for DMA API debugging infrastructure (Baochen Qiang)
Diffstat (limited to 'kernel/dma/pool.c')
| -rw-r--r-- | kernel/dma/pool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c index 7b04f7575796..ee45dee33d49 100644 --- a/kernel/dma/pool.c +++ b/kernel/dma/pool.c @@ -102,8 +102,8 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size, #ifdef CONFIG_DMA_DIRECT_REMAP addr = dma_common_contiguous_remap(page, pool_size, - pgprot_dmacoherent(PAGE_KERNEL), - __builtin_return_address(0)); + pgprot_decrypted(pgprot_dmacoherent(PAGE_KERNEL)), + __builtin_return_address(0)); if (!addr) goto free_page; #else |