Commit:     768cc2d3b2768ca34f254e8190f1f9e297b09ad4
Parent:     b2315372eac9cd9f622c32a93e323cf6f0f03462
Author:     Linas Vepstas <[EMAIL PROTECTED]>
AuthorDate: Wed Jul 18 02:09:35 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Fri Sep 14 01:33:19 2007 +1000

    [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 <[EMAIL PROTECTED]>
    Acked-by: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
     arch/powerpc/Kconfig |   11 ++++++-----
     1 file changed, 6 insertions(+), 5 deletions(-)
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 arch/powerpc/Kconfig |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 00099ef..66a3295 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -181,16 +181,17 @@ config MATH_EMULATION
          instructions to run.
-       bool "Enable IOMMU virtual merging (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PPC64
-       default n
+       bool "Enable IOMMU virtual merging"
+       depends on PPC64
+       default y
          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.
        bool "Support for enabling/disabling CPUs"
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to