---

yaml --- r: 304946 b: refs/heads/master c: 308f7ee h: refs/heads/master v: v3
git-mirror · May 16, 2012 · 370f3f1 · 370f3f1
1 parent b11dc02
commit 370f3f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 659f451ff21315ebfeeb46b9adccee8ce1b52c25
+refs/heads/master: 308f7eeb7882c27c1d7aa783499cb22f3b199718
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
@@ -945,6 +945,10 @@ static int rb_check_pages(struct ring_buffer_per_cpu *cpu_buffer)
 	struct list_head *head = cpu_buffer->pages;
 	struct buffer_page *bpage, *tmp;
 
+	/* Reset the head page if it exists */
+	if (cpu_buffer->head_page)
+		rb_set_head_page(cpu_buffer);
+
 	rb_head_page_deactivate(cpu_buffer);
 
 	if (RB_WARN_ON(cpu_buffer, head->next->prev != head))