diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:02:51 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:02:51 +0800 |
| commit | 95a8e64a288afaadb5e77210df0dfa02ffd0eb43 (patch) | |
| tree | 3bedc7c74219d261d89a47307e9b519820637093 /kernel/trace/trace.c | |
| parent | 52e49f436844e374d67859cbfb2c9cc62eb7e59b (diff) | |
| parent | 0e13335254d5d54933969dba1d7625f55e657f52 (diff) | |
Merge tag 'v3.18.72' into linux-linaro-lsk-v3.18lsk-v3.18-17.09
This is the 3.18.72 stable release
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 111dfd986dbf..941b21f7c8a4 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4966,7 +4966,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 |