From 1dea5fb1c2a95902f965bbf2c431990b3e3fb33e Mon Sep 17 00:00:00 2001 From: CMY Date: Mon, 23 Jun 2014 10:11:35 +0800 Subject: [PATCH] lowmemorykiller: calculator free pages exclude CMA's free Change-Id: I51a08cd9c9ef8d37fd0a5f649c5d2843a8b7d9ff Signed-off-by: Jianqun Xu --- drivers/staging/android/lowmemorykiller.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c index af49af0cca01..e7fd1a39db65 100644 --- a/drivers/staging/android/lowmemorykiller.c +++ b/drivers/staging/android/lowmemorykiller.c @@ -91,7 +91,8 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc) int selected_tasksize = 0; short selected_oom_score_adj; int array_size = ARRAY_SIZE(lowmem_adj); - int other_free = global_page_state(NR_FREE_PAGES) - totalreserve_pages; + int other_free = global_page_state(NR_FREE_PAGES) - totalreserve_pages + - global_page_state(NR_FREE_CMA_PAGES); int other_file = global_page_state(NR_FILE_PAGES) - global_page_state(NR_SHMEM) - total_swapcache_pages(); -- 2.34.1