From 66ddcaed12595a975df23979e07de01312f33e69 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Tue, 27 Apr 2010 13:26:58 -0400 Subject: [PATCH] --- yaml --- r: 191445 b: refs/heads/master c: a838b2e634405fb89ddbf4fa9412acb33911911f h: refs/heads/master i: 191443: 84fc9aed80b9897ccfb55fd70ca750d4d261559a v: v3 --- [refs] | 2 +- trunk/kernel/trace/ring_buffer_benchmark.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bc21d9f73095..fb14529df4ca 100644 --- 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 index dc56556b55a2..302f8a614635 100644 --- 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))) {