From patchwork Fri Mar 28 05:40:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Neuling X-Patchwork-Id: 334591 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7A3B0140175 for ; Fri, 28 Mar 2014 16:40:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750964AbaC1Fk4 (ORCPT ); Fri, 28 Mar 2014 01:40:56 -0400 Received: from ozlabs.org ([203.10.76.45]:44458 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752120AbaC1Fkl (ORCPT ); Fri, 28 Mar 2014 01:40:41 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 314761400CB; Fri, 28 Mar 2014 16:40:40 +1100 (EST) Received: by localhost.localdomain (Postfix, from userid 1000) id 4DE5CD44289; Fri, 28 Mar 2014 16:40:39 +1100 (EST) From: Michael Neuling To: Alexander Graf , Paul Mackerras Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, Anton Blanchard , 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> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395985237-27345-1-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> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@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 */