public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCHv2] x86: Removing invalid reference to Intel CPUs in CONFIG_SWIOTLB
@ 2012-09-03  0:38 Joe Millenbach
  2012-09-05 11:01 ` [tip:x86/urgent] x86/kconfig: Remove outdated " tip-bot for Joe Millenbach
  0 siblings, 1 reply; 2+ messages in thread
From: Joe Millenbach @ 2012-09-03  0:38 UTC (permalink / raw)
  To: Konrad Rzeszutek Wilk, Thomas Gleixner, Ingo Molnar,
	H. Peter Anvin, x86, linux-kernel
  Cc: team-fjord, Joe Millenbach

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>
---
v2: Incorporated feedback from Konrad Rzeszutek Wilk that no mention of
    Intel CPUs was needed.

 arch/x86/Kconfig |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5bed94e..c5b08e3 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -755,10 +755,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)
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [tip:x86/urgent] x86/kconfig: Remove outdated reference to Intel CPUs in CONFIG_SWIOTLB
  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
  0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Joe Millenbach @ 2012-09-05 11:01 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: linux-kernel, hpa, mingo, konrad.wilk, jmillenbach, josh, tglx

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)

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-09-05 11:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-03  0:38 [PATCHv2] x86: Removing invalid reference to Intel CPUs in CONFIG_SWIOTLB Joe Millenbach
2012-09-05 11:01 ` [tip:x86/urgent] x86/kconfig: Remove outdated " tip-bot for Joe Millenbach

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox