Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent

[karo-tx-linux.git] / kernel / trace / trace_hw_branches.c

diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c
index b6a3e20a49a9f3ef3e4851de38017d961db548da..df21c1e72b95f865ab5ea2a21f3787463117dcf3 100644 (file)
--- a/kernel/trace/trace_hw_branches.c
+++ b/kernel/trace/trace_hw_branches.c
@@ -14,6 +14,7 @@
 #include <asm/ds.h>
 
 #include "trace.h"
+#include "trace_output.h"
 
 
 #define SIZEOF_BTS (1 << 13)
@@ -46,7 +47,7 @@ static void bts_trace_start(struct trace_array *tr)
 
        tracing_reset_online_cpus(tr);
 
-       for_each_cpu_mask(cpu, cpu_possible_map)
+       for_each_cpu(cpu, cpu_possible_mask)
                smp_call_function_single(cpu, bts_trace_start_cpu, NULL, 1);
 }
 
@@ -62,7 +63,7 @@ static void bts_trace_stop(struct trace_array *tr)
 {
        int cpu;
 
-       for_each_cpu_mask(cpu, cpu_possible_map)
+       for_each_cpu(cpu, cpu_possible_mask)
                smp_call_function_single(cpu, bts_trace_stop_cpu, NULL, 1);
 }
 
@@ -172,7 +173,7 @@ static void trace_bts_prepare(struct trace_iterator *iter)
 {
        int cpu;
 
-       for_each_cpu_mask(cpu, cpu_possible_map)
+       for_each_cpu(cpu, cpu_possible_mask)
                smp_call_function_single(cpu, trace_bts_cpu, iter->tr, 1);
 }