summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorRebecca Schultz Zavin <rebecca@android.com>2012-10-18 21:51:53 -0700
committerArve Hjønnevåg <arve@android.com>2013-07-01 14:16:12 -0700
commita10821f7e451610fd7181f1d0063e874e79ae43c (patch)
tree06a9e8637aec86ef4fa8a482c051dfb8b26c13af /drivers/gpu
parent552584f55d43677d46edaec00b2d1aad4337d657 (diff)
downloadolio-linux-3.10-a10821f7e451610fd7181f1d0063e874e79ae43c.tar.xz
olio-linux-3.10-a10821f7e451610fd7181f1d0063e874e79ae43c.zip
gpu: ion: Clear GFP_WAIT flag on high order allocations
This will prevent the kernel from kicking off compaction when higher order allocations are made. Instead we will get these high order allocations only if they are readily available. Change-Id: I5c038781ef4028c1c0a1a52b6cb549d26550a124 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/ion/ion_system_heap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/ion/ion_system_heap.c b/drivers/gpu/ion/ion_system_heap.c
index 4e413786840..2dc3048ed6f 100644
--- a/drivers/gpu/ion/ion_system_heap.c
+++ b/drivers/gpu/ion/ion_system_heap.c
@@ -28,7 +28,7 @@
static unsigned int high_order_gfp_flags = (GFP_HIGHUSER | __GFP_ZERO |
__GFP_NOWARN | __GFP_NORETRY |
- __GFP_NO_KSWAPD);
+ __GFP_NO_KSWAPD) & ~__GFP_WAIT;
static unsigned int low_order_gfp_flags = (GFP_HIGHUSER | __GFP_ZERO |
__GFP_NOWARN);
static const unsigned int orders[] = {8, 4, 0};