Commit d61966fc authored Sep 12, 2012 by Mihai Caraman Committed by Alexander Graf Oct 05, 2012

KVM: PPC: bookehv: Allow duplicate calls of DO_KVM macro



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 <mihai.caraman@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>

parent 7a08c274

arch/powerpc/include/asm/kvm_booke_hv_asm.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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