Patchwork [01/13] powerpc/book3e: mtmsr should not be mtmsrd on book3e 64-bit

login
register
mail settings
Submitter Benjamin Herrenschmidt
Date July 9, 2010, 6:16 a.m.
Message ID <1278656215-24705-1-git-send-email-benh@kernel.crashing.org>
Download mbox | patch
Permalink /patch/58343/
State Accepted, archived
Commit 0866eb99cc4d5951cb0ed6ddfa92d5a3d55216ae
Headers show

Comments

Benjamin Herrenschmidt - July 9, 2010, 6:16 a.m.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
 arch/powerpc/include/asm/reg.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index d62fdf4..d8be016 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -890,7 +890,7 @@ 
 #ifndef __ASSEMBLY__
 #define mfmsr()		({unsigned long rval; \
 			asm volatile("mfmsr %0" : "=r" (rval)); rval;})
-#ifdef CONFIG_PPC64
+#ifdef CONFIG_PPC_BOOK3S_64
 #define __mtmsrd(v, l)	asm volatile("mtmsrd %0," __stringify(l) \
 				     : : "r" (v) : "memory")
 #define mtmsrd(v)	__mtmsrd((v), 0)