All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael Neuling <mikey@neuling.org>
To: Alexander Graf <agraf@suse.de>, Paul Mackerras <paulus@samba.org>
Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org,
	Anton Blanchard <anton@samba.org>,
	Michael Neuling <mikey@neuling.org>
Subject: [PATCH 2/2] KVM: PPC: Book3S HV: Add branch label
Date: Fri, 28 Mar 2014 16:40:37 +1100	[thread overview]
Message-ID: <1395985237-27345-2-git-send-email-mikey@neuling.org> (raw)
In-Reply-To: <1395985237-27345-1-git-send-email-mikey@neuling.org>

This branch label is over a large section so let's give it a real name.

Signed-off-by: Michael Neuling <mikey@neuling.org>
---
 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

WARNING: multiple messages have this Message-ID (diff)
From: Michael Neuling <mikey@neuling.org>
To: Alexander Graf <agraf@suse.de>, Paul Mackerras <paulus@samba.org>
Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org,
	Anton Blanchard <anton@samba.org>,
	Michael Neuling <mikey@neuling.org>
Subject: [PATCH 2/2] KVM: PPC: Book3S HV: Add branch label
Date: Fri, 28 Mar 2014 05:40:37 +0000	[thread overview]
Message-ID: <1395985237-27345-2-git-send-email-mikey@neuling.org> (raw)
In-Reply-To: <1395985237-27345-1-git-send-email-mikey@neuling.org>

This branch label is over a large section so let's give it a real name.

Signed-off-by: Michael Neuling <mikey@neuling.org>
---
 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


  reply	other threads:[~2014-03-28  5:40 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-24 23:47 [PATCH 0/8] PPC Book 3S HV-mode KVM updates for 3.15 Paul Mackerras
2014-03-24 23:47 ` Paul Mackerras
2014-03-24 23:47 ` [PATCH 1/8] KVM: PPC: Book3S HV: Fix KVM hang with CONFIG_KVM_XICS=n Paul Mackerras
2014-03-24 23:47   ` Paul Mackerras
2014-03-24 23:47 ` [PATCH 2/8] KVM: PPC: Book3S HV: Add transactional memory support Paul Mackerras
2014-03-24 23:47   ` Paul Mackerras
2014-03-24 23:47 ` [PATCH 3/8] KVM: PPC: Book3S HV: Add get/set_one_reg for new TM state Paul Mackerras
2014-03-24 23:47   ` Paul Mackerras
2014-03-28  5:40   ` [PATCH 1/2] KVM: PPC: Book3S HV: Make TM avoid program check Michael Neuling
2014-03-28  5:40     ` Michael Neuling
2014-03-28  5:40     ` Michael Neuling [this message]
2014-03-28  5:40       ` [PATCH 2/2] KVM: PPC: Book3S HV: Add branch label Michael Neuling
2014-03-28 11:08     ` [PATCH 1/2] KVM: PPC: Book3S HV: Make TM avoid program check Paul Mackerras
2014-03-28 11:08       ` Paul Mackerras
2014-03-28 12:14       ` Paolo Bonzini
2014-03-28 12:14         ` Paolo Bonzini
2014-03-24 23:47 ` [PATCH 4/8] KVM: PPC: Book3S: Trim top 4 bits of physical address in RTAS code Paul Mackerras
2014-03-24 23:47   ` Paul Mackerras
2014-03-24 23:47 ` [PATCH 5/8] KVM: PPC: Book3S HV: Return ENODEV error rather than EIO Paul Mackerras
2014-03-24 23:47   ` Paul Mackerras
2014-03-24 23:47 ` [PATCH 6/8] KVM: PPC: Book3S HV: Don't use kvm_memslots() in real mode Paul Mackerras
2014-03-24 23:47   ` Paul Mackerras
2014-03-24 23:47 ` [PATCH 7/8] KVM: PPC: Book3S HV: Fix decrementer timeouts with non-zero TB offset Paul Mackerras
2014-03-24 23:47   ` Paul Mackerras
2014-03-24 23:47 ` [PATCH 8/8] KVM: PPC: Book3S HV: Save/restore host PMU registers that are new in POWER8 Paul Mackerras
2014-03-24 23:47   ` Paul Mackerras
2014-03-25  1:39 ` [PATCH 0/8] PPC Book 3S HV-mode KVM updates for 3.15 Scott Wood
2014-03-25  1:39   ` Scott Wood

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1395985237-27345-2-git-send-email-mikey@neuling.org \
    --to=mikey@neuling.org \
    --cc=agraf@suse.de \
    --cc=anton@samba.org \
    --cc=kvm-ppc@vger.kernel.org \
    --cc=kvm@vger.kernel.org \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.