From 5ccca28fb4388716f36adf554ed8a3376cc8c07e Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Sat, 25 Mar 2006 16:31:34 +0100 Subject: [PATCH] --- yaml --- r: 23839 b: refs/heads/master c: 5d05f4de414c98348219b633401ad9c9a5348a8b h: refs/heads/master i: 23837: 6db67122e47bc184ef705bd0067941b098978a3d 23835: 419533f3607d4780a92b484e03321ac7a04444c3 23831: 381b9b68d8f5777c6d25c55cf4c2004038d0245c 23823: ab955dd9ab6835d22fa6be77c77bfa29ea95db93 23807: 133761bfd801d126ea8929bfe1ac220d6d32faab v: v3 --- [refs] | 2 +- trunk/arch/x86_64/Kconfig | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 63f37b733679..b0dce048cd03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba22f13563de5773701fc318ccaaa37b1fb6d294 +refs/heads/master: 5d05f4de414c98348219b633401ad9c9a5348a8b diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig index 31bab721cb71..6420baeb8c1f 100644 --- a/trunk/arch/x86_64/Kconfig +++ b/trunk/arch/x86_64/Kconfig @@ -364,13 +364,15 @@ config GART_IOMMU select SWIOTLB depends on PCI help - Support the IOMMU. Needed to run systems with more than 3GB of memory - properly with 32-bit PCI devices that do not support DAC (Double Address - Cycle). The IOMMU can be turned off at runtime with the iommu=off parameter. - Normally the kernel will take the right choice by itself. - This option includes a driver for the AMD Opteron/Athlon64 northbridge IOMMU - and a software emulation used on other systems. - If unsure, say Y. + Support for hardware IOMMU in AMD's Opteron/Athlon64 Processors + and for the bounce buffering software IOMMU. + Needed to run systems with more than 3GB of memory properly with + 32-bit PCI devices that do not support DAC (Double Address Cycle). + The IOMMU can be turned off at runtime with the iommu=off parameter. + Normally the kernel will take the right choice by itself. + This option includes a driver for the AMD Opteron/Athlon64 IOMMU + northbridge and a software emulation used on other systems without + hardware IOMMU. If unsure, say Y. # need this always enabled with GART_IOMMU for the VIA workaround config SWIOTLB