From: Will Deacon <will.deacon@arm.com>
To: akpm@linux-foundation.org
Cc: linux-arch@vger.kernel.org, Will Deacon <will.deacon@arm.com>
Subject: [PATCH 13/14] sparc: locks: remove redundant arch_*_relax operations
Date: Tue, 12 Nov 2013 16:47:51 +0000 [thread overview]
Message-ID: <1384274872-26849-13-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1384274872-26849-1-git-send-email-will.deacon@arm.com>
Now that the arch_{spin,read,write}_relax macros default to cpu_relax(),
remove the redundant definitions for Sparc.
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/sparc/include/asm/spinlock_32.h | 4 ----
arch/sparc/include/asm/spinlock_64.h | 4 ----
2 files changed, 8 deletions(-)
diff --git a/arch/sparc/include/asm/spinlock_32.h b/arch/sparc/include/asm/spinlock_32.h
index bcc98fc35281..180c8f3462ea 100644
--- a/arch/sparc/include/asm/spinlock_32.h
+++ b/arch/sparc/include/asm/spinlock_32.h
@@ -188,10 +188,6 @@ static inline int __arch_read_trylock(arch_rwlock_t *rw)
#define arch_read_lock_flags(rw, flags) arch_read_lock(rw)
#define arch_write_lock_flags(rw, flags) arch_write_lock(rw)
-#define arch_spin_relax(lock) cpu_relax()
-#define arch_read_relax(lock) cpu_relax()
-#define arch_write_relax(lock) cpu_relax()
-
#define arch_read_can_lock(rw) (!((rw)->lock & 0xff))
#define arch_write_can_lock(rw) (!(rw)->lock)
diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
index 968917694978..f3b7a884f99e 100644
--- a/arch/sparc/include/asm/spinlock_64.h
+++ b/arch/sparc/include/asm/spinlock_64.h
@@ -216,10 +216,6 @@ static int inline arch_write_trylock(arch_rwlock_t *lock)
#define arch_read_can_lock(rw) (!((rw)->lock & 0x80000000UL))
#define arch_write_can_lock(rw) (!(rw)->lock)
-#define arch_spin_relax(lock) cpu_relax()
-#define arch_read_relax(lock) cpu_relax()
-#define arch_write_relax(lock) cpu_relax()
-
#endif /* !(__ASSEMBLY__) */
#endif /* !(__SPARC64_SPINLOCK_H) */
--
1.8.2.2
next prev parent reply other threads:[~2013-11-12 16:48 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-12 16:47 [PATCH 01/14] ARC: locks: remove redundant arch_*_relax operations Will Deacon
2013-11-12 16:47 ` [PATCH 02/14] ARM: " Will Deacon
2013-11-12 16:47 ` [PATCH 03/14] arm64: " Will Deacon
2013-11-12 16:47 ` [PATCH 04/14] blackfin: " Will Deacon
2013-11-12 16:47 ` [PATCH 05/14] cris: " Will Deacon
2013-11-12 16:47 ` [PATCH 06/14] ia64: " Will Deacon
2013-11-12 16:47 ` [PATCH 07/14] m32r: " Will Deacon
2013-11-12 16:47 ` [PATCH 08/14] metag: " Will Deacon
2013-11-12 16:47 ` [PATCH 09/14] mips: " Will Deacon
2013-11-12 16:47 ` [PATCH 10/14] hppa: " Will Deacon
2013-11-12 16:47 ` [PATCH 11/14] s390: " Will Deacon
2013-11-12 16:47 ` [PATCH 12/14] sh: " Will Deacon
2013-11-12 16:47 ` Will Deacon [this message]
2013-11-12 16:47 ` [PATCH 14/14] x86: " Will Deacon
2014-01-16 18:55 ` [PATCH 01/14] ARC: " Will Deacon
-- strict thread matches above, loose matches on Subject: below --
2013-09-17 15:07 [PATCH 00/14] Remove " Will Deacon
2013-09-17 15:07 ` [PATCH 13/14] sparc: locks: remove " Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1384274872-26849-13-git-send-email-will.deacon@arm.com \
--to=will.deacon@arm.com \
--cc=akpm@linux-foundation.org \
--cc=linux-arch@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).