Merge branches 'tracing/branch-tracer', 'tracing/ftrace', 'tracing/function-return...

[safe/jmp/linux-2.6] / kernel / trace / trace_branch.c

diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
index 8526555..23f9b02 100644 (file)
--- a/kernel/trace/trace_branch.c
+++ b/kernel/trace/trace_branch.c
@@ -41,7 +41,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
        if (unlikely(!tr))
                return;
 
-       local_irq_save(flags);
+       raw_local_irq_save(flags);
        cpu = raw_smp_processor_id();
        if (atomic_inc_return(&tr->data[cpu]->disabled) != 1)
                goto out;
@@ -73,7 +73,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
 
  out:
        atomic_dec(&tr->data[cpu]->disabled);
-       local_irq_restore(flags);
+       raw_local_irq_restore(flags);
 }
 
 static inline
@@ -125,7 +125,7 @@ static void stop_branch_trace(struct trace_array *tr)
        disable_branch_tracing();
 }
 
-static void branch_trace_init(struct trace_array *tr)
+static int branch_trace_init(struct trace_array *tr)
 {
        int cpu;
 
@@ -133,6 +133,7 @@ static void branch_trace_init(struct trace_array *tr)
                tracing_reset(tr, cpu);
 
        start_branch_trace(tr);
+       return 0;
 }
 
 static void branch_trace_reset(struct trace_array *tr)