* [PATCH RESEND 01/14] ARC: locks: remove redundant arch_*_relax operations
2014-02-21 17:34 [PATCH RESEND 00/14] spinlock: remove redundant arch_*_relax operations Will Deacon
@ 2014-02-21 17:34 ` Will Deacon
2014-02-21 17:34 ` [PATCH RESEND 02/14] ARM: " Will Deacon
` (12 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Will Deacon @ 2014-02-21 17:34 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, Will Deacon
Now that the arch_{spin,read,write}_relax macros default to cpu_relax(),
remove the redundant definitions for ARC.
Acked-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arc/include/asm/spinlock.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arc/include/asm/spinlock.h b/arch/arc/include/asm/spinlock.h
index b6a8c2dfbe6e..a7211e411018 100644
--- a/arch/arc/include/asm/spinlock.h
+++ b/arch/arc/include/asm/spinlock.h
@@ -144,8 +144,4 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)
#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 */
--
1.8.2.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH RESEND 02/14] ARM: locks: remove redundant arch_*_relax operations
2014-02-21 17:34 [PATCH RESEND 00/14] spinlock: remove redundant arch_*_relax operations Will Deacon
2014-02-21 17:34 ` [PATCH RESEND 01/14] ARC: locks: " Will Deacon
@ 2014-02-21 17:34 ` Will Deacon
2014-02-21 17:34 ` [PATCH RESEND 03/14] arm64: " Will Deacon
` (11 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Will Deacon @ 2014-02-21 17:34 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, Will Deacon
Now that the arch_{spin,read,write}_relax macros default to cpu_relax(),
remove the redundant definitions for ARM.
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/include/asm/spinlock.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm/include/asm/spinlock.h b/arch/arm/include/asm/spinlock.h
index ef3c6072aa45..d97df6f68fa3 100644
--- a/arch/arm/include/asm/spinlock.h
+++ b/arch/arm/include/asm/spinlock.h
@@ -289,8 +289,4 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)
#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 */
--
1.8.2.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH RESEND 03/14] arm64: locks: remove redundant arch_*_relax operations
2014-02-21 17:34 [PATCH RESEND 00/14] spinlock: remove redundant arch_*_relax operations Will Deacon
2014-02-21 17:34 ` [PATCH RESEND 01/14] ARC: locks: " Will Deacon
2014-02-21 17:34 ` [PATCH RESEND 02/14] ARM: " Will Deacon
@ 2014-02-21 17:34 ` Will Deacon
2014-02-26 12:15 ` Catalin Marinas
2014-02-21 17:34 ` [PATCH RESEND 04/14] blackfin: " Will Deacon
` (10 subsequent siblings)
13 siblings, 1 reply; 17+ messages in thread
From: Will Deacon @ 2014-02-21 17:34 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, Will Deacon, Catalin Marinas
Now that the arch_{spin,read,write}_relax macros default to cpu_relax(),
remove the redundant definitions for arm64.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm64/include/asm/spinlock.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm64/include/asm/spinlock.h b/arch/arm64/include/asm/spinlock.h
index 3d5cf064d7a1..96f73f1302ff 100644
--- a/arch/arm64/include/asm/spinlock.h
+++ b/arch/arm64/include/asm/spinlock.h
@@ -227,8 +227,4 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)
#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 */
--
1.8.2.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH RESEND 04/14] blackfin: locks: remove redundant arch_*_relax operations
2014-02-21 17:34 [PATCH RESEND 00/14] spinlock: remove redundant arch_*_relax operations Will Deacon
` (2 preceding siblings ...)
2014-02-21 17:34 ` [PATCH RESEND 03/14] arm64: " Will Deacon
@ 2014-02-21 17:34 ` Will Deacon
2014-02-21 17:34 ` [PATCH RESEND 05/14] cris: " Will Deacon
` (9 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Will Deacon @ 2014-02-21 17:34 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, Will Deacon, Mike Frysinger
Now that the arch_{spin,read,write}_relax macros default to cpu_relax(),
remove the redundant definitions for Blackfin.
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/blackfin/include/asm/spinlock.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/blackfin/include/asm/spinlock.h b/arch/blackfin/include/asm/spinlock.h
index 490c7caa02d9..8c58ddaec369 100644
--- a/arch/blackfin/include/asm/spinlock.h
+++ b/arch/blackfin/include/asm/spinlock.h
@@ -96,10 +96,6 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)
__raw_write_unlock_asm(&rw->lock);
}
-#define arch_spin_relax(lock) cpu_relax()
-#define arch_read_relax(lock) cpu_relax()
-#define arch_write_relax(lock) cpu_relax()
-
#endif
#endif /* !__BFIN_SPINLOCK_H */
--
1.8.2.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH RESEND 05/14] cris: locks: remove redundant arch_*_relax operations
2014-02-21 17:34 [PATCH RESEND 00/14] spinlock: remove redundant arch_*_relax operations Will Deacon
` (3 preceding siblings ...)
2014-02-21 17:34 ` [PATCH RESEND 04/14] blackfin: " Will Deacon
@ 2014-02-21 17:34 ` Will Deacon
2014-02-21 17:34 ` [PATCH RESEND 06/14] ia64: " Will Deacon
` (8 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Will Deacon @ 2014-02-21 17:34 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, 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 <starvik@axis.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
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 f13275522f4d..bf94cc6bd9b4 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
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH RESEND 06/14] ia64: locks: remove redundant arch_*_relax operations
2014-02-21 17:34 [PATCH RESEND 00/14] spinlock: remove redundant arch_*_relax operations Will Deacon
` (4 preceding siblings ...)
2014-02-21 17:34 ` [PATCH RESEND 05/14] cris: " Will Deacon
@ 2014-02-21 17:34 ` Will Deacon
2014-02-21 17:34 ` [PATCH RESEND 07/14] m32r: " Will Deacon
` (7 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Will Deacon @ 2014-02-21 17:34 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, 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 <tony.luck@intel.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
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
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH RESEND 07/14] m32r: locks: remove redundant arch_*_relax operations
2014-02-21 17:34 [PATCH RESEND 00/14] spinlock: remove redundant arch_*_relax operations Will Deacon
` (5 preceding siblings ...)
2014-02-21 17:34 ` [PATCH RESEND 06/14] ia64: " Will Deacon
@ 2014-02-21 17:34 ` Will Deacon
2014-02-21 17:34 ` [PATCH RESEND 08/14] metag: " Will Deacon
` (6 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Will Deacon @ 2014-02-21 17:34 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, Will Deacon, Hirokazu Takata
Now that the arch_{spin,read,write}_relax macros default to cpu_relax(),
remove the redundant definitions for m32r.
Cc: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/m32r/include/asm/spinlock.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/m32r/include/asm/spinlock.h b/arch/m32r/include/asm/spinlock.h
index fa13694eaae3..3112249ebee4 100644
--- a/arch/m32r/include/asm/spinlock.h
+++ b/arch/m32r/include/asm/spinlock.h
@@ -320,8 +320,4 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
#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_M32R_SPINLOCK_H */
--
1.8.2.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH RESEND 08/14] metag: locks: remove redundant arch_*_relax operations
2014-02-21 17:34 [PATCH RESEND 00/14] spinlock: remove redundant arch_*_relax operations Will Deacon
` (6 preceding siblings ...)
2014-02-21 17:34 ` [PATCH RESEND 07/14] m32r: " Will Deacon
@ 2014-02-21 17:34 ` Will Deacon
2014-02-21 17:34 ` [PATCH RESEND 09/14] mips: " Will Deacon
` (5 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Will Deacon @ 2014-02-21 17:34 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, 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 <james.hogan@imgtec.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
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
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH RESEND 09/14] mips: locks: remove redundant arch_*_relax operations
2014-02-21 17:34 [PATCH RESEND 00/14] spinlock: remove redundant arch_*_relax operations Will Deacon
` (7 preceding siblings ...)
2014-02-21 17:34 ` [PATCH RESEND 08/14] metag: " Will Deacon
@ 2014-02-21 17:34 ` Will Deacon
2014-02-21 17:34 ` [PATCH RESEND 10/14] hppa: " Will Deacon
` (4 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Will Deacon @ 2014-02-21 17:34 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, Will Deacon, Ralf Baechle
Now that the arch_{spin,read,write}_relax macros default to cpu_relax(),
remove the redundant definitions for MIPS.
Cc: Ralf Baechle <ralf@linux-mips.org>
Acked-by: David Daney <david.daney@cavium.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/mips/include/asm/spinlock.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/mips/include/asm/spinlock.h b/arch/mips/include/asm/spinlock.h
index 78d201fb6c87..7bd850a15302 100644
--- a/arch/mips/include/asm/spinlock.h
+++ b/arch/mips/include/asm/spinlock.h
@@ -419,8 +419,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw)
#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 */
--
1.8.2.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH RESEND 10/14] hppa: locks: remove redundant arch_*_relax operations
2014-02-21 17:34 [PATCH RESEND 00/14] spinlock: remove redundant arch_*_relax operations Will Deacon
` (8 preceding siblings ...)
2014-02-21 17:34 ` [PATCH RESEND 09/14] mips: " Will Deacon
@ 2014-02-21 17:34 ` Will Deacon
2014-02-21 17:34 ` [PATCH RESEND 11/14] s390: " Will Deacon
` (3 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Will Deacon @ 2014-02-21 17:34 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, Will Deacon, Helge Deller
Now that the arch_{spin,read,write}_relax macros default to cpu_relax(),
remove the redundant definitions for parisc.
Cc: Helge Deller <deller@gmx.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/parisc/include/asm/spinlock.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/parisc/include/asm/spinlock.h b/arch/parisc/include/asm/spinlock.h
index 3516e0b27044..64f2992e439f 100644
--- a/arch/parisc/include/asm/spinlock.h
+++ b/arch/parisc/include/asm/spinlock.h
@@ -191,8 +191,4 @@ static __inline__ int arch_write_can_lock(arch_rwlock_t *rw)
#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 */
--
1.8.2.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH RESEND 11/14] s390: locks: remove redundant arch_*_relax operations
2014-02-21 17:34 [PATCH RESEND 00/14] spinlock: remove redundant arch_*_relax operations Will Deacon
` (9 preceding siblings ...)
2014-02-21 17:34 ` [PATCH RESEND 10/14] hppa: " Will Deacon
@ 2014-02-21 17:34 ` Will Deacon
2014-02-21 17:34 ` [PATCH RESEND 12/14] sh: " Will Deacon
` (2 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Will Deacon @ 2014-02-21 17:34 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, Will Deacon, Martin Schwidefsky
Now that the arch_{read,write}_relax macros default to cpu_relax(),
remove the redundant definitions for S390.
Since S390 provides an arch_spin_relax implementation, that function is
left alone and additionally defined as a macro, so the LOCKBREAK code
will pick it up.
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/s390/include/asm/spinlock.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/s390/include/asm/spinlock.h b/arch/s390/include/asm/spinlock.h
index 83e5d216105e..9ddf6c8ff9dd 100644
--- a/arch/s390/include/asm/spinlock.h
+++ b/arch/s390/include/asm/spinlock.h
@@ -43,6 +43,7 @@ extern void arch_spin_lock_wait(arch_spinlock_t *);
extern void arch_spin_lock_wait_flags(arch_spinlock_t *, unsigned long flags);
extern int arch_spin_trylock_retry(arch_spinlock_t *);
extern void arch_spin_relax(arch_spinlock_t *lock);
+#define arch_spin_relax arch_spin_relax
static inline int arch_spin_value_unlocked(arch_spinlock_t lock)
{
@@ -175,7 +176,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw)
return _raw_write_trylock_retry(rw);
}
-#define arch_read_relax(lock) cpu_relax()
-#define arch_write_relax(lock) cpu_relax()
-
#endif /* __ASM_SPINLOCK_H */
--
1.8.2.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH RESEND 12/14] sh: locks: remove redundant arch_*_relax operations
2014-02-21 17:34 [PATCH RESEND 00/14] spinlock: remove redundant arch_*_relax operations Will Deacon
` (10 preceding siblings ...)
2014-02-21 17:34 ` [PATCH RESEND 11/14] s390: " Will Deacon
@ 2014-02-21 17:34 ` Will Deacon
2014-02-21 17:35 ` [PATCH RESEND 13/14] sparc: " Will Deacon
2014-02-21 17:35 ` [PATCH RESEND 14/14] x86: " Will Deacon
13 siblings, 0 replies; 17+ messages in thread
From: Will Deacon @ 2014-02-21 17:34 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, Will Deacon, Paul Mundt
Now that the arch_{spin,read,write}_relax macros default to cpu_relax(),
remove the redundant definitions for SuperH.
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/sh/include/asm/spinlock.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/sh/include/asm/spinlock.h b/arch/sh/include/asm/spinlock.h
index bdc0f3b6c56a..a89820dc6d9e 100644
--- a/arch/sh/include/asm/spinlock.h
+++ b/arch/sh/include/asm/spinlock.h
@@ -219,8 +219,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw)
#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_SH_SPINLOCK_H */
--
1.8.2.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH RESEND 13/14] sparc: locks: remove redundant arch_*_relax operations
2014-02-21 17:34 [PATCH RESEND 00/14] spinlock: remove redundant arch_*_relax operations Will Deacon
` (11 preceding siblings ...)
2014-02-21 17:34 ` [PATCH RESEND 12/14] sh: " Will Deacon
@ 2014-02-21 17:35 ` Will Deacon
2014-02-21 17:35 ` [PATCH RESEND 14/14] x86: " Will Deacon
13 siblings, 0 replies; 17+ messages in thread
From: Will Deacon @ 2014-02-21 17:35 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, Will Deacon
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
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH RESEND 14/14] x86: locks: remove redundant arch_*_relax operations
2014-02-21 17:34 [PATCH RESEND 00/14] spinlock: remove redundant arch_*_relax operations Will Deacon
` (12 preceding siblings ...)
2014-02-21 17:35 ` [PATCH RESEND 13/14] sparc: " Will Deacon
@ 2014-02-21 17:35 ` Will Deacon
2014-02-21 17:39 ` H. Peter Anvin
13 siblings, 1 reply; 17+ messages in thread
From: Will Deacon @ 2014-02-21 17:35 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, 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 <mingo@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
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 bf156ded74b5..221ab49182c4 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
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH RESEND 14/14] x86: locks: remove redundant arch_*_relax operations
2014-02-21 17:35 ` [PATCH RESEND 14/14] x86: " Will Deacon
@ 2014-02-21 17:39 ` H. Peter Anvin
0 siblings, 0 replies; 17+ messages in thread
From: H. Peter Anvin @ 2014-02-21 17:39 UTC (permalink / raw)
To: Will Deacon, akpm; +Cc: linux-arch, Ingo Molnar
On 02/21/2014 09:35 AM, Will Deacon wrote:
> Now that the arch_{spin,read,write}_relax macros default to cpu_relax(),
> remove the redundant definitions for x86.
>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: H. Peter Anvin <hpa@zytor.com>
> Acked-by: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Will Deacon <will.deacon@arm.com>
Acked-by: H. Peter Anvin <hpa@zytor.com>
^ permalink raw reply [flat|nested] 17+ messages in thread