Permalink
Browse files

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/…

…kernel/git/rostedt/linux-trace into perf/urgent

Pull ftrace ring-buffer fixes from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information...
2 parents 7ed97ad + 48fdc72 commit 25c037d64e7a0a8effb562babb2b6218829134ac Ingo Molnar committed Jul 6, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 kernel/trace/ring_buffer.c
@@ -1075,6 +1075,7 @@ rb_allocate_cpu_buffer(struct ring_buffer *buffer, int nr_pages, int cpu)
rb_init_page(bpage->page);
INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
+ INIT_LIST_HEAD(&cpu_buffer->new_pages);
ret = rb_allocate_pages(cpu_buffer, nr_pages);
if (ret < 0)
@@ -1346,10 +1347,9 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
* If something was added to this page, it was full
* since it is not the tail page. So we deduct the
* bytes consumed in ring buffer from here.
- * No need to update overruns, since this page is
- * deleted from ring buffer and its entries are
- * already accounted for.
+ * Increment overrun to account for the lost events.
*/
+ local_add(page_entries, &cpu_buffer->overrun);
local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
}

0 comments on commit 25c037d

Please sign in to comment.