diff --git a/[refs] b/[refs]
index 9b4ff3bf903a..653025dae683 100644
--- 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
index 93a1758b5c08..0ae08adb68f2 100644
--- 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