aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorMuli Ben-Yehuda <muli@il.ibm.com>2006-12-07 02:14:07 +0100
committerAndi Kleen <andi@basil.nowhere.org>2006-12-07 02:14:07 +0100
commitbff6547bb6a4e82c399d74e7fba78b12d2f162ed (patch)
treefaeb4e95d243b0eb5cd6337739e4c14d154b282f /Documentation
parenteae93755540bae18aff46b8a0e621b5d65bd5380 (diff)
downloadleg-kernel-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 'Documentation')
-rw-r--r--Documentation/x86_64/boot-options.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index ab9b1c046c00..dbdcaf68e3ea 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -179,7 +179,7 @@ PCI
IOMMU
iommu=[size][,noagp][,off][,force][,noforce][,leak][,memaper[=order]][,merge]
- [,forcesac][,fullflush][,nomerge][,noaperture]
+ [,forcesac][,fullflush][,nomerge][,noaperture][,calgary]
size set size of iommu (in bytes)
noagp don't initialize the AGP driver and use full aperture.
off don't use the IOMMU
@@ -200,6 +200,7 @@ IOMMU
buffering.
nodac Forbid DMA >4GB
panic Always panic when IOMMU overflows
+ calgary Use the Calgary IOMMU if it is available
swiotlb=pages[,force]