From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Deacon Subject: [PATCH 05/14] cris: locks: remove redundant arch_*_relax operations Date: Tue, 17 Sep 2013 16:07:37 +0100 Message-ID: <1379430466-30520-6-git-send-email-will.deacon@arm.com> References: <1379430466-30520-1-git-send-email-will.deacon@arm.com> Return-path: Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:41235 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752751Ab3IQPH6 (ORCPT ); Tue, 17 Sep 2013 11:07:58 -0400 In-Reply-To: <1379430466-30520-1-git-send-email-will.deacon@arm.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-arch@vger.kernel.org Cc: Will Deacon , Mikael Starvik Now that the arch_{spin,read,write}_relax macros default to cpu_relax(), remove the redundant definitions for Cris. Cc: Mikael Starvik Acked-by: Jesper Nilsson Signed-off-by: Will Deacon --- arch/cris/include/arch-v32/arch/spinlock.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/cris/include/arch-v32/arch/spinlock.h b/arch/cris/include/arch-v32/arch/spinlock.h index f132755..bf94cc6 100644 --- a/arch/cris/include/arch-v32/arch/spinlock.h +++ b/arch/cris/include/arch-v32/arch/spinlock.h @@ -124,8 +124,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw) #define _raw_read_lock_flags(lock, flags) _raw_read_lock(lock) #define _raw_write_lock_flags(lock, flags) _raw_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_ARCH_SPINLOCK_H */ -- 1.8.2.2