From: Haavard Skinnemoen Date: Thu, 5 Jul 2007 15:08:09 +0000 (+0200) Subject: [AVR32] Drop GFP_COMP for DMA memory allocations X-Git-Tag: MMI-PSA29.97-13-9~37726^2~18 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3611553ef985ef7c5863c8a94641738addd04cff;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [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 --- 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, struct page *page, *free, *end; int order; + /* Following is a work-around (a.k.a. hack) to prevent pages + * with __GFP_COMP being passed to split_page() which cannot + * handle them. The real problem is that this flag probably + * should be 0 on AVR32 as it is not supported on this + * platform--see CONFIG_HUGETLB_PAGE. */ + gfp &= ~(__GFP_COMP); + size = PAGE_ALIGN(size); order = get_order(size);