powerpc/64s/exception: Remove unused parameters from KVMTEST macro
PATCH 1/2 powerpc/64s/exception: Remove unused parameters from KVMTEST macro
The hsrr and n parameters are never used by the KVMTEST macro so remove them.
Signed-off-by Jordan Niethe <[email protected]>
--- arch/powerpc/kernel/exceptions-64s.S | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/kernel/exceptions-64s.S +5 -5
@@ -210,7 +210,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) #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
@@ -284,7 +284,7 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948) .endm #else -.macro KVMTEST name, hsrr, n +.macro KVMTEST name .endm .macro KVM_HANDLER name, vec, hsrr, area, skip .endm
@@ -431,7 +431,7 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948) SAVE_CTR(r10, \area\()) mfcr r9 .if \kvm - KVMTEST \name \hsrr \vec + KVMTEST \name .endif .if \bitmask lbz r10,PACAIRQSOFTMASK(r13)
@@ -1444,7 +1444,7 @@ EXC_VIRT_NONE(0x4b00, 0x100) 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
@@ -1811,7 +1811,7 @@ EXC_REAL_BEGIN(denorm_exception_hv, 0x1500, 0x100) andis. r10,r10,(HSRR1_DENORM)@h /* denorm? */ bne+ denorm_assist #endif - KVMTEST denorm_exception_hv, EXC_HV 0x1500 + KVMTEST denorm_exception_hv INT_SAVE_SRR_AND_JUMP denorm_common, EXC_HV, 1 EXC_REAL_END(denorm_exception_hv, 0x1500, 0x100)
Signature · 1 line
2.17.1
PATCH 2/2 powerpc/64s/exception: Add missing comma to INT_KVM_HANDLER macro for system_reset
The INT_KVM_HANDLER macro for system_reset is missing a comma so add it to be consistent.
Signed-off-by Jordan Niethe <[email protected]>
--- arch/powerpc/kernel/exceptions-64s.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/exceptions-64s.S +1 -1
@@ -828,7 +828,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206) */ EXC_REAL_END(system_reset, 0x100, 0x100) EXC_VIRT_NONE(0x4100, 0x100) -INT_KVM_HANDLER system_reset 0x100, EXC_STD, PACA_EXNMI, 0 +INT_KVM_HANDLER system_reset, 0x100, EXC_STD, PACA_EXNMI, 0 #ifdef CONFIG_PPC_P7_NAP TRAMP_REAL_BEGIN(system_reset_idle_wake)
Signature · 1 line
2.17.1
Re: [PATCH 2/2] powerpc/64s/exception: Add missing comma to INT_KVM_HANDLER macro for system_reset
Quoted 4 lines · Jordan Niethe
The
INT_KVM_HANDLERmacro forsystem_resetis missing a comma so add it to be consistent.Signed-off-by Jordan Niethe <[email protected]>
I see another one for machine_check as well which you might want to fix
Reviewed-by Andrew Donnellan <[email protected]>
Signature · 2 lines
Andrew Donnellan OzLabs, ADL Canberra [email protected] IBM Australia Limited
Quoted 4 lines · Jordan Niethe
The hsrr and n parameters are never used by the KVMTEST macro so remove them.
Signed-off-by Jordan Niethe <[email protected]>
Reviewed-by Andrew Donnellan <[email protected]>
Signature · 2 lines
Andrew Donnellan OzLabs, ADL Canberra [email protected] IBM Australia Limited