summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2004-03-19 19:20:25 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-03-19 19:20:25 -0800
commit366bf3a05ef4289948a7db69f3f252eacf1c4e64 (patch)
tree61ce1333f1c2838acde9c180f81d8ebbe222a6b2
parente171bd1339987d445733d6e839b6f77ca5e6c41b (diff)
[PATCH] Fix missing part of x86-64 update, part 2
One more missing doc-file update
-rw-r--r--Documentation/x86_64/boot-options.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 6959c7eb597b..d78f8dbf9e8b 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -136,7 +136,7 @@ PCI
IOMMU
- iommu=[size][,noagp][,off][,force][,noforce][,leak][,memaper[=order]]
+ iommu=[size][,noagp][,off][,force][,noforce][,leak][,memaper[=order]][,soft]
size set size of iommu (in bytes)
noagp don't initialize the AGP driver and use full aperture.
off don't use the IOMMU
@@ -144,5 +144,9 @@ IOMMU
memaper[=order] allocate an own aperture over RAM with size 32MB^order.
noforce don't force IOMMU usage. Default.
force Force IOMMU
+ soft Use software bounce buffering for non 32bit IO. Default on Intel
+ machines.
+ swiotlb=pages
+ Prereserve that many 4K pages for the software IO bounce buffering.