diff options
| author | Nicholas Mc Guire <der.herr@hofr.at> | 2013-11-29 05:17:27 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:20:44 (GMT) |
| commit | 4836ea009b50fab8c580790bee435af7c2b2b3ac (patch) | |
| tree | 35fbe424de0ff4047861e48634d448bb9c6e53ae /kernel | |
| parent | d667c24543ec07b01423256e67f0f3d7ba9a76cc (diff) | |
| download | linux-fsl-qoriq-4836ea009b50fab8c580790bee435af7c2b2b3ac.tar.xz | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/rtmutex.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c index dede95d..eb94c48 100644 --- a/kernel/rtmutex.c +++ b/kernel/rtmutex.c @@ -1059,12 +1059,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); |