summaryrefslogtreecommitdiff
path: root/drivers/staging/android/lowmemorykiller.c
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2010-11-23 17:29:04 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-30 21:20:51 +0900
commit71b2c82bdf67ab24716c536e10de436169d3574c (patch)
treeb1094f5d005c143844653fee16fb588ce006d346 /drivers/staging/android/lowmemorykiller.c
parent06a1074e1c789a777732f8c432d913b0fedb8ff5 (diff)
staging: android: lowmemorykiller: Ignore shmem pages in page-cache
Signed-off-by: Arve Hjønnevåg <arve@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/android/lowmemorykiller.c')
-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 93a1758b5c08..0ae08adb68f2 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