diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2009-06-05 20:11:30 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2009-06-09 18:33:30 +0200 |
| commit | f57a8a1911342265e7acdc190333c4e9235a6632 (patch) | |
| tree | db7aecf9dc26311068a48da77022e0377bf5d3d6 /kernel/trace/ring_buffer.c | |
| parent | ring-buffer: pass in lockdep class key for reader_lock (diff) | |
| download | linux-f57a8a1911342265e7acdc190333c4e9235a6632.tar.xz linux-f57a8a1911342265e7acdc190333c4e9235a6632.zip | |
ring-buffer: fix ret in rb_add_time_stamp
The update of ret got mistakenly added to the if statement of
rb_try_to_discard. The variable ret should be 1 on commit and zero
otherwise.
[ Impact: fix compiler warning and real bug ]
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/ring_buffer.c')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 22878b0d370c..2e642b2b7253 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -1433,8 +1433,8 @@ rb_add_time_stamp(struct ring_buffer_per_cpu *cpu_buffer, /* Darn, this is just wasted space */ event->time_delta = 0; event->array[0] = 0; - ret = 0; } + ret = 0; } *delta = 0; |