Commit 1e1851f9 authored Oct 05, 2015 by Sudeep Dutt Committed by Greg Kroah-Hartman Oct 06, 2015

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: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent e93762bb

drivers/iommu/Kconfig

+3 −3

Original line number	Diff line number	Diff line
		@@ -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