iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Sudeep Dutt 2015-10-05 10:37:01 -07:00 committed by Greg Kroah-Hartman
parent e93762bbf6
commit 1e1851f9d7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/iommu/Kconfig
View File

@ -12,9 +12,6 @@ menuconfig IOMMU_SUPPORT
remap DMA requests and/or remap interrupts from other devices on the remap DMA requests and/or remap interrupts from other devices on the
system. system.
config IOMMU_IOVA
tristate
if IOMMU_SUPPORT if IOMMU_SUPPORT
menu "Generic IOMMU Pagetable Support" menu "Generic IOMMU Pagetable Support"
@ -45,6 +42,9 @@ config IOMMU_IO_PGTABLE_LPAE_SELFTEST
endmenu endmenu
config IOMMU_IOVA
tristate
config OF_IOMMU config OF_IOMMU
def_bool y def_bool y
depends on OF && IOMMU_API depends on OF && IOMMU_API