From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Deacon Subject: [PATCH 14/14] x86: locks: remove redundant arch_*_relax operations Date: Tue, 17 Sep 2013 16:07:46 +0100 Message-ID: <1379430466-30520-15-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]:41240 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752795Ab3IQPIC (ORCPT ); Tue, 17 Sep 2013 11:08:02 -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 , Ingo Molnar , "H. Peter Anvin" Now that the arch_{spin,read,write}_relax macros default to cpu_relax(), remove the redundant definitions for x86. Cc: Ingo Molnar Cc: H. Peter Anvin Acked-by: Thomas Gleixner Signed-off-by: Will Deacon --- arch/x86/include/asm/spinlock.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h index bf156de..221ab49 100644 --- a/arch/x86/include/asm/spinlock.h +++ b/arch/x86/include/asm/spinlock.h @@ -280,8 +280,4 @@ static inline void arch_write_unlock(arch_rwlock_t *rw) #undef WRITE_LOCK_SUB #undef WRITE_LOCK_CMP -#define arch_spin_relax(lock) cpu_relax() -#define arch_read_relax(lock) cpu_relax() -#define arch_write_relax(lock) cpu_relax() - #endif /* _ASM_X86_SPINLOCK_H */ -- 1.8.2.2