[PATCH v2 3/3] doc: x86/iommu: Update and reorder iommu options

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Several options were missing from the top of the IOMMU section that were
detailed below. Add the missing options and reorder them to match the
order in which they are documented.

Signed-off-by: T.J. Mercier <tjmercier@xxxxxxxxxx>
---
 Documentation/arch/x86/x86_64/boot-options.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/arch/x86/x86_64/boot-options.rst b/Documentation/arch/x86/x86_64/boot-options.rst
index 18161657b301..04baefcc1712 100644
--- a/Documentation/arch/x86/x86_64/boot-options.rst
+++ b/Documentation/arch/x86/x86_64/boot-options.rst
@@ -242,9 +242,9 @@ Multiple x86-64 PCI-DMA mapping implementations exist, for example:
 
 ::
 
-  iommu=[<size>][,noagp][,off][,force][,noforce]
-  [,memaper[=<order>]][,merge][,fullflush][,nomerge]
-  [,noaperture]
+  iommu=[off][,noforce][,force][,soft][,<size>]
+  [,allowed][,fullflush][,nofullflush][,memaper[=<order>]]
+  [,merge][,nomerge][,noaperture][,noagp][,panic]
 
 General iommu options:
 
-- 
2.45.0.rc1.225.g2a3ae87e7f-goog





[Index of Archives]     [Kernel Newbies]     [Security]     [Netfilter]     [Bugtraq]     [Linux FS]     [Yosemite Forum]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]

  Powered by Linux