diff options
| author |   Linas Vepstas <linas@austin.ibm.com> | 2007-07-18 02:09:35 +1000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2007-09-14 01:33:19 +1000 |
| commit | 768cc2d3b2768ca34f254e8190f1f9e297b09ad4 (patch) | |
| tree | 36a6d158b0dcca31991c5491cae613eafa7ae143 /arch | |
| parent | Merge branch 'linux-2.6' into for-2.6.24 (diff) | |
| download | linux-dev-768cc2d3b2768ca34f254e8190f1f9e297b09ad4.tar.xz linux-dev-768cc2d3b2768ca34f254e8190f1f9e297b09ad4.zip | |
[POWERPC] IOMMU virtual merge is no longer experimental
Per conversations with BenH, IOMMU virtual merging should no longer
be considered to be an "experimental" feature. In particular,
CONFIG_VMERGE has been set to "y" in the defconfigs for quite a while.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
----
arch/powerpc/Kconfig | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/Kconfig | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 00099efe0e9f..66a329534b5e 100644 --- a/arch/powerpc/Kconfig +++ b/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" |