Revert "migrate_disable pushd down in atomic_dec_and_spin_lock"
This reverts commit ff9c870c3e27d58c9512fad122e91436681fee5a. Cc: stable-rt@vger.kernel.org
This commit is contained in:
parent
136221c92f
commit
f9bdfa439a
|
@ -1166,12 +1166,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;
|
||||
rt_spin_lock(lock);
|
||||
if (atomic_dec_and_test(atomic)){
|
||||
migrate_disable();
|
||||
rt_spin_lock(lock);
|
||||
if (atomic_dec_and_test(atomic))
|
||||
return 1;
|
||||
}
|
||||
rt_spin_unlock(lock);
|
||||
migrate_enable();
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(atomic_dec_and_spin_lock);
|
||||
|
|
Loading…
Reference in New Issue