diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2012-03-01 13:55:32 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-04 09:14:59 -0500 |
| commit | 469ea228aa44dbcaa3068569999494221e7a5e0a (patch) | |
| tree | 4b207a3971d58bb986773542442f615fd34d91c5 | |
| parent | b8eb9d68790fd02c1432f000095b37ee03831240 (diff) | |
ring-buffer/rt: Check for irqs disabled before grabbing reader lock
In RT the reader lock is a mutex and we can not grab it when preemption is
disabled. The in_atomic() check that is there does not check if irqs are
disabled. Add that check as well.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Carsten Emde <C.Emde@osadl.org>
Cc: John Kacur <jkacur@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Clark Williams <clark.williams@gmail.com>
Cc: stable-rt@vger.kernel.org
Link: http://lkml.kernel.org/r/20120301190345.786365803@goodmis.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | kernel/trace/ring_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 354017f455e5..c060f04adec6 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -1054,7 +1054,7 @@ static inline int ok_to_lock(void) if (in_nmi()) return 0; #ifdef CONFIG_PREEMPT_RT_FULL - if (in_atomic()) + if (in_atomic() || irqs_disabled()) return 0; #endif return 1; |