summaryrefslogtreecommitdiffstats
path: root/Documentation/x86/x86_64
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-04-27 09:10:12 +0200
committerChristoph Hellwig <hch@lst.de>2018-05-28 12:48:12 +0200
commit84564d1c76255ac6d5fb76c85818cb5961fad061 (patch)
treecd1b9bfbe1ce7eda5e093698a1426383b73d275c /Documentation/x86/x86_64
parentf068fe3170bcf06f14fd0a9eec0be12be04ff012 (diff)
downloadlinux-84564d1c76255ac6d5fb76c85818cb5961fad061.tar.bz2
Documentation/x86: remove a stray reference to pci-nommu.c
This is just the minimal workaround. The file is mostly either stale and/or duplicative of Documentation/admin-guide/kernel-parameters.txt, but that is much more work than I'm willing to do right now. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Documentation/x86/x86_64')
-rw-r--r--Documentation/x86/x86_64/boot-options.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt
index b297c48389b9..153b3a57fba2 100644
--- a/Documentation/x86/x86_64/boot-options.txt
+++ b/Documentation/x86/x86_64/boot-options.txt
@@ -187,9 +187,9 @@ PCI
IOMMU (input/output memory management unit)
- Currently four x86-64 PCI-DMA mapping implementations exist:
+ Multiple x86-64 PCI-DMA mapping implementations exist, for example:
- 1. <arch/x86_64/kernel/pci-nommu.c>: use no hardware/software IOMMU at all
+ 1. <lib/dma-direct.c>: use no hardware/software IOMMU at all
(e.g. because you have < 3 GB memory).
Kernel boot message: "PCI-DMA: Disabling IOMMU"