diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:03:25 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:03:25 +0800 |
| commit | a759573d34fc8249c416857e15cf8d0fd9c99d1a (patch) | |
| tree | cb2d530d42301f84382686fd343f71223e9af157 /kernel/trace/trace.c | |
| parent | eebd4781fb3bb7b47568d8747d97d269d2649ec9 (diff) | |
| parent | cda2b9481445e798669f00fb8275d595f1ff943f (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-17.09-android
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 70f519e8489e..f80daeeaf29a 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -5327,7 +5327,7 @@ static int tracing_set_clock(struct trace_array *tr, const char *clockstr) tracing_reset_online_cpus(&tr->trace_buffer); #ifdef CONFIG_TRACER_MAX_TRACE - if (tr->flags & TRACE_ARRAY_FL_GLOBAL && tr->max_buffer.buffer) + if (tr->max_buffer.buffer) ring_buffer_set_clock(tr->max_buffer.buffer, trace_clocks[i].func); tracing_reset_online_cpus(&tr->max_buffer); #endif |