From 3af0dcd62394e86b282c4f4b2b73dd6c1ed7c57b Mon Sep 17 00:00:00 2001
From: San Mehat <san@google.com>
Date: Thu, 6 May 2010 15:43:46 -0700
Subject: [PATCH] --- yaml --- r: 281210 b: refs/heads/master c:
 eb943f6be011b33455b767880e13c34a2bb96a5e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 087ddc2d8566..d400164761bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58526090ece3582516e62779739a7d665a74708c
+refs/heads/master: eb943f6be011b33455b767880e13c34a2bb96a5e
diff --git a/trunk/drivers/staging/android/lowmemorykiller.c b/trunk/drivers/staging/android/lowmemorykiller.c
index 4523093767d4..cf79eb9677fe 100644
--- a/trunk/drivers/staging/android/lowmemorykiller.c
+++ b/trunk/drivers/staging/android/lowmemorykiller.c
@@ -167,12 +167,6 @@ 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);