summaryrefslogtreecommitdiffstats
path: root/arch/arm64/mm
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-09-25 13:16:55 -0700
committerChristoph Hellwig <hch@lst.de>2018-09-25 15:12:26 -0700
commit1a0afc14b5da329765d6ecd4a79f546b9363ad8c (patch)
tree760667df33be493811fe60f7e1eb1b6190ed962a /arch/arm64/mm
parent9406a49fd1f4379409ed87b29fdaa259b0441912 (diff)
downloadblackbird-obmc-linux-1a0afc14b5da329765d6ecd4a79f546b9363ad8c.tar.gz
blackbird-obmc-linux-1a0afc14b5da329765d6ecd4a79f546b9363ad8c.zip
Revert "dma-mapping: clear dev->dma_ops in arch_teardown_dma_ops"
This reverts commit 46053c73685411915d3de50c5a0045beef32806b. This change breaks architectures setting up dma_ops in their own magic way and not using arch_setup_dma_ops, so revert it. Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'arch/arm64/mm')
-rw-r--r--arch/arm64/mm/dma-mapping.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index cdcb73db9ea2..072c51fb07d7 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -862,6 +862,11 @@ out_err:
dev_name(dev));
}
+void arch_teardown_dma_ops(struct device *dev)
+{
+ dev->dma_ops = NULL;
+}
+
#else
static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
OpenPOWER on IntegriCloud