diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-17 13:25:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-17 13:25:08 +0200 |
| commit | e9a174365794431860d9cee768ae97fafd08c4e9 (patch) | |
| tree | 56d593886c1637b168a694223a458c131febf229 /kernel | |
| parent | c9a694c65e9cf96c62116aa57c4b46c777f24e6f (diff) | |
| parent | 068e35eee9ef98eb4cab55181977e24995d273be (diff) | |
Merge branch 'perf/urgent' into auto-latest
Conflicts:
kernel/hw_breakpoint.c
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/hw_breakpoint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/hw_breakpoint.c b/kernel/hw_breakpoint.c index 3b714e839c10..8f36c99c5e9a 100644 --- a/kernel/hw_breakpoint.c +++ b/kernel/hw_breakpoint.c @@ -433,7 +433,7 @@ 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, triggered); + return perf_event_create_kernel_counter(attr, -1, task_pid_vnr(tsk), triggered); } EXPORT_SYMBOL_GPL(register_user_hw_breakpoint); |