aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2013-04-29 20:08:14 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-30 07:23:08 -0700
commit6c24499f40d96bf07a85b709fb1bee5cea611a1d (patch)
tree7f6591997eeb5b8a74246acb22780b9189cc1d56
parent500fcbc4a9f91dfd011c9a6caec80a55e14fd338 (diff)
downloadlinux-6c24499f40d96bf07a85b709fb1bee5cea611a1d.tar.gz
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>
-rw-r--r--kernel/trace/trace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 581630a6387..ae6fa2d1cdf 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;