Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b38c77d8 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc: Move and fix MTMSR_EERI definition



Move this duplicated definition to ppc_asm.h and remove the
braces which prevent the use of %rN register names

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent d72be892
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -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:
+0 −2
Original line number Diff line number Diff line
@@ -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