diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 2cb7e4e5c51a23da60d61a5c3056835dc721d91f..773ae5674e127149f51c624d86448c285c1413c7 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1167,7 +1167,7 @@ int mem_cgroup_scan_tasks(struct mem_cgroup *memcg,
 		struct css_task_iter it;
 		struct task_struct *task;
 
-		css_task_iter_start(&iter->css, 0, &it);
+		css_task_iter_start(&iter->css, CSS_TASK_ITER_PROCS, &it);
 		while (!ret && (task = css_task_iter_next(&it)))
 			ret = fn(task, arg);
 		css_task_iter_end(&it);
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index f719b64741d63419f42a2513599fff55c1148130..606e5e4c6a3e002ab00fe858bb9c313a765d05ab 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -346,9 +346,6 @@ static int oom_evaluate_task(struct task_struct *task, void *arg)
 	if (!points || points < oc->chosen_points)
 		goto next;
 
-	/* Prefer thread group leaders for display purposes */
-	if (points == oc->chosen_points && thread_group_leader(oc->chosen))
-		goto next;
 select:
 	if (oc->chosen)
 		put_task_struct(oc->chosen);