diff options
author | Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | 2011-03-16 19:05:54 -0400 |
---|---|---|
committer | Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> | 2011-03-16 19:05:54 -0400 |
commit | 307f98a753f78996b7d1809e7fbf7ecfad03ff48 (patch) | |
tree | 59e4ecdd2925b1986ab13c3507afbd4972fb1de7 /kernel | |
parent | 065e87f30d1a7b74cbbd551342eb57cde1c258ed (diff) |
markers-update-to-2.6.35-tracepoints
markers update to 2.6.35 tracepoints
Add extra parameter to register.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/marker.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/marker.c b/kernel/marker.c index 619d868377e..56b51b7d102 100644 --- a/kernel/marker.c +++ b/kernel/marker.c @@ -598,11 +598,11 @@ static int set_marker(struct marker_entry *entry, struct marker *elem, BUG_ON(!ret); ret = tracepoint_probe_register_noupdate( elem->tp_name, - elem->tp_cb); + elem->tp_cb, NULL); } else { ret = tracepoint_probe_unregister_noupdate( elem->tp_name, - elem->tp_cb); + elem->tp_cb, NULL); /* * tracepoint_probe_update_all() must be called * before the module containing tp_cb is unloaded. @@ -634,7 +634,7 @@ static void disable_marker(struct marker *elem) * checking has been done in the __trace_mark_tp() macro. */ ret = tracepoint_probe_unregister_noupdate(elem->tp_name, - elem->tp_cb); + elem->tp_cb, NULL); WARN_ON(ret); /* * tracepoint_probe_update_all() must be called |