Now that the arch_{read,write}_relax macros default to cpu_relax(),
remove the redundant definitions for S390.
Since S390 provides an arch_spin_relax implementation, that function is
left alone and additionally defined as a macro, so the LOCKBREAK code
will pick it up.
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
---
arch/s390/include/asm/spinlock.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/s390/include/asm/spinlock.h b/arch/s390/include/asm/spinlock.h
index 701fe8c..944f4cd 100644
--- a/arch/s390/include/asm/spinlock.h
+++ b/arch/s390/include/asm/spinlock.h
@@ -43,6 +43,7 @@ extern void arch_spin_lock_wait(arch_spinlock_t *);
extern void arch_spin_lock_wait_flags(arch_spinlock_t *, unsigned long flags);
extern int arch_spin_trylock_retry(arch_spinlock_t *);
extern void arch_spin_relax(arch_spinlock_t *lock);
+#define arch_spin_relax arch_spin_relax
static inline void arch_spin_lock(arch_spinlock_t *lp)
{
@@ -170,7 +171,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw)
return _raw_write_trylock_retry(rw);
}
-#define arch_read_relax(lock) cpu_relax()
-#define arch_write_relax(lock) cpu_relax()
-
#endif /* __ASM_SPINLOCK_H */
--
1.8.2.2
--
To unsubscribe from this list: send the line "unsubscribe linux-arch" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
