From 8ca5b74252296923407f573ee0d613b2ac9ab478 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Wed, 18 Jul 2007 02:09:35 +1000 Subject: [PATCH] --- yaml --- r: 67280 b: refs/heads/master c: 768cc2d3b2768ca34f254e8190f1f9e297b09ad4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/Kconfig | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 79be0c789261..8fc5880a598e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2315372eac9cd9f622c32a93e323cf6f0f03462 +refs/heads/master: 768cc2d3b2768ca34f254e8190f1f9e297b09ad4 diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index 00099efe0e9f..66a329534b5e 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/arch/powerpc/Kconfig @@ -181,16 +181,17 @@ config MATH_EMULATION instructions to run. config IOMMU_VMERGE - bool "Enable IOMMU virtual merging (EXPERIMENTAL)" - depends on EXPERIMENTAL && PPC64 - default n + bool "Enable IOMMU virtual merging" + depends on PPC64 + default y help Cause IO segments sent to a device for DMA to be merged virtually by the IOMMU when they happen to have been allocated contiguously. This doesn't add pressure to the IOMMU allocator. However, some drivers don't support getting large merged segments coming back - from *_map_sg(). Say Y if you know the drivers you are using are - properly handling this case. + from *_map_sg(). + + Most drivers don't have this problem; it is safe to say Y here. config HOTPLUG_CPU bool "Support for enabling/disabling CPUs"