From: Christoph Hellwig Date: Fri, 27 Apr 2018 07:10:12 +0000 (+0200) Subject: Documentation/x86: remove a stray reference to pci-nommu.c X-Git-Tag: for-linus-20180616~129^2~7 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=84564d1c76255ac6d5fb76c85818cb5961fad061;p=linux-block.git 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 Reviewed-by: Thomas Gleixner --- 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. : use no hardware/software IOMMU at all + 1. : use no hardware/software IOMMU at all (e.g. because you have < 3 GB memory). Kernel boot message: "PCI-DMA: Disabling IOMMU"