summaryrefslogtreecommitdiffstats
path: root/drivers/iommu/Kconfig
diff options
context:
space:
mode:
authorChristoph Hellwig2018-07-05 21:29:55 +0200
committerChristoph Hellwig2018-07-05 21:32:06 +0200
commit7ec916f82c48dcfc115eee2e3e0e6d400e310fc5 (patch)
treee7a9ef9d6b6ab39fc0573d9ddf275fb6202839b1 /drivers/iommu/Kconfig
parentMerge tag 'acpi-4.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff)
downloadkernel-qcow2-linux-7ec916f82c48dcfc115eee2e3e0e6d400e310fc5.tar.gz
kernel-qcow2-linux-7ec916f82c48dcfc115eee2e3e0e6d400e310fc5.tar.xz
kernel-qcow2-linux-7ec916f82c48dcfc115eee2e3e0e6d400e310fc5.zip
Revert "iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()"
This commit may cause a less than required dma mask to be used for some allocations, which apparently leads to module load failures for iwlwifi sometimes. This reverts commit d657c5c73ca987214a6f9436e435b34fc60f332a. Signed-off-by: Christoph Hellwig <hch@lst.de> Reported-by: Fabio Coatti <fabio.coatti@gmail.com> Tested-by: Fabio Coatti <fabio.coatti@gmail.com>
Diffstat (limited to 'drivers/iommu/Kconfig')
-rw-r--r--drivers/iommu/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index e055d228bfb9..689ffe538370 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -142,7 +142,6 @@ config DMAR_TABLE
config INTEL_IOMMU
bool "Support for Intel IOMMU using DMA Remapping Devices"
depends on PCI_MSI && ACPI && (X86 || IA64_GENERIC)
- select DMA_DIRECT_OPS
select IOMMU_API
select IOMMU_IOVA
select NEED_DMA_MAP_STATE