From: tip-bot for Joe Millenbach <jmillenbach@gmail.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
konrad.wilk@oracle.com, jmillenbach@gmail.com,
josh@joshtriplett.org, tglx@linutronix.de
Subject: [tip:x86/urgent] x86/kconfig: Remove outdated reference to Intel CPUs in CONFIG_SWIOTLB
Date: Wed, 5 Sep 2012 04:01:01 -0700 [thread overview]
Message-ID: <tip-4454d32749465ffa77d82bc1fdd196d6dedc544b@git.kernel.org> (raw)
In-Reply-To: <1346632700-29113-1-git-send-email-jmillenbach@gmail.com>
Commit-ID: 4454d32749465ffa77d82bc1fdd196d6dedc544b
Gitweb: http://git.kernel.org/tip/4454d32749465ffa77d82bc1fdd196d6dedc544b
Author: Joe Millenbach <jmillenbach@gmail.com>
AuthorDate: Sun, 2 Sep 2012 17:38:20 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 5 Sep 2012 11:05:01 +0200
x86/kconfig: Remove outdated reference to Intel CPUs in CONFIG_SWIOTLB
Deleted the no longer valid example of which x86 CPUs lack a
hardware IOMMU, and moved the "If unsure..." statement to a new
line to follow the style of surrounding options.
Signed-off-by: Joe Millenbach <jmillenbach@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Cc: team-fjord@googlegroups.com
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Link: http://lkml.kernel.org/r/1346632700-29113-1-git-send-email-jmillenbach@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/Kconfig | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 8ec3a1a..50a1d1f 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -746,10 +746,10 @@ config SWIOTLB
def_bool y if X86_64
---help---
Support for software bounce buffers used on x86-64 systems
- which don't have a hardware IOMMU (e.g. the current generation
- of Intel's x86-64 CPUs). Using this PCI devices which can only
- access 32-bits of memory can be used on systems with more than
- 3 GB of memory. If unsure, say Y.
+ which don't have a hardware IOMMU. Using this PCI devices
+ which can only access 32-bits of memory can be used on systems
+ with more than 3 GB of memory.
+ If unsure, say Y.
config IOMMU_HELPER
def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)
prev parent reply other threads:[~2012-09-05 11:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-03 0:38 [PATCHv2] x86: Removing invalid reference to Intel CPUs in CONFIG_SWIOTLB Joe Millenbach
2012-09-05 11:01 ` tip-bot for Joe Millenbach [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-4454d32749465ffa77d82bc1fdd196d6dedc544b@git.kernel.org \
--to=jmillenbach@gmail.com \
--cc=hpa@zytor.com \
--cc=josh@joshtriplett.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox