From b34fd97f65ed441810794c70b97400d97402fb62 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Thu, 7 Feb 2008 00:14:47 -0800
Subject: [PATCH] --- yaml --- r: 83810 b: refs/heads/master c:
 73507f335f406ff31ceb97b39fa76eaee00f4f26 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/cgroup.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ca5399807ed1..0b81fc1b2246 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b450129554213a4d4c5932f8a293646c029e1b0a
+refs/heads/master: 73507f335f406ff31ceb97b39fa76eaee00f4f26
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index 2c5cccbe12e2..4766bb65e4d9 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -1269,7 +1269,7 @@ static int attach_task_by_pid(struct cgroup *cgrp, char *pidbuf)
 
 	if (pid) {
 		rcu_read_lock();
-		tsk = find_task_by_pid(pid);
+		tsk = find_task_by_vpid(pid);
 		if (!tsk || tsk->flags & PF_EXITING) {
 			rcu_read_unlock();
 			return -ESRCH;
@@ -1955,7 +1955,7 @@ static int pid_array_load(pid_t *pidarray, int npids, struct cgroup *cgrp)
 	while ((tsk = cgroup_iter_next(cgrp, &it))) {
 		if (unlikely(n == npids))
 			break;
-		pidarray[n++] = task_pid_nr(tsk);
+		pidarray[n++] = task_pid_vnr(tsk);
 	}
 	cgroup_iter_end(cgrp, &it);
 	return n;