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

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

diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c
index cb2ff3e..0e94b3d 100644 (file)
--- a/kernel/trace/trace_boot.c
+++ b/kernel/trace/trace_boot.c
@@ -43,7 +43,7 @@ static int boot_trace_init(struct trace_array *tr)
        int cpu;
        boot_trace = tr;
 
-       for_each_cpu_mask(cpu, cpu_possible_map)
+       for_each_cpu(cpu, cpu_possible_mask)
                tracing_reset(tr, cpu);
 
        tracing_sched_switch_assign_trace(tr);