From 579b38214e6297a8e64ddcb829351a0479c522c4 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 19 Mar 2008 17:00:45 -0700
Subject: [PATCH] --- yaml --- r: 87495 b: refs/heads/master c:
 52ea27eb4cd5f250f33638029a134ff03c5e6bbb h: refs/heads/master i:   87493:
 e1f0bf59161eed210350c92cf8cdb5888b6fd211   87491:
 f6c41a8c4c2c784fed9fdff135c4d4722ea61272   87487:
 de8df1539f3811394ee55c51ea7f815189248de2 v: v3

---
 [refs]                | 2 +-
 trunk/mm/memcontrol.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);