---

yaml --- r: 281207 b: refs/heads/master c: 4964cd4 h: refs/heads/master i: 281205: 899b774 281203: f40dffe 281199: 593fa05 v: v3
git-mirror · Nov 30, 2011 · 60952ca · 60952ca
1 parent 6b994b3
commit 60952ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c762a49b12073c96f6a55b4dfc8b6a2a45fedff
+refs/heads/master: 4964cd41cd966502c1e0c5bc929ed15c175f8218
diff --git a/trunk/drivers/staging/android/lowmemorykiller.c b/trunk/drivers/staging/android/lowmemorykiller.c
@@ -133,6 +133,12 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask)
 			     p->pid, p->comm, oom_adj, tasksize);
 	}
 	if (selected) {
+		if (fatal_signal_pending(selected)) {
+			pr_warning("process %d is suffering a slow death\n",
+				   selected->pid);
+			read_unlock(&tasklist_lock);
+			return rem;
+		}
 		lowmem_print(1, "send sigkill to %d (%s), adj %d, size %d\n",
 			     selected->pid, selected->comm,
 			     selected_oom_adj, selected_tasksize);