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

From: Stephen Rothwell
Date: Tue Apr 09 2013 - 02:30:24 EST

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).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

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

- 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);
+ }


Attachment: pgp00000.pgp
Description: PGP signature