diff --git a/[refs] b/[refs] index 9021bc72054d..fec4771746f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce181ebeff398e7d1a9c6cb92eb035a6d2d07489 +refs/heads/master: 700a3dcb9036d17d3a67d0a7ceee9d4373fbb570 diff --git a/trunk/block/blktrace.c b/trunk/block/blktrace.c index 1b2267c798b6..04d81d31fd94 100644 --- a/trunk/block/blktrace.c +++ b/trunk/block/blktrace.c @@ -1109,12 +1109,7 @@ static void blk_tracer_print_header(struct seq_file *m) static void blk_tracer_start(struct trace_array *tr) { - int cpu; - - tr->time_start = ftrace_now(tr->cpu); - - for_each_online_cpu(cpu) - tracing_reset(tr, cpu); + tracing_reset_online_cpus(tr); mutex_lock(&blk_probe_mutex); if (atomic_add_return(1, &blk_probes_ref) == 1)