Commit aa27497c authored Apr 05, 2010 by Lai Jiangshan Committed by Steven Rostedt Apr 05, 2010

tracing: Fix uninitialized variable of tracing/trace output

Because a local variable is not initialized, I got these
when I did 'cat tracing/trace'. (not trace_pipe):

CPU:0 [LOST 18446744071579453134 EVENTS]
ps-3099 [000] 560.770221: lock_acquire: ffff880030865010 &(&dentry->d_lock)->rlock
CPU:0 [LOST 18446744071579453134 EVENTS]
ps-3099 [000] 560.770221: lock_release: ffff880030865010 &(&dentry->d_lock)->rlock
CPU:0 [LOST 18446612133255294080 EVENTS]
ps-3099 [000] 560.770221: lock_acquire: ffff880030865010 &(&dentry->d_lock)->rlock
CPU:0 [LOST 18446744071579453134 EVENTS]
ps-3099 [000] 560.770222: lock_release: ffff880030865010 &(&dentry->d_lock)->rlock
CPU:0 [LOST 18446744071579453134 EVENTS]
ps-3099 [000] 560.770222: lock_release: ffffffff816cfb98 dcache_lock

See peek_next_entry(), it does not set *lost_events when we 'cat tracing/trace'

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
LKML-Reference: <4BB9A929.2000303@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent ff0ff84a

kernel/trace/trace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1571,7 +1571,7 @@ __find_next_entry(struct trace_iterator iter, int ent_cpu,
		{
		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;

Admin message