diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-08-29 02:04:14 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-08-29 02:04:14 +0300 |
| commit | 4d28e280981337360b20ac9812bf0eab9224d5a3 (patch) | |
| tree | 6b7356ffb2d3e83a26e7b1177853ad84f33429df /include/linux | |
| parent | 5b9f3b013b33e73c6f8f2bbdc6b3fd87745b40af (diff) | |
| parent | 89a2d212bdb4bc29bed8e7077abe054b801137ea (diff) | |
| download | linux-4d28e280981337360b20ac9812bf0eab9224d5a3.tar.xz | |
Merge tag 'dma-mapping-6.17-2025-08-28' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux
Pull dma-mapping fixes from Marek Szyprowski:
- another small fix for arm64 systems with memory encryption (Shanker
Donthineni)
- fix for arm32 systems with non-standard CMA configuration (Oreoluwa
Babatunde)
* tag 'dma-mapping-6.17-2025-08-28' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux:
dma/pool: Ensure DMA_DIRECT_REMAP allocations are decrypted
of: reserved_mem: Restructure call site for dma_contiguous_early_fixup()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dma-map-ops.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h index f48e5fb88bd5..332b80c42b6f 100644 --- a/include/linux/dma-map-ops.h +++ b/include/linux/dma-map-ops.h @@ -153,6 +153,9 @@ static inline void dma_free_contiguous(struct device *dev, struct page *page, { __free_pages(page, get_order(size)); } +static inline void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) +{ +} #endif /* CONFIG_DMA_CMA*/ #ifdef CONFIG_DMA_DECLARE_COHERENT |