Merge tag 'kvm-arm-for-4.3-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / arch / arm64 / kvm / hyp.S

diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S
index 85634777e1604714e3081a6b24f83bd28ff618a1..e5836138ec42a58841e7003bbb14f2b4a2126297 100644 (file)
--- a/arch/arm64/kvm/hyp.S
+++ b/arch/arm64/kvm/hyp.S
@@ -518,7 +518,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
@@ -535,7 +539,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