projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iommu-updates-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-block.git]
/
Documentation
/
admin-guide
/
kernel-parameters.txt
diff --git
a/Documentation/admin-guide/kernel-parameters.txt
b/Documentation/admin-guide/kernel-parameters.txt
index 970d837bd57fcaf73479e457279a0d300835619b..9871e649ffeffe8798cd20a1450377a4f4777fca 100644
(file)
--- a/
Documentation/admin-guide/kernel-parameters.txt
+++ b/
Documentation/admin-guide/kernel-parameters.txt
@@
-1744,7
+1744,8
@@
merge
nomerge
soft
- pt [x86, IA-64]
+ pt [x86]
+ nopt [x86]
nobypass [PPC/POWERNV]
Disable IOMMU bypass, using IOMMU for PCI devices.