aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-06-05 14:11:30 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-06-09 12:33:30 -0400
commitf57a8a1911342265e7acdc190333c4e9235a6632 (patch)
treedb7aecf9dc26311068a48da77022e0377bf5d3d6
parent1f8a6a10fb9437eac3f516ea4324a19087872f30 (diff)
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>
-rw-r--r--kernel/trace/ring_buffer.c2
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,
1433 /* Darn, this is just wasted space */ 1433 /* Darn, this is just wasted space */
1434 event->time_delta = 0; 1434 event->time_delta = 0;
1435 event->array[0] = 0; 1435 event->array[0] = 0;
1436 ret = 0;
1437 } 1436 }
1437 ret = 0;
1438 } 1438 }
1439 1439
1440 *delta = 0; 1440 *delta = 0;