summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-21 13:21:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-21 13:21:42 -0700
commit87ac6fa26e0e7ea49e1c8030e962effc05e1c5eb (patch)
treea5fffa16fc3131f057cf2791fd17d4959136323d /kernel
parent19746cad00a00a7a2e3eb0640d317d6e7c2e8cc0 (diff)
parent068e35eee9ef98eb4cab55181977e24995d273be (diff)
downloadop-kernel-dev-87ac6fa26e0e7ea49e1c8030e962effc05e1c5eb.zip
op-kernel-dev-87ac6fa26e0e7ea49e1c8030e962effc05e1c5eb.tar.gz
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: hw breakpoints: Fix pid namespace bug x86: Fix instruction breakpoint encoding oprofile: Add Support for Intel CPU Family 6 / Model 22 (Intel Celeron 540) kprobes: Fix Kconfig dependency
Diffstat (limited to 'kernel')
-rw-r--r--kernel/hw_breakpoint.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/hw_breakpoint.c b/kernel/hw_breakpoint.c
index d71a987..c7c2aed 100644
--- a/kernel/hw_breakpoint.c
+++ b/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);
OpenPOWER on IntegriCloud