From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Deacon Subject: [PATCH RESEND 11/14] s390: locks: remove redundant arch_*_relax operations Date: Fri, 21 Feb 2014 17:34:58 +0000 Message-ID: <1393004101-25382-12-git-send-email-will.deacon@arm.com> References: <1393004101-25382-1-git-send-email-will.deacon@arm.com> Return-path: Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:44753 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932163AbaBURfK (ORCPT ); Fri, 21 Feb 2014 12:35:10 -0500 In-Reply-To: <1393004101-25382-1-git-send-email-will.deacon@arm.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: akpm@linux-foundation.org Cc: linux-arch@vger.kernel.org, Will Deacon , Martin Schwidefsky 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 Signed-off-by: Will Deacon --- 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 83e5d216105e..9ddf6c8ff9dd 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 int arch_spin_value_unlocked(arch_spinlock_t lock) { @@ -175,7 +176,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