From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Neuling Subject: [PATCH 2/2] KVM: PPC: Book3S HV: Add branch label Date: Fri, 28 Mar 2014 16:40:37 +1100 Message-ID: <1395985237-27345-2-git-send-email-mikey@neuling.org> References: <1395704828-20180-4-git-send-email-paulus@samba.org> <1395985237-27345-1-git-send-email-mikey@neuling.org> Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, Anton Blanchard , Michael Neuling To: Alexander Graf , Paul Mackerras Return-path: In-Reply-To: <1395985237-27345-1-git-send-email-mikey@neuling.org> Sender: kvm-ppc-owner@vger.kernel.org List-Id: kvm.vger.kernel.org This branch label is over a large section so let's give it a real name. Signed-off-by: Michael Neuling --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Neuling Date: Fri, 28 Mar 2014 05:40:37 +0000 Subject: [PATCH 2/2] KVM: PPC: Book3S HV: Add branch label Message-Id: <1395985237-27345-2-git-send-email-mikey@neuling.org> List-Id: References: <1395704828-20180-4-git-send-email-paulus@samba.org> <1395985237-27345-1-git-send-email-mikey@neuling.org> In-Reply-To: <1395985237-27345-1-git-send-email-mikey@neuling.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Alexander Graf , Paul Mackerras Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, Anton Blanchard , Michael Neuling This branch label is over a large section so let's give it a real name. Signed-off-by: Michael Neuling --- 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