tracing: Fix small merge bug
authorSteven Rostedt <rostedt@goodmis.org>
Tue, 30 Apr 2013 00:08:14 +0000 (20:08 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2013 14:23:08 +0000 (07:23 -0700)
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>
kernel/trace/trace.c

index 581630a6387d864ee6afd8ff77a78d69a7439ec4..ae6fa2d1cdf7dd75dd7e9aa4cfb66bcb32192315 100644 (file)
@@ -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;