From: Steven Rostedt <rostedt@goodmis.org>
Date: Tue, 30 Apr 2013 00:08:14 +0000 (-0400)
Subject: tracing: Fix small merge bug
X-Git-Tag: v3.12-rc1~984
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c24499f40d96bf07a85b709fb1bee5cea611a1d;p=kernel%2Fkernel-generic.git

tracing: Fix small merge bug

During the 3.10 merge, a conflict happened and the resolution was
almost, but not quite, correct. An if statement was reversed.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
[ Duh. That was just silly of me  - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 581630a..ae6fa2d 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -904,7 +904,7 @@ update_max_tr_single(struct trace_array *tr, struct task_struct *tsk, int cpu)
 		return;
 
 	WARN_ON_ONCE(!irqs_disabled());
-	if (tr->allocated_snapshot) {
+	if (!tr->allocated_snapshot) {
 		/* Only the nop tracer should hit this when disabling */
 		WARN_ON_ONCE(tr->current_trace != &nop_trace);
 		return;