Merge commit 'linus/master' into tracing/kprobes

[mv-sheeva.git] / kernel / trace / trace_event_profile.c

diff --git a/kernel/trace/trace_event_profile.c b/kernel/trace/trace_event_profile.c
index dd44b8768867f4e312d8792a98f5b38c015c605a..e812f1c1264cffb4ca36803dd0b11fc87f90d450 100644 (file)
--- a/kernel/trace/trace_event_profile.c
+++ b/kernel/trace/trace_event_profile.c
@@ -45,7 +45,7 @@ static int ftrace_profile_enable_event(struct ftrace_event_call *event)
                rcu_assign_pointer(trace_profile_buf_nmi, buf);
        }
 
-       ret = event->profile_enable();
+       ret = event->profile_enable(event);
        if (!ret)
                return 0;
 
@@ -84,7 +84,7 @@ static void ftrace_profile_disable_event(struct ftrace_event_call *event)
        if (!atomic_add_negative(-1, &event->profile_count))
                return;
 
-       event->profile_disable();
+       event->profile_disable(event);
 
        if (!--total_profile_count) {
                buf = trace_profile_buf;