Commit 6c24499f authored by Steven Rostedt's avatar Steven Rostedt Committed by Linus Torvalds
Browse files

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: default avatarSteven Rostedt <>
[ Duh. That was just silly of me  - Linus ]
Signed-off-by: default avatarLinus Torvalds <>
parent 500fcbc4
......@@ -904,7 +904,7 @@ update_max_tr_single(struct trace_array *tr, struct task_struct *tsk, int cpu)
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);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment