From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 14:16:29 +0000 (+0800)
Subject: Revert "staging: android: lowmemorykiller: Remove bitrotted codepath"
X-Git-Tag: firefly_0821_release~10022
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bd9ac29b9cc3bb76d383016dda3b2b3b5a553293;p=firefly-linux-kernel-4.4.55.git

Revert "staging: android: lowmemorykiller: Remove bitrotted codepath"

This reverts commit ab24f9c8fd996759bc16cfaf496c26c461758009.
---

diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 39d5e6502b21..1204ee0bdf72 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -164,6 +164,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);