From: Steven Rostedt Date: Thu, 7 May 2009 23:58:55 +0000 (-0400) Subject: ring-buffer: change WARN_ON from checking preempt_count to preemptible X-Git-Tag: v2.6.31-rc1~401^2~56 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=74f4fd21664148b8c454cc07bfe74e4dd51cf07b;p=karo-tx-linux.git ring-buffer: change WARN_ON from checking preempt_count to preemptible There's a WARN_ON in the ring buffer code that makes sure preemption is disabled. It checks "!preempt_count()". But when CONFIG_PREEMPT is not enabled, preempt_count() is always zero, and this will trigger the warning. [ Impact: prevent false warning on non preemptible kernels ] Signed-off-by: Steven Rostedt --- diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 3ae5ccf2c0fc..361170609bd0 100644 --- a/kernel/trace/ring_buffer.c +++ b/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];