summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2008-11-26 17:25:13 +0100
committerJoerg Roedel <joerg.roedel@amd.com>2009-01-03 14:10:09 +0100
commit1aaf118352b85bb359ce28070bcc478f659a7031 (patch)
tree101fe9b227c81576d735fedbf4533ce60343ad29
parentfc2100eb4d0960b56c2c705a97941c08fb1c0fd4 (diff)
downloadlinux-1aaf118352b85bb359ce28070bcc478f659a7031.tar.gz
linux-1aaf118352b85bb359ce28070bcc478f659a7031.tar.bz2
linux-1aaf118352b85bb359ce28070bcc478f659a7031.zip
select IOMMU_API when DMAR and/or AMD_IOMMU is selected
These two IOMMUs can implement the current version of this API. So select the API if one or both of these IOMMU drivers is selected. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-rw-r--r--arch/ia64/Kconfig3
-rw-r--r--arch/x86/Kconfig3
-rw-r--r--drivers/base/Makefile1
3 files changed, 7 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 7fa8f615ba6e..3d31636cbafb 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -687,3 +687,6 @@ config IRQ_PER_CPU
config IOMMU_HELPER
def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
+
+config IOMMU_API
+ def_bool (DMAR)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 249d1e0824b5..4737435b00d4 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -599,6 +599,9 @@ config SWIOTLB
config IOMMU_HELPER
def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)
+config IOMMU_API
+ def_bool (AMD_IOMMU || DMAR)
+
config MAXSMP
bool "Configure Maximum number of SMP Processors and NUMA Nodes"
depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index c66637392bbc..b5b8ba512b28 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_FW_LOADER) += firmware_class.o
obj-$(CONFIG_NUMA) += node.o
obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
obj-$(CONFIG_SMP) += topology.o
+obj-$(CONFIG_IOMMU_API) += iommu.o
ifeq ($(CONFIG_SYSFS),y)
obj-$(CONFIG_MODULES) += module.o
endif