Revert "iommu: Allow iova to be used without requiring IOMMU_SUPPORT"
Revert 'commit 353649e5da90 ("iommu: Allow iova to be used without
requiring IOMMU_SUPPORT"). This commit is made unnecessary by
'commit ac6d83ccd9c5 ("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: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 71d1c46..d9da766 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -12,9 +12,6 @@
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 @@
endmenu
+config IOMMU_IOVA
+ tristate
+
config OF_IOMMU
def_bool y
depends on OF && IOMMU_API