Re: [tip:perf/core] perf events: Clean up pid passing

From: Peter Zijlstra
Date: Wed Sep 22 2010 - 08:23:10 EST


On Wed, 2010-09-15 at 10:03 +0000, tip-bot for Matt Helsley wrote:
> +++ b/kernel/hw_breakpoint.c
> @@ -433,8 +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, task_pid_vnr(tsk),
> - triggered);
> + return perf_event_create_kernel_counter(attr, -1, tsk, triggered);
> }
> EXPORT_SYMBOL_GPL(register_user_hw_breakpoint);
>

That seems to have gotten lost somehow..

/usr/src/linux-2.6/kernel/hw_breakpoint.c: In function âregister_user_hw_breakpointâ:
/usr/src/linux-2.6/kernel/hw_breakpoint.c:436: warning: passing argument 3 of âperf_event_create_kernel_counterâ makes pointer from integer without a cast
/usr/src/linux-2.6/include/linux/perf_event.h:909: note: expected âstruct task_struct *â but argument is of type âpid_tâ

The below cures it

---
diff --git a/kernel/hw_breakpoint.c b/kernel/hw_breakpoint.c
index 8f36c99..3b714e8 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, task_pid_vnr(tsk), triggered);
+ return perf_event_create_kernel_counter(attr, -1, tsk, triggered);
}
EXPORT_SYMBOL_GPL(register_user_hw_breakpoint);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/