aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaavard Skinnemoen <hskinnemoen@atmel.com>2007-07-05 11:08:09 -0400
committerHaavard Skinnemoen <hskinnemoen@atmel.com>2008-01-25 02:31:39 -0500
commit3611553ef985ef7c5863c8a94641738addd04cff (patch)
tree5eca5f85e16514ee8c0c2122d74693073067c9a9
parent49914084e797530d9baaf51df9eda77babc98fa8 (diff)
[AVR32] Drop GFP_COMP for DMA memory allocations
dma_alloc_coherent wants to split pages after allocation in order to reduce the memory footprint. This does not work well with GFP_COMP pages, so drop this flag before allocation. This patch was forward-ported from BSP 2.0 Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
-rw-r--r--arch/avr32/mm/dma-coherent.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/avr32/mm/dma-coherent.c b/arch/avr32/mm/dma-coherent.c
index 177fea8f7b71..6d8c794c3b81 100644
--- a/arch/avr32/mm/dma-coherent.c
+++ b/arch/avr32/mm/dma-coherent.c
@@ -41,6 +41,13 @@ static struct page *__dma_alloc(struct device *dev, size_t size,
41 struct page *page, *free, *end; 41 struct page *page, *free, *end;
42 int order; 42 int order;
43 43
44 /* Following is a work-around (a.k.a. hack) to prevent pages
45 * with __GFP_COMP being passed to split_page() which cannot
46 * handle them. The real problem is that this flag probably
47 * should be 0 on AVR32 as it is not supported on this
48 * platform--see CONFIG_HUGETLB_PAGE. */
49 gfp &= ~(__GFP_COMP);
50
44 size = PAGE_ALIGN(size); 51 size = PAGE_ALIGN(size);
45 order = get_order(size); 52 order = get_order(size);
46 53