Commit 74f4fd21 authored May 07, 2009 by Steven Rostedt Committed by Steven Rostedt May 07, 2009

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 <rostedt@goodmis.org>

parent 7da3046d

kernel/trace/ring_buffer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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];