diff options
| author | Sudeep Dutt <sudeep.dutt@intel.com> | 2015-10-05 10:37:01 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-06 09:23:14 +0100 |
| commit | 1e1851f9d725ff9f00d74dfc4b73d47cba57466f (patch) | |
| tree | 27a185b68bb4f1c8041334d288e6feab5a5736f0 /drivers | |
| parent | e93762bbf68143594223024532fdeef71f5e8f75 (diff) | |
| download | linux-1e1851f9d725ff9f00d74dfc4b73d47cba57466f.tar.bz2 | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iommu/Kconfig | 6 |
1 files 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 |