diff options
Diffstat (limited to 'kernel/locking/mutex.c')
-rw-r--r-- | kernel/locking/mutex.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index 4cccea6b8934..a8546e29671e 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c | |||
@@ -27,6 +27,8 @@ | |||
27 | #include <linux/debug_locks.h> | 27 | #include <linux/debug_locks.h> |
28 | #include <linux/osq_lock.h> | 28 | #include <linux/osq_lock.h> |
29 | 29 | ||
30 | #include <litmus/litmus.h> /* for is_realtime() */ | ||
31 | |||
30 | /* | 32 | /* |
31 | * In the DEBUG case we are using the "NULL fastpath" for mutexes, | 33 | * In the DEBUG case we are using the "NULL fastpath" for mutexes, |
32 | * which forces all calls into the slowpath: | 34 | * which forces all calls into the slowpath: |
@@ -368,7 +370,7 @@ static bool mutex_optimistic_spin(struct mutex *lock, | |||
368 | * we're an RT task that will live-lock because we won't let | 370 | * we're an RT task that will live-lock because we won't let |
369 | * the owner complete. | 371 | * the owner complete. |
370 | */ | 372 | */ |
371 | if (!owner && (need_resched() || rt_task(task))) | 373 | if (!owner && (need_resched() || rt_task(task) || is_realtime(task))) |
372 | break; | 374 | break; |
373 | 375 | ||
374 | /* | 376 | /* |