diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2010-08-27 14:44:14 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2010-10-13 14:17:51 -0700 |
| commit | 541d45cb18bb9a02f9ce70ce7848cec7b7ce2424 (patch) | |
| tree | c0b6a1b7e62b3a07ca1d320f9196258995c7b45d /drivers/staging | |
| parent | 93b0c15407a15f5daef15c1915e09d04384b1ae1 (diff) | |
Revert "staging: android: lowmemorykiller: Remove bitrotted codepath"
This reverts commit d3cf24cfefda01d1dfcafd63fe1f6e6179908878.
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/android/lowmemorykiller.c | 6 |
1 files changed, 6 insertions, 0 deletions
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); |