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 <ccross@android.com>
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_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c
index 979d2e4a6b12e3063c707bbe8f76f4f6141aa67f..0ad026359cf88f2a4857fbff6f04a44c04f82618 100644 (file)
--- 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;