History

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

Ingo Molnar committed 16 years ago

Commit 3aabae72 parents 79e406d 57c072c599 files · +6527 −4395Browse files

Showing the changes to kernel/trace/ring_buffer.c (1 of 599 files). Show all

Unified · Split

kernel/trace/ring_buffer.c+0−2
@@ -2994,13 +2994,11 @@ static void rb_advance_reader(struct ring_buffer_per_cpu *cpu_buffer) · 2993 unmodified lines
2994 2994
2995static void rb_advance_iter(struct ring_buffer_iter *iter)2995static void rb_advance_iter(struct ring_buffer_iter *iter)
2996{2996{
2997 struct ring_buffer *buffer;
2998 struct ring_buffer_per_cpu *cpu_buffer;2997 struct ring_buffer_per_cpu *cpu_buffer;
2999 struct ring_buffer_event *event;2998 struct ring_buffer_event *event;
3000 unsigned length;2999 unsigned length;
3001 3000
3002 cpu_buffer = iter->cpu_buffer;3001 cpu_buffer = iter->cpu_buffer;
3003 buffer = cpu_buffer->buffer;
3004 3002
3005 /*3003 /*
3006 * Check if we are at the end of the buffer.3004 * Check if we are at the end of the buffer.