diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-03 10:31:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-03 10:31:00 -0700 |
| commit | 63d12cc30574eec9241932cefa17a21df3afd8d0 (patch) | |
| tree | b2e02d9586a86b9e94812b8c1936f77a777bf703 /kernel/dma/mapping.c | |
| parent | 5dee87215b2c539e7b82704d56f610a4e558b9cc (diff) | |
| parent | 4fe87e818ea492ade079cc01a31d088e445f8539 (diff) | |
| download | linux-63d12cc30574eec9241932cefa17a21df3afd8d0.tar.bz2 | |
Merge tag 'dma-mapping-5.18-1' of git://git.infradead.org/users/hch/dma-mapping
Pull more dma-mapping updates from Christoph Hellwig:
- fix a regression in dma remap handling vs AMD memory encryption (me)
- finally kill off the legacy PCI DMA API (Christophe JAILLET)
* tag 'dma-mapping-5.18-1' of git://git.infradead.org/users/hch/dma-mapping:
dma-mapping: move pgprot_decrypted out of dma_pgprot
PCI/doc: cleanup references to the legacy PCI DMA API
PCI: Remove the deprecated "pci-dma-compat.h" API
Diffstat (limited to 'kernel/dma/mapping.c')
| -rw-r--r-- | kernel/dma/mapping.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index 559461a826ba..db7244291b74 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -407,8 +407,6 @@ EXPORT_SYMBOL(dma_get_sgtable_attrs); */ pgprot_t dma_pgprot(struct device *dev, pgprot_t prot, unsigned long attrs) { - if (force_dma_unencrypted(dev)) - prot = pgprot_decrypted(prot); if (dev_is_dma_coherent(dev)) return prot; #ifdef CONFIG_ARCH_HAS_DMA_WRITE_COMBINE |