summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi RongQing <lirongqing@baidu.com>2026-03-30 06:59:57 -0400
committerJonathan Corbet <corbet@lwn.net>2026-04-09 08:36:52 -0600
commit15d49089e5b541c514fa458d6c8487afc8f8af7c (patch)
tree56e5ed0b7f74c0e4f072c35f3085a097b2d36b85
parent1cc973b7c94a77bd3419bca847bbf19b5cfdfa4c (diff)
Documentation/kernel-parameters: fix architecture alignment for pt, nopt, and nobypass
Commit ab0e7f20768a ("Documentation: Merge x86-specific boot options doc into kernel-parameters.txt") introduced a formatting regression where architecture tags were placed on separate lines with broken indentation. This caused the 'nopt' [X86] parameter to appear as if it belonged to the [PPC/POWERNV] section. Furthermore, since the main 'iommu=' parameter heading already specifies it is for [X86, EARLY], the subsequent standalone [X86] tags for 'pt', 'nopt', and the AMD GART options are redundant and clutter the documentation. Clean up the formatting by removing these redundant tags and properly attributing the 'nobypass' option to [PPC/POWERNV]. Fixes: ab0e7f20768a ("Documentation: Merge x86-specific boot options doc into kernel-parameters.txt") Acked-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Li RongQing <lirongqing@baidu.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net> Message-ID: <20260330105957.2271-1-lirongqing@baidu.com>
-rw-r--r--Documentation/admin-guide/kernel-parameters.txt6
1 files changed, 1 insertions, 5 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index c3460c920f84..b88b5f74d527 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2614,15 +2614,11 @@ Kernel parameters
Intel machines). This can be used to prevent the usage
of an available hardware IOMMU.
- [X86]
pt
- [X86]
nopt
- [PPC/POWERNV]
- nobypass
+ nobypass [PPC/POWERNV]
Disable IOMMU bypass, using IOMMU for PCI devices.
- [X86]
AMD Gart HW IOMMU-specific options:
<size>