diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-06 11:15:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-10 10:27:06 +0200 |
| commit | 25c037d64e7a0a8effb562babb2b6218829134ac (patch) | |
| tree | 61b4fe2affd882007856f5dd4ac5b8bbb29798dc | |
| parent | 7ed97ad41ffa94040dfd593948962a7e9e7b0db9 (diff) | |
| parent | 48fdc72f23ad9a9956e524a47843135d0bbc3317 (diff) | |
| download | linux-25c037d64e7a0a8effb562babb2b6218829134ac.tar.gz linux-25c037d64e7a0a8effb562babb2b6218829134ac.tar.bz2 linux-25c037d64e7a0a8effb562babb2b6218829134ac.zip | |
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>
| -rw-r--r-- | kernel/trace/ring_buffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 1d0f6a8a0e5e..f765465bffe4 100644 --- a/kernel/trace/ring_buffer.c +++ b/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); } |