From a96d458a2373913a209645a805b9cd2c6ab7d5e0 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Thu, 7 May 2009 19:58:55 -0400 Subject: [PATCH] --- yaml --- r: 146153 b: refs/heads/master c: 74f4fd21664148b8c454cc07bfe74e4dd51cf07b h: refs/heads/master i: 146151: c58c7aac5aa8c453044b5ecfb203e48edb1477a7 v: v3 --- [refs] | 2 +- trunk/kernel/trace/ring_buffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index afb8c76ec346..7067e5cec394 100644 --- 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 index 3ae5ccf2c0fc..361170609bd0 100644 --- 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];