[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-4454d32749465ffa77d82bc1fdd196d6dedc544b@git.kernel.org>
Date: Wed, 5 Sep 2012 04:01:01 -0700
From: tip-bot for Joe Millenbach <jmillenbach@...il.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
konrad.wilk@...cle.com, jmillenbach@...il.com,
josh@...htriplett.org, tglx@...utronix.de
Subject: [tip:x86/urgent] x86/kconfig:
Remove outdated reference to Intel CPUs in CONFIG_SWIOTLB
Commit-ID: 4454d32749465ffa77d82bc1fdd196d6dedc544b
Gitweb: http://git.kernel.org/tip/4454d32749465ffa77d82bc1fdd196d6dedc544b
Author: Joe Millenbach <jmillenbach@...il.com>
AuthorDate: Sun, 2 Sep 2012 17:38:20 -0700
Committer: Ingo Molnar <mingo@...nel.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@...il.com>
Reviewed-by: Josh Triplett <josh@...htriplett.org>
Cc: team-fjord@...glegroups.com
Cc: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Link: http://lkml.kernel.org/r/1346632700-29113-1-git-send-email-jmillenbach@gmail.com
Signed-off-by: Ingo Molnar <mingo@...nel.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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists