migrate_disable pushd down in rt_spin_trylock_irqsave

Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index 7a7bb57f053154db1f938dfabb22012ce6bbc30a..cf0d7d0348f77590ca57e90fe757dad1d3393f14 100644 (file)
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -1166,12 +1166,11 @@ int __lockfunc rt_spin_trylock_irqsave(spinlock_t *lock, unsigned long *flags)
        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);