---

yaml --- r: 311933 b: refs/heads/master c: 48fdc72 h: refs/heads/master i: 311931: 1a35c8d v: v3
git-mirror · Jun 29, 2012 · ec0ccc9 · ec0ccc9
1 parent 11e5e1f
commit ec0ccc9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44b99462d9d776522e174d6c531ce5ccef309e26
+refs/heads/master: 48fdc72f23ad9a9956e524a47843135d0bbc3317
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
@@ -1347,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);
 		}