linux-next: manual merge of the ftrace tree with Linus' tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the ftrace tree with Linus' tree
Date: Tue, 9 Apr 2013 16:30:06 +1000	[thread overview]
Message-ID: <20130409163006.ed6b04b4a91d41b4633a4b4d@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1196 bytes --]

Hi Steven,

Today's linux-next merge of the ftrace tree got a conflict in
kernel/trace/trace.c between commit 2930e04d00e1 ("tracing: Fix race with
update_max_tr_single and changing tracers") from Linus' tree and commits
2b6080f28c7c ("tracing: Encapsulate global_trace and remove dependencies
on global vars") and 45ad21ca5530 ("tracing: Have trace_array keep track
if snapshot buffer is allocated") from the ftrace tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc kernel/trace/trace.c
index 7ba7fc7,829b2be..963491a

--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@@ -744,11 -904,8 +904,11 @@@ update_max_tr_single(struct trace_arra
  		return;
  
  	WARN_ON_ONCE(!irqs_disabled());
- 	if (!current_trace->allocated_snapshot) {
 -	if (WARN_ON_ONCE(!tr->allocated_snapshot))
++	if (!tr->allocated_snapshot) {
 +		/* Only the nop tracer should hit this when disabling */
- 		WARN_ON_ONCE(current_trace != &nop_trace);
++		WARN_ON_ONCE(tr->current_trace != &nop_trace);
  		return;
 +	}
  
  	arch_spin_lock(&ftrace_max_lock);
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
