[PATCH] powerpc/reg: Remove #ifdef around mtspr macro

Christophe Leroy posted 1 patch 2 years, 7 months ago
arch/powerpc/include/asm/reg.h | 2 --
1 file changed, 2 deletions(-)
[PATCH] powerpc/reg: Remove #ifdef around mtspr macro
Posted by Christophe Leroy 2 years, 7 months ago
That ifdef was introduced by commit 1458dd951f7c ("powerpc/8xx:
Handle CPU6 ERRATA directly in mtspr() macro") and left over by
commit 2a45addd21de ("powerpc/8xx: Remove CPU6 ERRATA Workaround")

Remove it.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 arch/powerpc/include/asm/reg.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index bb0121222ee3..4ae4ab9090a2 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -1414,11 +1414,9 @@ static inline void mtmsr_isync(unsigned long val)
 #define mfspr(rn)	({unsigned long rval; \
 			asm volatile("mfspr %0," __stringify(rn) \
 				: "=r" (rval)); rval;})
-#ifndef mtspr
 #define mtspr(rn, v)	asm volatile("mtspr " __stringify(rn) ",%0" : \
 				     : "r" ((unsigned long)(v)) \
 				     : "memory")
-#endif
 #define wrtspr(rn)	asm volatile("mtspr " __stringify(rn) ",2" : : : "memory")
 
 static inline void wrtee(unsigned long val)
-- 
2.40.1
Re: [PATCH] powerpc/reg: Remove #ifdef around mtspr macro
Posted by Michael Ellerman 2 years, 5 months ago
On Wed, 21 Jun 2023 12:40:50 +0200, Christophe Leroy wrote:
> That ifdef was introduced by commit 1458dd951f7c ("powerpc/8xx:
> Handle CPU6 ERRATA directly in mtspr() macro") and left over by
> commit 2a45addd21de ("powerpc/8xx: Remove CPU6 ERRATA Workaround")
> 
> Remove it.
> 
> 
> [...]

Applied to powerpc/next.

[1/1] powerpc/reg: Remove #ifdef around mtspr macro
      https://git.kernel.org/powerpc/c/6039fcd3fba99451ea9d013c4d3a65a40b2feff0

cheers