From a53abe6692fd8777346d07bee764a3e0859a7769 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Mon, 4 Feb 2008 23:43:03 -0800
Subject: [PATCH] --- yaml --- r: 83325 b: refs/heads/master c:
 e1b0d4ba46b42909d11ea152a6b56ee76f062ca3 h: refs/heads/master i:   83323:
 f8289eff2164c182bc31da93342087b6c86387e1 v: v3

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

diff --git a/[refs] b/[refs]
index 39b63c6d1f72..2dc71071e975 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 620de2f5dc697f906408743b1139fe5fb7b0b7f8
+refs/heads/master: e1b0d4ba46b42909d11ea152a6b56ee76f062ca3
diff --git a/trunk/arch/ia64/kernel/perfmon.c b/trunk/arch/ia64/kernel/perfmon.c
index 48e560922be6..78acd9fe97e9 100644
--- a/trunk/arch/ia64/kernel/perfmon.c
+++ b/trunk/arch/ia64/kernel/perfmon.c
@@ -2654,11 +2654,11 @@ pfm_get_task(pfm_context_t *ctx, pid_t pid, struct task_struct **task)
 	/* XXX: need to add more checks here */
 	if (pid < 2) return -EPERM;
 
-	if (pid != current->pid) {
+	if (pid != task_pid_vnr(current)) {
 
 		read_lock(&tasklist_lock);
 
-		p = find_task_by_pid(pid);
+		p = find_task_by_vpid(pid);
 
 		/* make sure task cannot go away while we operate on it */
 		if (p) get_task_struct(p);