diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-09 14:32:35 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-09 14:32:35 +0800 |
| commit | fb687505984514536ca50a9344dd6128b2181a18 (patch) | |
| tree | 4f2be9321503ebfbcd8b4f8b3bc53cad806f9754 /kernel/trace | |
| parent | a759573d34fc8249c416857e15cf8d0fd9c99d1a (diff) | |
| parent | 11c5615ee573326a1ea6cdff116bf0057934d5d1 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index f80daeeaf29a..23de746b2195 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -3272,11 +3272,17 @@ static int tracing_open(struct inode *inode, struct file *file) /* If this file was open for write, then erase contents */ if ((file->f_mode & FMODE_WRITE) && (file->f_flags & O_TRUNC)) { int cpu = tracing_get_cpu(inode); + struct trace_buffer *trace_buf = &tr->trace_buffer; + +#ifdef CONFIG_TRACER_MAX_TRACE + if (tr->current_trace->print_max) + trace_buf = &tr->max_buffer; +#endif if (cpu == RING_BUFFER_ALL_CPUS) - tracing_reset_online_cpus(&tr->trace_buffer); + tracing_reset_online_cpus(trace_buf); else - tracing_reset(&tr->trace_buffer, cpu); + tracing_reset(trace_buf, cpu); } if (file->f_mode & FMODE_READ) { @@ -4791,7 +4797,7 @@ static int tracing_wait_pipe(struct file *filp) * * iter->pos will be 0 if we haven't read anything. */ - if (!tracing_is_on() && iter->pos) + if (!tracer_tracing_is_on(iter->tr) && iter->pos) break; mutex_unlock(&iter->mutex); |