32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From f556726721d611754d20ff00226fe029e2495274 Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Fri, 2 May 2014 17:32:30 +0200
|
|
Subject: [PATCH] Revert "migrate_disable pushd down in
|
|
atomic_dec_and_spin_lock"
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/3.14/patches-3.14.12-rt9.tar.xz
|
|
|
|
This reverts commit ff9c870c3e27d58c9512fad122e91436681fee5a.
|
|
Cc: stable-rt@vger.kernel.org
|
|
---
|
|
kernel/locking/rtmutex.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/kernel/locking/rtmutex.c
|
|
+++ b/kernel/locking/rtmutex.c
|
|
@@ -1028,12 +1028,12 @@ int atomic_dec_and_spin_lock(atomic_t *a
|
|
/* 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)){
|
|
- migrate_disable();
|
|
+ if (atomic_dec_and_test(atomic))
|
|
return 1;
|
|
- }
|
|
rt_spin_unlock(lock);
|
|
+ migrate_enable();
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(atomic_dec_and_spin_lock);
|