Patch "tracing: Apply trace_clock changes to instance max buffer" has been added to the 4.9-stable tree

This is a note to let you know that I've just added the patch titled

tracing: Apply trace_clock changes to instance max buffer

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tracing-apply-trace_clock-changes-to-instance-max-buffer.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Baohong Liu <[email protected]>
Date: Tue, 5 Sep 2017 16:57:19 -0500
Subject: tracing: Apply trace_clock changes to instance max buffer

From: Baohong Liu <[email protected]>

commit 170b3b1050e28d1ba0700e262f0899ffa4fccc52 upstream.

Currently trace_clock timestamps are applied to both regular and max buffers only for global trace. For instance trace, trace_clock timestamps are applied only to regular buffer. But, regular and max buffers can be swapped, for example, following a snapshot. So, for instance trace, bad timestamps can be seen following a snapshot. Let's apply trace_clock timestamps to instance max buffer as well.

---
 kernel/trace/trace.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -5664,7 +5664,7 @@ static int tracing_set_clock(struct trac
 	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

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/tracing-apply-trace_clock-changes-to-instance-max-buffer.patch