Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 8b9f6cae938e..9b648bd63451 100644
--- a/mm/memcontrol.c
+++ b/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);