* [PATCH char-misc-testing 1/1] Revert "iommu: Allow iova to be used without requiring IOMMU_SUPPORT"
@ 2015-10-05 17:37 Sudeep Dutt
0 siblings, 0 replies; only message in thread
From: Sudeep Dutt @ 2015-10-05 17:37 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: linux-kernel, iommu, David Woodhouse, Sakari Ailus, joro,
Ashutosh Dixit, Nikhil Rao, Sudeep Dutt
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>
---
drivers/iommu/Kconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 @@ 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
--
1.8.2.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-10-05 17:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-05 17:37 [PATCH char-misc-testing 1/1] Revert "iommu: Allow iova to be used without requiring IOMMU_SUPPORT" Sudeep Dutt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).