This branch label is over a large section so let's give it a real name. Signed-off-by: Michael Neuling <mikey@xxxxxxxxxxx> --- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S index 01d5701..832750d 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S @@ -612,7 +612,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S) #ifdef CONFIG_PPC_TRANSACTIONAL_MEM BEGIN_FTR_SECTION - b 1f + b skip_tm END_FTR_SECTION_IFCLR(CPU_FTR_TM) /* Turn on TM/FP/VSX/VMX so we can restore them. */ @@ -637,7 +637,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_TM) ld r5, VCPU_MSR(r4) rldicl. r5, r5, 64 - MSR_TS_S_LG, 62 - beq 1f /* TM not active in guest */ + beq skip_tm /* TM not active in guest */ /* Make sure the failure summary is set, otherwise we'll program check * when we trechkpt. It's possible that this might have been not set @@ -717,7 +717,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_TM) /* Set the MSR RI since we have our registers back. */ li r5, MSR_RI mtmsrd r5, 1 -1: +skip_tm: #endif /* Load guest PMU registers */ -- 1.8.3.2 -- 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
