diff options
author | Muli Ben-Yehuda <muli@il.ibm.com> | 2006-12-07 02:14:07 +0100 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-07 02:14:07 +0100 |
commit | bff6547bb6a4e82c399d74e7fba78b12d2f162ed (patch) | |
tree | faeb4e95d243b0eb5cd6337739e4c14d154b282f /arch/x86_64/Kconfig | |
parent | eae93755540bae18aff46b8a0e621b5d65bd5380 (diff) | |
download | op-kernel-dev-bff6547bb6a4e82c399d74e7fba78b12d2f162ed.zip op-kernel-dev-bff6547bb6a4e82c399d74e7fba78b12d2f162ed.tar.gz |
[PATCH] Calgary: allow compiling Calgary in but not using it by default
This patch makes it possible to compile Calgary in but not use it by
default. In this mode, use 'iommu=calgary' to activate it.
Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/Kconfig')
-rw-r--r-- | arch/x86_64/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 010d226..5cb509d 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig @@ -455,6 +455,17 @@ config CALGARY_IOMMU Normally the kernel will make the right choice by itself. If unsure, say Y. +config CALGARY_IOMMU_ENABLED_BY_DEFAULT + bool "Should Calgary be enabled by default?" + default y + depends on CALGARY_IOMMU + help + Should Calgary be enabled by default? if you choose 'y', Calgary + will be used (if it exists). If you choose 'n', Calgary will not be + used even if it exists. If you choose 'n' and would like to use + Calgary anyway, pass 'iommu=calgary' on the kernel command line. + If unsure, say Y. + # need this always selected by IOMMU for the VIA workaround config SWIOTLB bool |