From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Deacon Subject: [PATCH RESEND 06/14] ia64: locks: remove redundant arch_*_relax operations Date: Fri, 21 Feb 2014 17:34:53 +0000 Message-ID: <1393004101-25382-7-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]:44756 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932163AbaBURfO (ORCPT ); Fri, 21 Feb 2014 12:35:14 -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 , Tony Luck Now that the arch_{spin,read,write}_relax macros default to cpu_relax(), remove the redundant definitions for Itanium. Cc: Tony Luck Signed-off-by: Will Deacon --- arch/ia64/include/asm/spinlock.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h index 45698cd15b7b..0110413d89c0 100644 --- a/arch/ia64/include/asm/spinlock.h +++ b/arch/ia64/include/asm/spinlock.h @@ -289,8 +289,4 @@ static inline int arch_read_trylock(arch_rwlock_t *x) return (u32)ia64_cmpxchg4_acq((__u32 *)(x), new.word, old.word) == old.word; } -#define arch_spin_relax(lock) cpu_relax() -#define arch_read_relax(lock) cpu_relax() -#define arch_write_relax(lock) cpu_relax() - #endif /* _ASM_IA64_SPINLOCK_H */ -- 1.8.2.2