From: Rebecca Schultz Zavin Date: Fri, 13 Dec 2013 22:24:17 +0000 (-0800) Subject: gpu: ion: Clear GFP_WAIT flag on high order allocations X-Git-Tag: next-20131220~15^2~201 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=31b9432b4b588777b30ad1f7d8eecf7770a45edc;p=karo-tx-linux.git 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. Signed-off-by: Rebecca Schultz 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 2204206ef5ff..ad4933e1b421 100644 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/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};