aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2010-11-23 17:29:04 -0800
committerColin Cross <ccross@android.com>2011-06-14 09:09:40 -0700
commit320faa1750fb0d8a7312f194c62beb952afddcab (patch)
tree9ada78b9288d122e13a0c154e389f4f57732614d
parent280e506943185da01e8605b1a0082012205d3cb0 (diff)
downloadkernel_samsung_tuna-320faa1750fb0d8a7312f194c62beb952afddcab.zip
kernel_samsung_tuna-320faa1750fb0d8a7312f194c62beb952afddcab.tar.gz
kernel_samsung_tuna-320faa1750fb0d8a7312f194c62beb952afddcab.tar.bz2
staging: android: lowmemorykiller: Ignore shmem pages in page-cache
Change-Id: Ia54fc50b7dcabfeb71eb487c652803f83e2f3d8e Signed-off-by: Arve Hjønnevåg <arve@android.com>
-rw-r--r--drivers/staging/android/lowmemorykiller.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 4c455cf..897bc3a 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -91,7 +91,8 @@ static int lowmem_shrink(struct shrinker *s, int nr_to_scan, gfp_t gfp_mask)
int selected_oom_adj;
int array_size = ARRAY_SIZE(lowmem_adj);
int other_free = global_page_state(NR_FREE_PAGES);
- int other_file = global_page_state(NR_FILE_PAGES);
+ int other_file = global_page_state(NR_FILE_PAGES) -
+ global_page_state(NR_SHMEM);
/*
* If we already have a death outstanding, then