On Fri, 25 May 2018, Christoph Hellwig wrote: Subject should be: Documentation/x86: Remove .....
please > This is just the minimal workaround. The file file is mostly either stale file file? > and/or duplicative of Documentation/admin-guide/kernel-parameters.txt, > but that is much more work than I'm willing to do right now. Yeah, this thing is on the todo list ... > Signed-off-by: Christoph Hellwig <h...@lst.de> Other than the above nits: Reviewed-by: Thomas Gleixner <t...@linutronix.de> > --- > Documentation/x86/x86_64/boot-options.txt | 4 ++-- > 1 file 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" > > -- > 2.17.0 > >
