From 60952ca1328c00a34e0cdfb224e73f43dd87ef67 Mon Sep 17 00:00:00 2001
From: San Mehat <san@google.com>
Date: Mon, 26 Apr 2010 15:11:04 -0700
Subject: [PATCH] --- yaml --- r: 281207 b: refs/heads/master c:
 4964cd41cd966502c1e0c5bc929ed15c175f8218 h: refs/heads/master i:   281205:
 899b774ea7aedd7e4084632d318e598e56dc0f63   281203:
 f40dffe0fb6fac6dcd0077056b0e27076fa60bc7   281199:
 593fa059cd3d836c786f83c34b832d7d425b330c v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/android/lowmemorykiller.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ea620c29629a..d47377fd9bf9 100644
--- 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
index 32314e85e2b7..83721786dead 100644
--- 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);