aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/oom_kill.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index b5a7b5f46e7a..d7f345e47e73 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -299,6 +299,8 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
299 do_each_thread(g, p) { 299 do_each_thread(g, p) {
300 unsigned int points; 300 unsigned int points;
301 301
302 if (!p->mm)
303 continue;
302 if (oom_unkillable_task(p, mem, nodemask)) 304 if (oom_unkillable_task(p, mem, nodemask))
303 continue; 305 continue;
304 306
@@ -324,7 +326,7 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
324 * the process of exiting and releasing its resources. 326 * the process of exiting and releasing its resources.
325 * Otherwise we could get an easy OOM deadlock. 327 * Otherwise we could get an easy OOM deadlock.
326 */ 328 */
327 if ((p->flags & PF_EXITING) && p->mm) { 329 if (p->flags & PF_EXITING) {
328 if (p != current) 330 if (p != current)
329 return ERR_PTR(-1UL); 331 return ERR_PTR(-1UL);
330 332