Commit 1e1851f9 authored by Sudeep Dutt's avatar Sudeep Dutt Committed by Greg Kroah-Hartman

Revert "iommu: Allow iova to be used without requiring IOMMU_SUPPORT"

Revert 'commit 353649e5 ("iommu: Allow iova to be used without
requiring IOMMU_SUPPORT"). This commit is made unnecessary by
'commit ac6d83cc ("misc: mic: Fix SCIF build failure with
IOMMU_SUPPORT disabled") and will create a conflict upon merging
with 4.3-rc4. The correct long term solution is to move the iova
library from drivers/iommu into lib/iova which will be done in
a future patch.

Cc: David Woodhouse <David.Woodhouse@intel.com>
Reviewed-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: default avatarSudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e93762bb
......@@ -12,9 +12,6 @@ menuconfig IOMMU_SUPPORT
remap DMA requests and/or remap interrupts from other devices on the
system.
config IOMMU_IOVA
tristate
if IOMMU_SUPPORT
menu "Generic IOMMU Pagetable Support"
......@@ -45,6 +42,9 @@ config IOMMU_IO_PGTABLE_LPAE_SELFTEST
endmenu
config IOMMU_IOVA
tristate
config OF_IOMMU
def_bool y
depends on OF && IOMMU_API
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment