From 5a7d17046516a136ee9fbe4633ff79c533fc4672 Mon Sep 17 00:00:00 2001 From: Vinayak Menon Date: Mon, 29 Apr 2013 15:08:55 -0700 Subject: [PATCH] --- yaml --- r: 365463 b: refs/heads/master c: 9ca24e2e19325edc3ed0b437657d26219b7a768a h: refs/heads/master i: 365461: 545810ffa92cd48574a4c43b9647329b72796926 365459: 044b9fc095c096e5a1ad8b2b0f3e820648ac3c11 365455: 491afb5c87e498f8d63156cdc06487d0c322ef77 v: v3 --- [refs] | 2 +- trunk/mm/Kconfig | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 34695556f8ae..db1faa37816f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b476e2951fcf7a25574b7b193944b041687f3ed4 +refs/heads/master: 9ca24e2e19325edc3ed0b437657d26219b7a768a diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig index 3bea74f1ccfe..e742d06285b7 100644 --- a/trunk/mm/Kconfig +++ b/trunk/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