From: Dima Zavin Date: Fri, 13 Dec 2013 22:23:53 +0000 (-0800) Subject: gpu: ion: do not ask for compound pages in system heap X-Git-Tag: v3.14-rc1~150^2~458 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fe65ec5bd1e0f44d601a9990aa253e85561c224d;p=linux.git gpu: ion: do not ask for compound pages in system heap Signed-off-by: Dima Zavin [jstultz: modified patch to apply to staging directory] Signed-off-by: John Stultz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c index 98711ce03753..3f607df63809 100644 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/ion_system_heap.c @@ -41,7 +41,7 @@ static struct page_info *alloc_largest_available(unsigned long size) for (i = 0; i < ARRAY_SIZE(orders); i++) { if (size < (1 << orders[i]) * PAGE_SIZE) continue; - page = alloc_pages(GFP_HIGHUSER | __GFP_ZERO | __GFP_COMP | + page = alloc_pages(GFP_HIGHUSER | __GFP_ZERO | __GFP_NOWARN | __GFP_NORETRY, orders[i]); if (!page) continue;