git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
c1ab9ca
)
Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
author
Ingo Molnar
<mingo@elte.hu>
Wed, 14 Apr 2010 10:15:23 +0000
(12:15 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 14 Apr 2010 10:15:23 +0000
(12:15 +0200)
kernel/trace/trace.c
patch
|
blob
|
history
diff --git
a/kernel/trace/trace.c
b/kernel/trace/trace.c
index
60f3b62
..
bed83ca
100644
(file)
--- a/
kernel/trace/trace.c
+++ b/
kernel/trace/trace.c
@@
-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;