From 1e1851f9d725ff9f00d74dfc4b73d47cba57466f Mon Sep 17 00:00:00 2001 From: Sudeep Dutt Date: Mon, 5 Oct 2015 10:37:01 -0700 Subject: [PATCH] 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 Reviewed-by: Ashutosh Dixit Signed-off-by: Sudeep Dutt Signed-off-by: Greg Kroah-Hartman --- drivers/iommu/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 71d1c46f4a2b..d9da766719c8 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -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