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

[deliverable/linux.git] / kernel / trace / trace_power.c

diff --git a/kernel/trace/trace_power.c b/kernel/trace/trace_power.c
index a7172a352f626b263e4a4226d39cb732224a979c..faa6ab7a1f5c589b92a9b4ea7e23f20168ea6263 100644 (file)
--- a/kernel/trace/trace_power.c
+++ b/kernel/trace/trace_power.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 
 #include "trace.h"
+#include "trace_output.h"
 
 static struct trace_array *power_trace;
 static int __read_mostly trace_power_enabled;
@@ -39,7 +40,7 @@ static int power_trace_init(struct trace_array *tr)
 
        trace_power_enabled = 1;
 
-       for_each_cpu_mask(cpu, cpu_possible_map)
+       for_each_cpu(cpu, cpu_possible_mask)
                tracing_reset(tr, cpu);
        return 0;
 }