From: Rebecca Schultz Zavin <rebecca@android.com>
Date: Fri, 13 Dec 2013 22:23:47 +0000 (-0800)
Subject: gpu: ion: ion_system_heap: Change allocations to GFP_HIGHUSER
X-Git-Tag: v3.14-rc1~150^2~464
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0de9577b5e708b903a58a9d5e91d6474daa29c2d;p=~emulex%2Finfiniband.git

gpu: ion: ion_system_heap: Change allocations to GFP_HIGHUSER

Previously the ion_system_heap was using GFP_KERNEL, forcing all allocations
to be in lowmem.  This quickly causes us to run out of lowmem.

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
[jstultz: modified patch to apply to staging directory]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
index 3383a881b72..35b3726e4a3 100644
--- a/drivers/staging/android/ion/ion_system_heap.c
+++ b/drivers/staging/android/ion/ion_system_heap.c
@@ -40,7 +40,7 @@ static int ion_system_heap_allocate(struct ion_heap *heap,
 		goto err0;
 	for_each_sg(table->sgl, sg, table->nents, i) {
 		struct page *page;
-		page = alloc_page(GFP_KERNEL);
+		page = alloc_page(GFP_HIGHUSER | __GFP_ZERO);
 		if (!page)
 			goto err1;
 		sg_set_page(sg, page, PAGE_SIZE, 0);