diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2012-06-16 16:41:05 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2012-07-18 16:40:35 -0400 |
| commit | f1006257893917dfb1e0d74cb47b18c0e2908693 (patch) | |
| tree | 142954273810f9186757e784c468c25f515c5456 /mm | |
| parent | 47fc28bff82a4dd5f6b41c97e335d10fc78a8e9a (diff) | |
| download | blackbird-op-linux-f1006257893917dfb1e0d74cb47b18c0e2908693.tar.gz blackbird-op-linux-f1006257893917dfb1e0d74cb47b18c0e2908693.zip | |
bounce: allow use of bounce pool via config option
The tilegx USB OHCI support needs the bounce pool since we're not
using the IOMMU to handle 32-bit addresses.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/bounce.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mm/bounce.c b/mm/bounce.c index d1be02ca1889..042086775561 100644 --- a/mm/bounce.c +++ b/mm/bounce.c @@ -24,23 +24,25 @@ static mempool_t *page_pool, *isa_page_pool; -#ifdef CONFIG_HIGHMEM +#if defined(CONFIG_HIGHMEM) || defined(CONFIG_NEED_BOUNCE_POOL) static __init int init_emergency_pool(void) { -#ifndef CONFIG_MEMORY_HOTPLUG +#if defined(CONFIG_HIGHMEM) && !defined(CONFIG_MEMORY_HOTPLUG) if (max_pfn <= max_low_pfn) return 0; #endif page_pool = mempool_create_page_pool(POOL_SIZE, 0); BUG_ON(!page_pool); - printk("highmem bounce pool size: %d pages\n", POOL_SIZE); + printk("bounce pool size: %d pages\n", POOL_SIZE); return 0; } __initcall(init_emergency_pool); +#endif +#ifdef CONFIG_HIGHMEM /* * highmem version, map in to vec */ |
