Merge tag 'v3.10.99' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 3bea74f1ccfe1f1f5c134fd5c98767d620553b60..e742d06285b780eea632efe643e18d695f766928 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -263,8 +263,14 @@ config ZONE_DMA_FLAG
        default "1"
 
 config BOUNCE
-       def_bool y
+       bool "Enable bounce buffers"
+       default y
        depends on BLOCK && MMU && (ZONE_DMA || HIGHMEM)
+       help
+         Enable bounce buffers for devices that cannot access
+         the full range of memory available to the CPU. Enabled
+         by default when ZONE_DMA or HIGHMEM is selected, but you
+         may say n to override this.
 
 # On the 'tile' arch, USB OHCI needs the bounce pool since tilegx will often
 # have more than 4GB of memory, but we don't currently use the IOTLB to present