---

yaml --- r: 146153 b: refs/heads/master c: 74f4fd2 h: refs/heads/master i: 146151: c58c7aa v: v3
git-mirror · May 8, 2009 · a96d458 · a96d458
1 parent 1f4f5f8
commit a96d458
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7da3046d6ce6ea97494020081c509b642b7016af
+refs/heads/master: 74f4fd21664148b8c454cc07bfe74e4dd51cf07b
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
@@ -1688,7 +1688,7 @@ void ring_buffer_discard_commit(struct ring_buffer *buffer,
 	 * committed yet. Thus we can assume that preemption
 	 * is still disabled.
 	 */
-	RB_WARN_ON(buffer, !preempt_count());
+	RB_WARN_ON(buffer, preemptible());
 
 	cpu = smp_processor_id();
 	cpu_buffer = buffer->buffers[cpu];