Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934504AbbGVPRm (ORCPT ); Wed, 22 Jul 2015 11:17:42 -0400 Received: from foss.arm.com ([217.140.101.70]:36578 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933634AbbGVPRk (ORCPT ); Wed, 22 Jul 2015 11:17:40 -0400 Date: Wed, 22 Jul 2015 16:17:39 +0100 From: Will Deacon To: Daniel Thompson Cc: Catalin Marinas , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "patches@linaro.org" , "linaro-kernel@lists.linaro.org" , John Stultz , Sumit Semwal , Christoffer Dall , Marc Zyngier , Andre Przywara Subject: Re: [PATCH v3 4/5] arm64: kvm: Adopt new alternative assembler macros Message-ID: <20150722151739.GM6650@arm.com> References: <1436536130-31438-1-git-send-email-daniel.thompson@linaro.org> <1437564065-4356-1-git-send-email-daniel.thompson@linaro.org> <1437564065-4356-5-git-send-email-daniel.thompson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1437564065-4356-5-git-send-email-daniel.thompson@linaro.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1701 Lines: 55 Marc, Christoffer, On Wed, Jul 22, 2015 at 12:21:04PM +0100, Daniel Thompson wrote: > Convert the dynamic patching for ARM64_HAS_SYSREG_GIC_CPUIF over to > the newly added alternative assembler macros. Do you mind if I take this via the arm64 tree? It won't apply in isolation and I'd expect conflicts to be small/trivial to resolve. Cheers, Will > --- > arch/arm64/kvm/hyp.S | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S > index 17a8fb14f428..10915aaf0b01 100644 > --- a/arch/arm64/kvm/hyp.S > +++ b/arch/arm64/kvm/hyp.S > @@ -810,7 +810,11 @@ > * Call into the vgic backend for state saving > */ > .macro save_vgic_state > - alternative_insn "bl __save_vgic_v2_state", "bl __save_vgic_v3_state", ARM64_HAS_SYSREG_GIC_CPUIF > +alternative_if_not ARM64_HAS_SYSREG_GIC_CPUIF > + bl __save_vgic_v2_state > +alternative_else > + bl __save_vgic_v3_state > +alternative_endif > mrs x24, hcr_el2 > mov x25, #HCR_INT_OVERRIDE > neg x25, x25 > @@ -827,7 +831,11 @@ > orr x24, x24, #HCR_INT_OVERRIDE > orr x24, x24, x25 > msr hcr_el2, x24 > - alternative_insn "bl __restore_vgic_v2_state", "bl __restore_vgic_v3_state", ARM64_HAS_SYSREG_GIC_CPUIF > +alternative_if_not ARM64_HAS_SYSREG_GIC_CPUIF > + bl __restore_vgic_v2_state > +alternative_else > + bl __restore_vgic_v3_state > +alternative_endif > .endm > > .macro save_timer_state > -- > 2.4.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/