diff options
| author | Nicholas Mc Guire <der.herr@hofr.at> | 2013-11-29 05:19:41 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-10 00:19:26 (GMT) |
| commit | 9205c26d46c2ead7e5c842a0e017ab7198a441a4 (patch) | |
| tree | 10c4df9cb9a47a0cb0bf0f0c313c81acbc4c4adc /kernel/rtmutex.c | |
| parent | ea6767f8b4469261eb3b5e9308ff170bcfbfa7bf (diff) | |
| download | linux-fsl-qoriq-9205c26d46c2ead7e5c842a0e017ab7198a441a4.tar.xz | |
migrate_disable pushd down in atomic_dec_and_spin_lock
Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'kernel/rtmutex.c')
| -rw-r--r-- | kernel/rtmutex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c index 1c4808f..f6b6ebb 100644 --- a/kernel/rtmutex.c +++ b/kernel/rtmutex.c @@ -935,12 +935,12 @@ int atomic_dec_and_spin_lock(atomic_t *atomic, spinlock_t *lock) /* Subtract 1 from counter unless that drops it to 0 (ie. it was 1) */ if (atomic_add_unless(atomic, -1, 1)) return 0; - migrate_disable(); rt_spin_lock(lock); - if (atomic_dec_and_test(atomic)) + if (atomic_dec_and_test(atomic)){ + migrate_disable(); return 1; + } rt_spin_unlock(lock); - migrate_enable(); return 0; } EXPORT_SYMBOL(atomic_dec_and_spin_lock); |