diff options
| author | Arve Hjønnevåg | 2010-11-24 02:29:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-11-30 13:20:51 +0100 |
| commit | 71b2c82bdf67ab24716c536e10de436169d3574c (patch) | |
| tree | b1094f5d005c143844653fee16fb588ce006d346 /drivers/staging/android | |
| parent | staging: android: lowmemorykiller: Update arguments of shrinker for 2.6.35 (diff) | |
| download | kernel-qcow2-linux-71b2c82bdf67ab24716c536e10de436169d3574c.tar.gz kernel-qcow2-linux-71b2c82bdf67ab24716c536e10de436169d3574c.tar.xz kernel-qcow2-linux-71b2c82bdf67ab24716c536e10de436169d3574c.zip | |
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')
| -rw-r--r-- | drivers/staging/android/lowmemorykiller.c | 3 |
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 |