From 215003ab8ebfb35743d66f5e6b67759c245bdb79 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 4 Jul 2012 14:49:12 +1000
Subject: [PATCH] --- yaml --- r: 313658 b: refs/heads/master c:
 b38c77d82e42f4e72c162f49ea75f0f0ad76f1b6 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/include/asm/ppc_asm.h   | 2 ++
 trunk/arch/powerpc/kvm/book3s_rmhandlers.S | 1 -
 trunk/arch/powerpc/kvm/book3s_segment.S    | 2 --
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 67ea3f6c3915..e8453cb24ccb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d72be892c810cb8269ed8a625fd925c30727639e
+refs/heads/master: b38c77d82e42f4e72c162f49ea75f0f0ad76f1b6
diff --git a/trunk/arch/powerpc/include/asm/ppc_asm.h b/trunk/arch/powerpc/include/asm/ppc_asm.h
index 2c7edd567738..d4c589b4a2b8 100644
--- a/trunk/arch/powerpc/include/asm/ppc_asm.h
+++ b/trunk/arch/powerpc/include/asm/ppc_asm.h
@@ -475,6 +475,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)
 #ifdef CONFIG_PPC_BOOK3S_64
 #define RFI		rfid
 #define MTMSRD(r)	mtmsrd	r
+#define MTMSR_EERI(reg)	mtmsrd	reg,1
 #else
 #define FIX_SRR1(ra, rb)
 #ifndef CONFIG_40x
@@ -483,6 +484,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)
 #define RFI		rfi; b .	/* Prevent prefetch past rfi */
 #endif
 #define MTMSRD(r)	mtmsr	r
+#define MTMSR_EERI(reg)	mtmsr	reg
 #define CLR_TOP32(r)
 #endif
 
diff --git a/trunk/arch/powerpc/kvm/book3s_rmhandlers.S b/trunk/arch/powerpc/kvm/book3s_rmhandlers.S
index 34187585c507..ab523f3c1731 100644
--- a/trunk/arch/powerpc/kvm/book3s_rmhandlers.S
+++ b/trunk/arch/powerpc/kvm/book3s_rmhandlers.S
@@ -37,7 +37,6 @@
 #if defined(CONFIG_PPC_BOOK3S_64)
 
 #define FUNC(name) 		GLUE(.,name)
-#define MTMSR_EERI(reg)		mtmsrd	(reg),1
 
 	.globl	kvmppc_skip_interrupt
 kvmppc_skip_interrupt:
diff --git a/trunk/arch/powerpc/kvm/book3s_segment.S b/trunk/arch/powerpc/kvm/book3s_segment.S
index 798491a268b3..1abe4788191a 100644
--- a/trunk/arch/powerpc/kvm/book3s_segment.S
+++ b/trunk/arch/powerpc/kvm/book3s_segment.S
@@ -23,7 +23,6 @@
 
 #define GET_SHADOW_VCPU(reg)    \
 	mr	reg, r13
-#define MTMSR_EERI(reg)		mtmsrd	(reg),1
 
 #elif defined(CONFIG_PPC_BOOK3S_32)
 
@@ -31,7 +30,6 @@
 	tophys(reg, r2);       			\
 	lwz     reg, (THREAD + THREAD_KVM_SVCPU)(reg);	\
 	tophys(reg, reg)
-#define MTMSR_EERI(reg)		mtmsr	(reg)
 
 #endif