From 39316fba7be3df83e4a60f3c3fa23a51ba5a42c2 Mon Sep 17 00:00:00 2001
From: Matt Helsley <matthltc@us.ibm.com>
Date: Mon, 13 Sep 2010 13:01:18 -0700
Subject: [PATCH] --- yaml --- r: 210883 b: refs/heads/master c:
 068e35eee9ef98eb4cab55181977e24995d273be h: refs/heads/master i:   210881:
 e32475c60f8b5addda7bb911a2ea0043ae0a7c18   210879:
 b04e3610bc61b88d425e8fa7084e50919621f578 v: v3

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

diff --git a/[refs] b/[refs]
index a8e97dd5ef02..6ce4f877f009 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89e45aac42d40426c97e6901811309bf49c4993f
+refs/heads/master: 068e35eee9ef98eb4cab55181977e24995d273be
diff --git a/trunk/kernel/hw_breakpoint.c b/trunk/kernel/hw_breakpoint.c
index d71a987fd2bf..c7c2aed9e2dc 100644
--- a/trunk/kernel/hw_breakpoint.c
+++ b/trunk/kernel/hw_breakpoint.c
@@ -433,7 +433,8 @@ register_user_hw_breakpoint(struct perf_event_attr *attr,
 			    perf_overflow_handler_t triggered,
 			    struct task_struct *tsk)
 {
-	return perf_event_create_kernel_counter(attr, -1, tsk->pid, triggered);
+	return perf_event_create_kernel_counter(attr, -1, task_pid_vnr(tsk),
+						triggered);
 }
 EXPORT_SYMBOL_GPL(register_user_hw_breakpoint);