From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benjamin Herrenschmidt Date: Thu, 23 Nov 2017 04:36:17 +0000 Subject: [PATCH v2 09/11] powerpc/kvm: Make "no_xive:" label local Message-Id: <20171123043619.15301-9-benh@kernel.crashing.org> List-Id: References: <20171123043619.15301-1-benh@kernel.crashing.org> In-Reply-To: <20171123043619.15301-1-benh@kernel.crashing.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Paul Mackerras Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, Benjamin Herrenschmidt Signed-off-by: Benjamin Herrenschmidt --- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S index ec66b0e07f47..83862fba8cfb 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S @@ -986,7 +986,7 @@ ALT_FTR_SECTION_END_IFCLR(CPU_FTR_ARCH_300) /* We are entering the guest on that thread, push VCPU to XIVE */ ld r10, HSTATE_XIVE_TIMA_PHYS(r13) cmpldi cr0, r10, 0 - beq no_xive + beq .Lno_xive ld r11, VCPU_XIVE_SAVED_STATE(r4) li r9, TM_QW1_OS eieio @@ -1042,7 +1042,7 @@ ALT_FTR_SECTION_END_IFCLR(CPU_FTR_ARCH_300) li r0, 0 stb r0, VCPU_XIVE_ESC_ON(r4) 1: -no_xive: +.Lno_xive: #endif /* CONFIG_KVM_XICS */ deliver_guest_interrupt: -- 2.14.3