diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-01-07 10:26:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-01-07 10:26:22 +0100 |
| commit | ff2576674c19c4b74acc4f6cc9bac3b94916350b (patch) | |
| tree | 01f648599bfeed726f25c337b695129c4222b32f | |
| parent | 2c1f1895ef2aa8f0e5497893eff71304aef332e1 (diff) | |
| parent | 0e1ff5d72a6393f2ef5dbf74f58bb55a12d63834 (diff) | |
| download | linux-stable-ff2576674c19c4b74acc4f6cc9bac3b94916350b.tar.gz linux-stable-ff2576674c19c4b74acc4f6cc9bac3b94916350b.tar.bz2 linux-stable-ff2576674c19c4b74acc4f6cc9bac3b94916350b.zip | |
Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
| -rw-r--r-- | kernel/trace/ring_buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 2326b04c95c4..edefe3b2801b 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -2869,7 +2869,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer) * Splice the empty reader page into the list around the head. */ reader = rb_set_head_page(cpu_buffer); - cpu_buffer->reader_page->list.next = reader->list.next; + cpu_buffer->reader_page->list.next = rb_list_head(reader->list.next); cpu_buffer->reader_page->list.prev = reader->list.prev; /* @@ -2906,7 +2906,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer) * * Now make the new head point back to the reader page. */ - reader->list.next->prev = &cpu_buffer->reader_page->list; + rb_list_head(reader->list.next)->prev = &cpu_buffer->reader_page->list; rb_inc_page(cpu_buffer, &cpu_buffer->head_page); /* Finally update the reader page to the new head */ |