Merge tag 'nfsd-5.9' of git://git.linux-nfs.org/projects/cel/cel-2.6

[linux-2.6-microblaze.git] / kernel / trace / trace_hwlat.c

diff --git a/kernel/trace/trace_hwlat.c b/kernel/trace/trace_hwlat.c
index e2be7bb..17873e5 100644 (file)
--- a/kernel/trace/trace_hwlat.c
+++ b/kernel/trace/trace_hwlat.c
@@ -283,6 +283,7 @@ static bool disable_migrate;
 static void move_to_next_cpu(void)
 {
        struct cpumask *current_mask = &save_cpumask;
+       struct trace_array *tr = hwlat_trace;
        int next_cpu;
 
        if (disable_migrate)
@@ -296,7 +297,7 @@ static void move_to_next_cpu(void)
                goto disable;
 
        get_online_cpus();
-       cpumask_and(current_mask, cpu_online_mask, tracing_buffer_mask);
+       cpumask_and(current_mask, cpu_online_mask, tr->tracing_cpumask);
        next_cpu = cpumask_next(smp_processor_id(), current_mask);
        put_online_cpus();
 
@@ -371,9 +372,8 @@ static int start_kthread(struct trace_array *tr)
                return 0;
 
        /* Just pick the first CPU on first iteration */
-       current_mask = &save_cpumask;
        get_online_cpus();
-       cpumask_and(current_mask, cpu_online_mask, tracing_buffer_mask);
+       cpumask_and(current_mask, cpu_online_mask, tr->tracing_cpumask);
        put_online_cpus();
        next_cpu = cpumask_first(current_mask);