oom: skip zombies when iterating tasklist

[karo-tx-linux.git] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index b5a7b5f46e7ac0429e80d0c5f9535f1c7b48e5cd..d7f345e47e73a80dccfe1c6fb820ef3b2a7f1213 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -299,6 +299,8 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
        do_each_thread(g, p) {
                unsigned int points;
 
+               if (!p->mm)
+                       continue;
                if (oom_unkillable_task(p, mem, nodemask))
                        continue;
 
@@ -324,7 +326,7 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
                 * the process of exiting and releasing its resources.
                 * Otherwise we could get an easy OOM deadlock.
                 */
-               if ((p->flags & PF_EXITING) && p->mm) {
+               if (p->flags & PF_EXITING) {
                        if (p != current)
                                return ERR_PTR(-1UL);