diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-13 18:50:12 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-13 18:50:12 +0000 |
| commit | 679160a872dfe88bf34e50f1939e190ba59e534e (patch) | |
| tree | fe342d02e224d006a23745a657148ce62b54fee4 /drivers/staging/android/ion/ion_page_pool.c | |
| parent | eed4bafd63b5584adb832a582a931ecba41dec55 (diff) | |
| parent | 8f1c42284159ebd6851e1e75507f2ad6fba87d0f (diff) | |
Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into lsk-v3.10-aospv3.10/topic/aosp
Diffstat (limited to 'drivers/staging/android/ion/ion_page_pool.c')
| -rw-r--r-- | drivers/staging/android/ion/ion_page_pool.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c index b052ff6bf38..f087a02770a 100644 --- a/drivers/staging/android/ion/ion_page_pool.c +++ b/drivers/staging/android/ion/ion_page_pool.c @@ -108,7 +108,7 @@ void *ion_page_pool_alloc(struct ion_page_pool *pool) return page; } -void ion_page_pool_free(struct ion_page_pool *pool, struct page* page) +void ion_page_pool_free(struct ion_page_pool *pool, struct page *page) { int ret; @@ -134,7 +134,7 @@ int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask, int i; bool high; - high = gfp_mask & __GFP_HIGHMEM; + high = !!(gfp_mask & __GFP_HIGHMEM); if (nr_to_scan == 0) return ion_page_pool_total(pool, high); @@ -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; |