diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-06 22:47:26 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-06 22:47:26 +0300 |
| commit | e2b745f469ec0f3165ba5ffaee3ce40f98d77878 (patch) | |
| tree | ca56c662b62f81f425512a6fcd8024a1eb63b272 /Documentation | |
| parent | 12133258d7fe309b42a35677549c606b15a0822d (diff) | |
| parent | 8270f3a11ceef64bdb0ab141180e8d2f17c619ec (diff) | |
| download | linux-e2b745f469ec0f3165ba5ffaee3ce40f98d77878.tar.xz | |
Merge tag 'dma-mapping-4.21-1' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fixes from Christoph Hellwig:
"Fix various regressions introduced in this cycles:
- fix dma-debug tracking for the map_page / map_single
consolidatation
- properly stub out DMA mapping symbols for !HAS_DMA builds to avoid
link failures
- fix AMD Gart direct mappings
- setup the dma address for no kernel mappings using the remap
allocator"
* tag 'dma-mapping-4.21-1' of git://git.infradead.org/users/hch/dma-mapping:
dma-direct: fix DMA_ATTR_NO_KERNEL_MAPPING for remapped allocations
x86/amd_gart: fix unmapping of non-GART mappings
dma-mapping: remove a few unused exports
dma-mapping: properly stub out the DMA API for !CONFIG_HAS_DMA
dma-mapping: remove dmam_{declare,release}_coherent_memory
dma-mapping: implement dmam_alloc_coherent using dmam_alloc_attrs
dma-mapping: implement dma_map_single_attrs using dma_map_page_attrs
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/driver-model/devres.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt index 841c99529d27..b277cafce71e 100644 --- a/Documentation/driver-model/devres.txt +++ b/Documentation/driver-model/devres.txt @@ -250,7 +250,6 @@ DMA dmaenginem_async_device_register() dmam_alloc_coherent() dmam_alloc_attrs() - dmam_declare_coherent_memory() dmam_free_coherent() dmam_pool_create() dmam_pool_destroy() |