powerpc/64s/exception: Trim unused arguments from KVMTEST macro

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200225173541.1549955-16-npiggin@gmail.com

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 0ea5ba1..da15ec4 100644 (file)
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -224,7 +224,7 @@ do_define_int n
 #define kvmppc_interrupt kvmppc_interrupt_pr
 #endif
 
-.macro KVMTEST name, hsrr, n
+.macro KVMTEST name
        lbz     r10,HSTATE_IN_GUEST(r13)
        cmpwi   r10,0
        bne     \name\()_kvm
@@ -293,7 +293,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
 .endm
 
 #else
-.macro KVMTEST name, hsrr, n
+.macro KVMTEST name
 .endm
 .macro GEN_KVM name
 .endm
@@ -439,7 +439,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
 DEFINE_FIXED_SYMBOL(\name\()_common_real)
 \name\()_common_real:
        .if IKVM_REAL
-               KVMTEST \name IHSRR IVEC
+               KVMTEST \name
        .endif
 
        ld      r10,PACAKMSR(r13)       /* get MSR value for kernel */
@@ -462,7 +462,7 @@ DEFINE_FIXED_SYMBOL(\name\()_common_real)
 DEFINE_FIXED_SYMBOL(\name\()_common_virt)
 \name\()_common_virt:
        .if IKVM_VIRT
-               KVMTEST \name IHSRR IVEC
+               KVMTEST \name
 1:
        .endif
        .endif /* IVIRT */
@@ -476,7 +476,7 @@ DEFINE_FIXED_SYMBOL(\name\()_common_virt)
 DEFINE_FIXED_SYMBOL(\name\()_common_real)
 \name\()_common_real:
        .if IKVM_REAL
-               KVMTEST \name IHSRR IVEC
+               KVMTEST \name
        .endif
 .endm
 
@@ -1598,7 +1598,7 @@ INT_DEFINE_END(system_call)
        GET_PACA(r13)
        std     r10,PACA_EXGEN+EX_R10(r13)
        INTERRUPT_TO_KERNEL
-       KVMTEST system_call EXC_STD 0xc00 /* uses r10, branch to system_call_kvm */
+       KVMTEST system_call /* uses r10, branch to system_call_kvm */
        mfctr   r9
 #else
        mr      r9,r13