From: Will Deacon Subject: [PATCH RESEND 08/14] metag: locks: remove redundant arch_*_relax operations Date: Fri, 21 Feb 2014 17:34:55 +0000 Message-ID: <1393004101-25382-9-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]:44741 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933170AbaBURfJ (ORCPT ); Fri, 21 Feb 2014 12:35:09 -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 Now that the arch_{spin,read,write}_relax macros default to cpu_relax(), remove the redundant definitions for metag. This patch also removes the duplicate definitions of arch_{read,write}_lock_flags. Acked-by: James Hogan Signed-off-by: Will Deacon --- arch/metag/include/asm/spinlock.h | 4 ---- arch/metag/include/asm/spinlock_lnkget.h | 7 ------- 2 files changed, 11 deletions(-) diff --git a/arch/metag/include/asm/spinlock.h b/arch/metag/include/asm/spinlock.h index 86a7cf3d1386..15cf4ff57f74 100644 --- a/arch/metag/include/asm/spinlock.h +++ b/arch/metag/include/asm/spinlock.h @@ -15,8 +15,4 @@ #define arch_read_lock_flags(lock, flags) arch_read_lock(lock) #define arch_write_lock_flags(lock, flags) arch_write_lock(lock) -#define arch_spin_relax(lock) cpu_relax() -#define arch_read_relax(lock) cpu_relax() -#define arch_write_relax(lock) cpu_relax() - #endif /* __ASM_SPINLOCK_H */ diff --git a/arch/metag/include/asm/spinlock_lnkget.h b/arch/metag/include/asm/spinlock_lnkget.h index ad8436feed8d..73d034596c18 100644 --- a/arch/metag/include/asm/spinlock_lnkget.h +++ b/arch/metag/include/asm/spinlock_lnkget.h @@ -239,11 +239,4 @@ static inline int arch_read_can_lock(arch_rwlock_t *rw) return tmp; } -#define arch_read_lock_flags(lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags(lock, flags) arch_write_lock(lock) - -#define arch_spin_relax(lock) cpu_relax() -#define arch_read_relax(lock) cpu_relax() -#define arch_write_relax(lock) cpu_relax() - #endif /* __ASM_SPINLOCK_LNKGET_H */ -- 1.8.2.2