[PATCH] Fix missing part of x86-64 update, part 2

One more missing doc-file update

[PATCH] Fix missing part of x86-64 update, part 2
One more missing doc-file update
366bf3a0 · Linus Torvalds · Linus Torvalds · e171bd13 · 366bf3a0
Commit 366bf3a0 authored Mar 19, 2004 by Linus Torvalds Committed by Linus Torvalds Mar 19, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

Documentation/x86_64/boot-options.txt Documentation/x86_64/boot-options.txt +5 -1

No files found.
--- 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.