commit b15c7b1cee119999e9eafcd602d24a595e77adac
author Ingo Molnar <mingo@elte.hu> Wed Apr 14 12:15:23 2010 +0200
committer Ingo Molnar <mingo@elte.hu> Wed Apr 14 12:15:23 2010 +0200
tree 48765b70c65e80d62f0ce11a3245b4ef2299b060
parent c1ab9cab75098924fa8226a8a371de66977439df
parent aa27497c2fb4c7f57706099bd489e683e5cc3e3b

Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core

kernel/trace/trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 60f3b62..bed83ca 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1571,7 +1571,7 @@
 {
 	struct ring_buffer *buffer = iter->tr->buffer;
 	struct trace_entry *ent, *next = NULL;
-	unsigned long lost_events, next_lost = 0;
+	unsigned long lost_events = 0, next_lost = 0;
 	int cpu_file = iter->cpu_file;
 	u64 next_ts = 0, ts;
 	int next_cpu = -1;