On 12.09.2012, at 15:18, Mihai Caraman <mihai.caraman@xxxxxxxxxxxxx> wrote: > 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. Not sure I understand what you're trying to achieve here. Please elaborate ;) Alex > Use a rare label number > to avoid conflicts with the calling contexts. > > Signed-off-by: Mihai Caraman <mihai.caraman@xxxxxxxxxxxxx> > --- > arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/include/asm/kvm_booke_hv_asm.h b/arch/powerpc/include/asm/kvm_booke_hv_asm.h > index 30a600f..a37a12a 100644 > --- a/arch/powerpc/include/asm/kvm_booke_hv_asm.h > +++ b/arch/powerpc/include/asm/kvm_booke_hv_asm.h > @@ -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 > -- > 1.7.4.1 > > > -- > To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
