diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2015-12-02 11:34:07 +0100 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2016-02-13 00:35:00 +0100 |
| commit | 45bfbb643f3e4eb97a988e584110f09a74c4dcd5 (patch) | |
| tree | 20d8cf7a4622034f32e0f7abb8967c0dcd6e6339 | |
| parent | bea882098a0d18bebddd2183ed45004c90d0813b (diff) | |
| download | rt-linux-45bfbb643f3e4eb97a988e584110f09a74c4dcd5.tar.gz | |
rtmutex: trylock is okay on -RT
non-RT kernel could deadlock on rt_mutex_trylock() in softirq context. On
-RT we don't run softirqs in IRQ context but in thread context so it is
not a issue here.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
| -rw-r--r-- | kernel/locking/rtmutex.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index be416ad1718274..35162ab297746c 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -1478,7 +1478,11 @@ EXPORT_SYMBOL_GPL(rt_mutex_timed_lock); */ int __sched rt_mutex_trylock(struct rt_mutex *lock) { +#ifdef CONFIG_PREEMPT_RT_FULL + if (WARN_ON(in_irq() || in_nmi())) +#else if (WARN_ON(in_irq() || in_nmi() || in_serving_softirq())) +#endif return 0; return rt_mutex_fasttrylock(lock, rt_mutex_slowtrylock); |