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

[sfrench/cifs-2.6.git] / kernel / trace / trace_functions_graph.c

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index f8ac5417afc83a040d5fc9cfb93d72a60c983c80..3c545984816f35654b5fb8a72735bec75e9950f8 100644 (file)
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -80,7 +80,7 @@ print_graph_cpu(struct trace_seq *s, int cpu)
        int i;
        int ret;
        int log10_this = log10_cpu(cpu);
-       int log10_all = log10_cpu(cpus_weight_nr(cpu_online_map));
+       int log10_all = log10_cpu(cpumask_weight(cpu_online_mask));
 
 
        /*