---

yaml --- r: 191445 b: refs/heads/master c: a838b2e h: refs/heads/master i: 191443: 84fc9ae v: v3
git-mirror · Apr 27, 2010 · 66ddcae · 66ddcae
1 parent 7206422
commit 66ddcae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72c9ddfd4c5bf54ef03cfdf57026416cb678eeba
+refs/heads/master: a838b2e634405fb89ddbf4fa9412acb33911911f
diff --git a/trunk/kernel/trace/ring_buffer_benchmark.c b/trunk/kernel/trace/ring_buffer_benchmark.c
@@ -113,7 +113,8 @@ static enum event_status read_page(int cpu)
 	ret = ring_buffer_read_page(buffer, &bpage, PAGE_SIZE, cpu, 1);
 	if (ret >= 0) {
 		rpage = bpage;
-		commit = local_read(&rpage->commit);
+		/* The commit may have missed event flags set, clear them */
+		commit = local_read(&rpage->commit) & 0xfffff;
 		for (i = 0; i < commit && !kill_test; i += inc) {
 
 			if (i >= (PAGE_SIZE - offsetof(struct rb_page, data))) {