1 files changed, 27 insertions, 8 deletions

diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c
index 8d76403fcf89..e41f4008afc5 100644
--- a/arch/s390/lib/spinlock.c
+++ b/arch/s390/lib/spinlock.c
@@ -39,7 +39,7 @@ static inline void _raw_yield_cpu(int cpu)
                 _raw_yield();
 }
 
-void _raw_spin_lock_wait(raw_spinlock_t *lp, unsigned int pc)
+void _raw_spin_lock_wait(raw_spinlock_t *lp)
 {
         int count = spin_retry;
         unsigned int cpu = ~smp_processor_id();
@@ -53,15 +53,36 @@ void _raw_spin_lock_wait(raw_spinlock_t *lp, unsigned int pc)
                 }
                 if (__raw_spin_is_locked(lp))
                         continue;
-                if (_raw_compare_and_swap(&lp->owner_cpu, 0, cpu) == 0) {
-                        lp->owner_pc = pc;
+                if (_raw_compare_and_swap(&lp->owner_cpu, 0, cpu) == 0)
                         return;
-                }
         }
 }
 EXPORT_SYMBOL(_raw_spin_lock_wait);
 
-int _raw_spin_trylock_retry(raw_spinlock_t *lp, unsigned int pc)
+void _raw_spin_lock_wait_flags(raw_spinlock_t *lp, unsigned long flags)
+{
+        int count = spin_retry;
+        unsigned int cpu = ~smp_processor_id();
+
+        local_irq_restore(flags);
+        while (1) {
+                if (count-- <= 0) {
+                        unsigned int owner = lp->owner_cpu;
+                        if (owner != 0)
+                                _raw_yield_cpu(~owner);
+                        count = spin_retry;
+                }
+                if (__raw_spin_is_locked(lp))
+                        continue;
+                local_irq_disable();
+                if (_raw_compare_and_swap(&lp->owner_cpu, 0, cpu) == 0)
+                        return;
+                local_irq_restore(flags);
+        }
+}
+EXPORT_SYMBOL(_raw_spin_lock_wait_flags);
+
+int _raw_spin_trylock_retry(raw_spinlock_t *lp)
 {
         unsigned int cpu = ~smp_processor_id();
         int count;
@@ -69,10 +90,8 @@ int _raw_spin_trylock_retry(raw_spinlock_t *lp, unsigned int pc)
         for (count = spin_retry; count > 0; count--) {
                 if (__raw_spin_is_locked(lp))
                         continue;
-                if (_raw_compare_and_swap(&lp->owner_cpu, 0, cpu) == 0) {
-                        lp->owner_pc = pc;
+                if (_raw_compare_and_swap(&lp->owner_cpu, 0, cpu) == 0)
                         return 1;
-                }
         }
         return 0;
 }