1 files changed, 4 insertions, 4 deletions

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 7dcca55ede7c..b5a7b5f46e7a 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -292,11 +292,11 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
                 unsigned long totalpages, struct mem_cgroup *mem,
                 const nodemask_t *nodemask)
 {
-        struct task_struct *p;
+        struct task_struct *g, *p;
         struct task_struct *chosen = NULL;
         *ppoints = 0;
 
-        for_each_process(p) {
+        do_each_thread(g, p) {
                 unsigned int points;
 
                 if (oom_unkillable_task(p, mem, nodemask))
@@ -324,7 +324,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 (thread_group_empty(p) && (p->flags & PF_EXITING) && p->mm) {
+                if ((p->flags & PF_EXITING) && p->mm) {
                         if (p != current)
                                 return ERR_PTR(-1UL);
 
@@ -337,7 +337,7 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
                         chosen = p;
                         *ppoints = points;
                 }
-        }
+        } while_each_thread(g, p);
 
         return chosen;
 }