KVM: PPC: bookehv: Allow duplicate calls of DO_KVM macro
Subsystems (2)
PATCH 42/56 KVM: PPC: bookehv: Allow duplicate calls of DO_KVM macro
From: Mihai Caraman <[email protected]>
The current form of DO_KVM macro restricts its use to one call per input parameter set. This is caused by kvmppc_resume_\intno\()_\srr1 symbol definition.
Duplicate calls of DO_KVM are required by distinct implementations of exeption handlers which are delegated at runtime. Use a rare label number to avoid conflicts with the calling contexts.
Signed-off-by Mihai Caraman <[email protected]>
Signed-off-by Alexander Graf <[email protected]>
--- arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/kvm_booke_hv_asm.h +2 -2
@@ -38,9 +38,9 @@#ifdef CONFIG_KVM_BOOKE_HV BEGIN_FTR_SECTION mtocrf 0x80, r11 /* check MSR[GS] without clobbering reg */ - bf 3, kvmppc_resume_\intno\()_\srr1 + bf 3, 1975f b kvmppc_handler_\intno\()_\srr1 -kvmppc_resume_\intno\()_\srr1: +1975: END_FTR_SECTION_IFSET(CPU_FTR_EMB_HV) #endif .endm
Signature · 1 line
1.6.0.2