On Mon, 15 Jan 2018 20:52:09 -0600
Tom Zanussi [off-list ref] wrote:

 static __always_inline int
 trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
 {
-	if (cpu_buffer->current_context >= 4)
+	if (cpu_buffer->current_context >= 6)

I can't apply this patch because the new context counting broke tracing
suspend and resume because it depended on the context recursive locking.

Link: http://lkml.kernel.org/r/20180116020051.776011914@goodmis.org

I added the attached two patches which appear to do the job.

Let me know what you think.

-- Steve