aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Mason <jdmason@us.ibm.com>2006-03-25 10:31:34 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 12:14:38 -0500
commit5d05f4de414c98348219b633401ad9c9a5348a8b (patch)
tree23c0ec4184594b3b59562e9a505bab99332ba487
parentba22f13563de5773701fc318ccaaa37b1fb6d294 (diff)
[PATCH] x86_64: Make GART_IOMMU kconfig help text more specific (trivial)
Have the GART_IOMMU help text specify that this is the hardware IOMMU in amd64 processors. This will be significant if/when other IOMMUs are added to the x86-64 architecture. :-) Also, note that the previous help text stated that IOMMU was needed for >3GB memory instead of >4GB. This is fixed in the newer version. Signed-off-by: Jon Mason <jdmason@us.ibm.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/x86_64/Kconfig16
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 31bab721cb71..6420baeb8c1f 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -364,13 +364,15 @@ config GART_IOMMU
364 select SWIOTLB 364 select SWIOTLB
365 depends on PCI 365 depends on PCI
366 help 366 help
367 Support the IOMMU. Needed to run systems with more than 3GB of memory 367 Support for hardware IOMMU in AMD's Opteron/Athlon64 Processors
368 properly with 32-bit PCI devices that do not support DAC (Double Address 368 and for the bounce buffering software IOMMU.
369 Cycle). The IOMMU can be turned off at runtime with the iommu=off parameter. 369 Needed to run systems with more than 3GB of memory properly with
370 Normally the kernel will take the right choice by itself. 370 32-bit PCI devices that do not support DAC (Double Address Cycle).
371 This option includes a driver for the AMD Opteron/Athlon64 northbridge IOMMU 371 The IOMMU can be turned off at runtime with the iommu=off parameter.
372 and a software emulation used on other systems. 372 Normally the kernel will take the right choice by itself.
373 If unsure, say Y. 373 This option includes a driver for the AMD Opteron/Athlon64 IOMMU
374 northbridge and a software emulation used on other systems without
375 hardware IOMMU. If unsure, say Y.
374 376
375# need this always enabled with GART_IOMMU for the VIA workaround 377# need this always enabled with GART_IOMMU for the VIA workaround
376config SWIOTLB 378config SWIOTLB