diff --git a/[refs] b/[refs] index 7e49c06a530f..44d4ed507afc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0cf01f6685bef41dea37bbec606f375b7a98fd98 +refs/heads/master: 52ea27eb4cd5f250f33638029a134ff03c5e6bbb diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index 8b9f6cae938e..9b648bd63451 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -1079,7 +1079,7 @@ static void mem_cgroup_move_task(struct cgroup_subsys *ss, * Only thread group leaders are allowed to migrate, the mm_struct is * in effect owned by the leader */ - if (p->tgid != p->pid) + if (!thread_group_leader(p)) goto out; css_get(&mem->css);