31 lines
924 B
Diff
31 lines
924 B
Diff
From 12e7b0fcf6bfc4035cec0a9ec0f30aaf3b3fe905 Mon Sep 17 00:00:00 2001
|
|
From: Nicholas Mc Guire <der.herr@hofr.at>
|
|
Date: Fri, 29 Nov 2013 00:17:27 -0500
|
|
Subject: [PATCH] migrate_disable pushd down in rt_spin_trylock_irqsave
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.0/patches-4.0.8-rt6.tar.xz
|
|
|
|
Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
kernel/locking/rtmutex.c | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
--- a/kernel/locking/rtmutex.c
|
|
+++ b/kernel/locking/rtmutex.c
|
|
@@ -1166,12 +1166,11 @@ int __lockfunc rt_spin_trylock_irqsave(s
|
|
int ret;
|
|
|
|
*flags = 0;
|
|
- migrate_disable();
|
|
ret = rt_mutex_trylock(&lock->lock);
|
|
- if (ret)
|
|
+ if (ret) {
|
|
+ migrate_disable();
|
|
spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
|
|
- else
|
|
- migrate_enable();
|
|
+ }
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL(rt_spin_trylock_irqsave);
|