---

yaml --- r: 281212 b: refs/heads/master c: 71b2c82 h: refs/heads/master v: v3
git-mirror · Nov 30, 2011 · a56bd81 · a56bd81
1 parent a7ef58f
commit a56bd81
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06a1074e1c789a777732f8c432d913b0fedb8ff5
+refs/heads/master: 71b2c82bdf67ab24716c536e10de436169d3574c
diff --git a/trunk/drivers/staging/android/lowmemorykiller.c b/trunk/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