KVM: PPC: bookehv: Allow duplicate calls of DO_KVM macro
authorMihai Caraman <mihai.caraman@freescale.com>
Wed, 12 Sep 2012 03:18:14 +0000 (03:18 +0000)
committerAlexander Graf <agraf@suse.de>
Fri, 5 Oct 2012 21:38:50 +0000 (23:38 +0200)
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>
arch/powerpc/include/asm/kvm_booke_hv_asm.h

index 30a600fa1b6a9977a2edc380f763eda4b1ccf5c9..a37a12a9a7d720374304b8460f59b690f24c2556 100644 (file)
@@ -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