2 files changed, 20 insertions, 2 deletions

diff --git a/arch/tile/lib/spinlock_32.c b/arch/tile/lib/spinlock_32.c
index b34f79aada48..88c2a53362e7 100644
--- a/arch/tile/lib/spinlock_32.c
+++ b/arch/tile/lib/spinlock_32.c
@@ -65,8 +65,17 @@ EXPORT_SYMBOL(arch_spin_trylock);
 void arch_spin_unlock_wait(arch_spinlock_t *lock)
 {
         u32 iterations = 0;
-        while (arch_spin_is_locked(lock))
+        int curr = READ_ONCE(lock->current_ticket);
+        int next = READ_ONCE(lock->next_ticket);
+
+        /* Return immediately if unlocked. */
+        if (next == curr)
+                return;
+
+        /* Wait until the current locker has released the lock. */
+        do {
                 delay_backoff(iterations++);
+        } while (READ_ONCE(lock->current_ticket) == curr);
 }
 EXPORT_SYMBOL(arch_spin_unlock_wait);
 
diff --git a/arch/tile/lib/spinlock_64.c b/arch/tile/lib/spinlock_64.c
index d6fb9581e980..c8d1f94ff1fe 100644
--- a/arch/tile/lib/spinlock_64.c
+++ b/arch/tile/lib/spinlock_64.c
@@ -65,8 +65,17 @@ EXPORT_SYMBOL(arch_spin_trylock);
 void arch_spin_unlock_wait(arch_spinlock_t *lock)
 {
         u32 iterations = 0;
-        while (arch_spin_is_locked(lock))
+        u32 val = READ_ONCE(lock->lock);
+        u32 curr = arch_spin_current(val);
+
+        /* Return immediately if unlocked. */
+        if (arch_spin_next(val) == curr)
+                return;
+
+        /* Wait until the current locker has released the lock. */
+        do {
                 delay_backoff(iterations++);
+        } while (arch_spin_current(READ_ONCE(lock->lock)) == curr);
 }
 EXPORT_SYMBOL(arch_spin_unlock_wait);