From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936365AbeEYOh0 (ORCPT ); Fri, 25 May 2018 10:37:26 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:56642 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936228AbeEYOff (ORCPT ); Fri, 25 May 2018 10:35:35 -0400 From: Christoph Hellwig To: Thomas Gleixner , Ingo Molnar , Tony Luck , Fenghua Yu , Greg Kroah-Hartman Cc: x86@kernel.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 4/7] x86: remove a stray reference to pci-nommu.c Date: Fri, 25 May 2018 16:35:09 +0200 Message-Id: <20180525143512.1466-5-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180525143512.1466-1-hch@lst.de> References: <20180525143512.1466-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is just the minimal workaround. The file 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 --- 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. : 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" -- 2.17.0