diff options
| author | Steven Rostedt | 2013-04-30 02:08:14 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2013-04-30 16:23:08 +0200 |
| commit | 6c24499f40d96bf07a85b709fb1bee5cea611a1d (patch) | |
| tree | 7f6591997eeb5b8a74246acb22780b9189cc1d56 /kernel/trace | |
| parent | Merge tag 'localmodconfig-v3.10' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | kernel-qcow2-linux-6c24499f40d96bf07a85b709fb1bee5cea611a1d.tar.gz kernel-qcow2-linux-6c24499f40d96bf07a85b709fb1bee5cea611a1d.tar.xz kernel-qcow2-linux-6c24499f40d96bf07a85b709fb1bee5cea611a1d.zip | |
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>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 581630a6387d..ae6fa2d1cdf7 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; |