lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 5 Oct 2015 10:37:01 -0700 From: Sudeep Dutt <sudeep.dutt@...el.com> To: Greg Kroah-Hartman <gregkh@...uxfoundation.org> Cc: linux-kernel@...r.kernel.org, iommu@...ts.linux-foundation.org, David Woodhouse <david.woodhouse@...el.com>, Sakari Ailus <sakari.ailus@...ux.intel.com>, joro@...tes.org, Ashutosh Dixit <ashutosh.dixit@...el.com>, Nikhil Rao <nikhil.rao@...el.com>, Sudeep Dutt <sudeep.dutt@...el.com> Subject: [PATCH char-misc-testing 1/1] 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@...el.com> Reviewed-by: Ashutosh Dixit <ashutosh.dixit@...el.com> Signed-off-by: Sudeep Dutt <sudeep.dutt@...el.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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists