From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751289AbbJERit (ORCPT ); Mon, 5 Oct 2015 13:38:49 -0400 Received: from mga09.intel.com ([134.134.136.24]:16304 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750892AbbJERis (ORCPT ); Mon, 5 Oct 2015 13:38:48 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,639,1437462000"; d="scan'208";a="804110540" From: Sudeep Dutt To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, David Woodhouse , Sakari Ailus , joro@8bytes.org, Ashutosh Dixit , Nikhil Rao , Sudeep Dutt Subject: [PATCH char-misc-testing 1/1] Revert "iommu: Allow iova to be used without requiring IOMMU_SUPPORT" Date: Mon, 5 Oct 2015 10:37:01 -0700 Message-Id: <6471c669038a1f1ad4b2342226290c453b052e6a.1444066190.git.sudeep.dutt@intel.com> X-Mailer: git-send-email 1.8.2.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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