diff options
| -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 | |||
| 181 | instructions to run. | 181 | instructions to run. |
| 182 | 182 | ||
| 183 | config IOMMU_VMERGE | 183 | config IOMMU_VMERGE |
| 184 | bool "Enable IOMMU virtual merging (EXPERIMENTAL)" | 184 | bool "Enable IOMMU virtual merging" |
| 185 | depends on EXPERIMENTAL && PPC64 | 185 | depends on PPC64 |
| 186 | default n | 186 | default y |
| 187 | help | 187 | help |
| 188 | Cause IO segments sent to a device for DMA to be merged virtually | 188 | Cause IO segments sent to a device for DMA to be merged virtually |
| 189 | by the IOMMU when they happen to have been allocated contiguously. | 189 | by the IOMMU when they happen to have been allocated contiguously. |
| 190 | This doesn't add pressure to the IOMMU allocator. However, some | 190 | This doesn't add pressure to the IOMMU allocator. However, some |
| 191 | drivers don't support getting large merged segments coming back | 191 | drivers don't support getting large merged segments coming back |
| 192 | from *_map_sg(). Say Y if you know the drivers you are using are | 192 | from *_map_sg(). |
| 193 | properly handling this case. | 193 | |
| 194 | Most drivers don't have this problem; it is safe to say Y here. | ||
| 194 | 195 | ||
| 195 | config HOTPLUG_CPU | 196 | config HOTPLUG_CPU |
| 196 | bool "Support for enabling/disabling CPUs" | 197 | bool "Support for enabling/disabling CPUs" |