From abe997b06f4da33416b20bed5784abd9ea97c7c9 Mon Sep 17 00:00:00 2001
From: Rebecca Schultz Zavin <rebecca@android.com>
Date: Fri, 27 Aug 2010 14:44:14 -0700
Subject: [PATCH] Revert "staging: android: lowmemorykiller: Remove bitrotted
 codepath"

This reverts commit d3cf24cfefda01d1dfcafd63fe1f6e6179908878.
---
 drivers/staging/android/lowmemorykiller.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 8b67ac06e4b0..57da5f4613b3 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -164,6 +164,12 @@ static int lowmem_shrink(struct shrinker *s, 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);
-- 
2.34.1