Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add the "timers: do not raise softirq unconditionally" temporarily
[kvmfornfv.git]
/
kernel
/
kernel
/
locking
/
rtmutex.c
diff --git
a/kernel/kernel/locking/rtmutex.c
b/kernel/kernel/locking/rtmutex.c
index
6697100
..
30777e8
100644
(file)
--- a/
kernel/kernel/locking/rtmutex.c
+++ b/
kernel/kernel/locking/rtmutex.c
@@
-2058,13
+2058,6
@@
EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
*/
int __sched rt_mutex_trylock(struct rt_mutex *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);
}
EXPORT_SYMBOL_GPL(rt_mutex_trylock);
return rt_mutex_fasttrylock(lock, rt_mutex_slowtrylock);
}
EXPORT_SYMBOL_GPL(rt_mutex_trylock);