diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-14 06:15:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-14 06:15:23 -0400 |
| commit | b15c7b1cee119999e9eafcd602d24a595e77adac (patch) | |
| tree | 48765b70c65e80d62f0ce11a3245b4ef2299b060 /kernel/trace/trace.c | |
| parent | c1ab9cab75098924fa8226a8a371de66977439df (diff) | |
| parent | aa27497c2fb4c7f57706099bd489e683e5cc3e3b (diff) | |
Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 60f3b6289731..bed83cab6da2 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -1571,7 +1571,7 @@ __find_next_entry(struct trace_iterator *iter, int *ent_cpu, | |||
| 1571 | { | 1571 | { |
| 1572 | struct ring_buffer *buffer = iter->tr->buffer; | 1572 | struct ring_buffer *buffer = iter->tr->buffer; |
| 1573 | struct trace_entry *ent, *next = NULL; | 1573 | struct trace_entry *ent, *next = NULL; |
| 1574 | unsigned long lost_events, next_lost = 0; | 1574 | unsigned long lost_events = 0, next_lost = 0; |
| 1575 | int cpu_file = iter->cpu_file; | 1575 | int cpu_file = iter->cpu_file; |
| 1576 | u64 next_ts = 0, ts; | 1576 | u64 next_ts = 0, ts; |
| 1577 | int next_cpu = -1; | 1577 | int next_cpu = -1; |