These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / kernel / trace / trace_branch.c

diff --git a/kernel/kernel/trace/trace_branch.c b/kernel/kernel/trace/trace_branch.c
index 1879980..3a2a737 100644 (file)
--- a/kernel/kernel/trace/trace_branch.c
+++ b/kernel/kernel/trace/trace_branch.c
@@ -29,7 +29,7 @@ static struct trace_array *branch_tracer;
 static void
 probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
 {
-       struct ftrace_event_call *call = &event_branch;
+       struct trace_event_call *call = &event_branch;
        struct trace_array *tr = branch_tracer;
        struct trace_array_cpu *data;
        struct ring_buffer_event *event;
@@ -125,25 +125,14 @@ void disable_branch_tracing(void)
        mutex_unlock(&branch_tracing_mutex);
 }
 
-static void start_branch_trace(struct trace_array *tr)
-{
-       enable_branch_tracing(tr);
-}
-
-static void stop_branch_trace(struct trace_array *tr)
-{
-       disable_branch_tracing();
-}
-
 static int branch_trace_init(struct trace_array *tr)
 {
-       start_branch_trace(tr);
-       return 0;
+       return enable_branch_tracing(tr);
 }
 
 static void branch_trace_reset(struct trace_array *tr)
 {
-       stop_branch_trace(tr);
+       disable_branch_tracing();
 }
 
 static enum print_line_t trace_branch_print(struct trace_iterator *iter,
@@ -194,7 +183,7 @@ __init static int init_branch_tracer(void)
 {
        int ret;
 
-       ret = register_ftrace_event(&trace_branch_event);
+       ret = register_trace_event(&trace_branch_event);
        if (!ret) {
                printk(KERN_WARNING "Warning: could not register "
                                    "branch events\n");