diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2008-11-26 11:25:13 -0500 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-01-03 08:10:09 -0500 |
commit | 1aaf118352b85bb359ce28070bcc478f659a7031 (patch) | |
tree | 101fe9b227c81576d735fedbf4533ce60343ad29 /arch | |
parent | fc2100eb4d0960b56c2c705a97941c08fb1c0fd4 (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/Kconfig | 3 | ||||
-rw-r--r-- | arch/x86/Kconfig | 3 |
2 files changed, 6 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 | |||
687 | 687 | ||
688 | config IOMMU_HELPER | 688 | config IOMMU_HELPER |
689 | def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB) | 689 | def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB) |
690 | |||
691 | config IOMMU_API | ||
692 | 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 | |||
599 | config IOMMU_HELPER | 599 | config IOMMU_HELPER |
600 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU) | 600 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU) |
601 | 601 | ||
602 | config IOMMU_API | ||
603 | def_bool (AMD_IOMMU || DMAR) | ||
604 | |||
602 | config MAXSMP | 605 | config MAXSMP |
603 | bool "Configure Maximum number of SMP Processors and NUMA Nodes" | 606 | bool "Configure Maximum number of SMP Processors and NUMA Nodes" |
604 | depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL | 607 | depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL |