projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7298097
)
Revert "staging: android: lowmemorykiller: Remove bitrotted codepath"
author
黄涛
<huangtao@rock-chips.com>
Sat, 30 Jul 2011 14:16:29 +0000
(22:16 +0800)
committer
黄涛
<huangtao@rock-chips.com>
Sat, 30 Jul 2011 14:16:29 +0000
(22:16 +0800)
This reverts commit
ab24f9c8fd996759bc16cfaf496c26c461758009
.
drivers/staging/android/lowmemorykiller.c
patch
|
blob
|
history
diff --git
a/drivers/staging/android/lowmemorykiller.c
b/drivers/staging/android/lowmemorykiller.c
index 39d5e6502b2100d0d077179d568885d366be674a..1204ee0bdf72b9b7d5fec428d781d69d715f7911 100644
(file)
--- 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);