From: Colin Cross Date: Sat, 14 Dec 2013 03:26:22 +0000 (-0800) Subject: ion: free low memory from page pools first X-Git-Tag: next-20131220~15^2~142 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ce3d10933a3e2e1d2cb3b9ae91b6b945f189bb90;p=karo-tx-linux.git ion: free low memory from page pools first When the shrinkers are called with GFP_HIGH free low memory first, it is more important to have free than high memory. Signed-off-by: Colin Cross Signed-off-by: John Stultz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c index 979d2e4a6b12..0ad026359cf8 100644 --- a/drivers/staging/android/ion/ion_page_pool.c +++ b/drivers/staging/android/ion/ion_page_pool.c @@ -143,10 +143,10 @@ int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask, struct page *page; mutex_lock(&pool->mutex); - if (high && pool->high_count) { - page = ion_page_pool_remove(pool, true); - } else if (pool->low_count) { + if (pool->low_count) { page = ion_page_pool_remove(pool, false); + } else if (high && pool->high_count) { + page = ion_page_pool_remove(pool, true); } else { mutex_unlock(&pool->mutex); break;