diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 79b34831ad79c9d061b3a17a6e3dc2dd8cf9aad4..342d4333f71872dcf056c8a6db0e237172124ab4 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -69,8 +69,8 @@ static bool has_intersects_mems_allowed(struct task_struct *tsk,
 			if (cpuset_mems_allowed_intersects(current, tsk))
 				return true;
 		}
-		tsk = next_thread(tsk);
-	} while (tsk != start);
+	} while_each_thread(start, tsk);
+
 	return false;
 }
 #else