Revert "android/lowmemorykiller: Check all tasks for death pending"
This reverts commit 7ec0cf6d3f
.
This commit is contained in:
parent
919a123cc9
commit
8a04cc5c75
|
@ -68,22 +68,6 @@ static unsigned long lowmem_deathpending_timeout;
|
|||
pr_info(x); \
|
||||
} while (0)
|
||||
|
||||
static int test_task_flag(struct task_struct *p, int flag)
|
||||
{
|
||||
struct task_struct *t = p;
|
||||
|
||||
do {
|
||||
task_lock(t);
|
||||
if (test_tsk_thread_flag(t, flag)) {
|
||||
task_unlock(t);
|
||||
return 1;
|
||||
}
|
||||
task_unlock(t);
|
||||
} while_each_thread(p, t);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc)
|
||||
{
|
||||
struct task_struct *tsk;
|
||||
|
@ -134,17 +118,16 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc)
|
|||
if (tsk->flags & PF_KTHREAD)
|
||||
continue;
|
||||
|
||||
if (time_before_eq(jiffies, lowmem_deathpending_timeout)) {
|
||||
if (test_task_flag(tsk, TIF_MEMDIE)) {
|
||||
rcu_read_unlock();
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
p = find_lock_task_mm(tsk);
|
||||
if (!p)
|
||||
continue;
|
||||
|
||||
if (test_tsk_thread_flag(p, TIF_MEMDIE) &&
|
||||
time_before_eq(jiffies, lowmem_deathpending_timeout)) {
|
||||
task_unlock(p);
|
||||
rcu_read_unlock();
|
||||
return 0;
|
||||
}
|
||||
oom_score_adj = p->signal->oom_score_adj;
|
||||
if (oom_score_adj < min_score_adj) {
|
||||
task_unlock(p);
|
||||
|
|
Loading…
Reference in New Issue