projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dma-mapping-5.18-1' of git://git.infradead.org/users/hch/dma-mapping
[linux-2.6-microblaze.git]
/
kernel
/
dma
/
mapping.c
diff --git
a/kernel/dma/mapping.c
b/kernel/dma/mapping.c
index
559461a
..
db72442
100644
(file)
--- 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