summaryrefslogtreecommitdiff
path: root/drivers/staging/android
diff options
context:
space:
mode:
authorRebecca Schultz Zavin <rebecca@android.com>2013-12-13 14:23:47 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-14 08:55:37 -0800
commit0de9577b5e708b903a58a9d5e91d6474daa29c2d (patch)
tree4825a0a225ad53af5dcd04b73276fc2a15a03e81 /drivers/staging/android
parenta46b6b2d4d49d3fdb6a2ef47455dc170fbce48b7 (diff)
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>
Diffstat (limited to 'drivers/staging/android')
-rw-r--r--drivers/staging/android/ion/ion_system_heap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
index 3383a881b720..35b3726e4a34 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);