Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[mirror_ubuntu-bionic-kernel.git] / arch / s390 / include / asm / spinlock.h

diff --git a/arch/s390/include/asm/spinlock.h b/arch/s390/include/asm/spinlock.h
index 339e450b0567d3420d48528dac2aa6c7fa754f4c..8182b521c42f010e94e6c06e9a49e6f32bf307da 100644 (file)
--- a/arch/s390/include/asm/spinlock.h
+++ b/arch/s390/include/asm/spinlock.h
@@ -99,13 +99,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lp)
                : "=Q" (lp->lock) : "d" (0) : "cc", "memory");
 }
 
-static inline void arch_spin_unlock_wait(arch_spinlock_t *lock)
-{
-       while (arch_spin_is_locked(lock))
-               arch_spin_relax(lock);
-       smp_acquire__after_ctrl_dep();
-}
-
 /*
  * Read-write spinlocks, allowing multiple readers
  * but only one writer.