powerpc: Move and fix MTMSR_EERI definition

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Benjamin Herrenschmidt 13 years ago b38c77d8 d72be892

+2 -3

3 changed files

expand all

arch

powerpc

include

asm

ppc_asm.h

kvm

book3s_rmhandlers.S

book3s_segment.S

arch/powerpc/include/asm/ppc_asm.h

··· 475 475 #ifdef CONFIG_PPC_BOOK3S_64 476 476 #define RFI rfid 477 477 #define MTMSRD(r) mtmsrd r 478 + #define MTMSR_EERI(reg) mtmsrd reg,1 478 479 #else 479 480 #define FIX_SRR1(ra, rb) 480 481 #ifndef CONFIG_40x ··· 484 483 #define RFI rfi; b . /* Prevent prefetch past rfi */ 485 484 #endif 486 485 #define MTMSRD(r) mtmsr r 486 + #define MTMSR_EERI(reg) mtmsr reg 487 487 #define CLR_TOP32(r) 488 488 #endif 489 489

-1

arch/powerpc/kvm/book3s_rmhandlers.S

··· 37 37 #if defined(CONFIG_PPC_BOOK3S_64) 38 38 39 39 #define FUNC(name) GLUE(.,name) 40 - #define MTMSR_EERI(reg) mtmsrd (reg),1 41 40 42 41 .globl kvmppc_skip_interrupt 43 42 kvmppc_skip_interrupt:

-2

arch/powerpc/kvm/book3s_segment.S

··· 23 23 24 24 #define GET_SHADOW_VCPU(reg) \ 25 25 mr reg, r13 26 - #define MTMSR_EERI(reg) mtmsrd (reg),1 27 26 28 27 #elif defined(CONFIG_PPC_BOOK3S_32) 29 28 ··· 30 31 tophys(reg, r2); \ 31 32 lwz reg, (THREAD + THREAD_KVM_SVCPU)(reg); \ 32 33 tophys(reg, reg) 33 - #define MTMSR_EERI(reg) mtmsr (reg) 34 34 35 35 #endif 36 36