summaryrefslogtreecommitdiffstats
path: root/Documentation/admin-guide
diff options
context:
space:
mode:
authorRobin Murphy <robin.murphy@arm.com>2018-09-20 15:14:26 +0200
committerJonathan Corbet <corbet@lwn.net>2018-09-20 19:07:36 +0200
commit9d723b4ccbd2248a388f37200a931b68dab28ada (patch)
tree418d209e7722cdd98df5da73f438f1fb456f1223 /Documentation/admin-guide
parentdocs: core-api: add memory allocation guide (diff)
downloadlinux-9d723b4ccbd2248a388f37200a931b68dab28ada.tar.xz
linux-9d723b4ccbd2248a388f37200a931b68dab28ada.zip
iommu: Fix passthrough option documentation
Document that the default for "iommu.passthrough" is now configurable. Fixes: 58d1131777a4 ("iommu: Add config option to set passthrough as default") Signed-off-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/admin-guide')
-rw-r--r--Documentation/admin-guide/kernel-parameters.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 9871e649ffef..8c5a956f3d9c 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1754,7 +1754,7 @@
Format: { "0" | "1" }
0 - Use IOMMU translation for DMA.
1 - Bypass the IOMMU for DMA.
- unset - Use IOMMU translation for DMA.
+ unset - Use value of CONFIG_IOMMU_DEFAULT_PASSTHROUGH.
io7= [HW] IO7 for Marvel based alpha systems
See comment before marvel_specify_io7 in