aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/oom_kill.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 0131bae2a16d..55a05f1ef76d 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -204,8 +204,6 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
204 /* skip the init task with pid == 1 */ 204 /* skip the init task with pid == 1 */
205 if (p->pid == 1) 205 if (p->pid == 1)
206 continue; 206 continue;
207 if (p->oomkilladj == OOM_DISABLE)
208 continue;
209 207
210 /* 208 /*
211 * This is in the process of releasing memory so wait for it 209 * This is in the process of releasing memory so wait for it
@@ -230,6 +228,8 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
230 } 228 }
231 return ERR_PTR(-1UL); 229 return ERR_PTR(-1UL);
232 } 230 }
231 if (p->oomkilladj == OOM_DISABLE)
232 continue;
233 if (p->flags & PF_SWAPOFF) 233 if (p->flags & PF_SWAPOFF)
234 return p; 234 return p;
235 235