Merge branch kvm-arm64/misc-5.18 into kvmarm-master/next

[linux-2.6-microblaze.git] / arch / arm64 / kvm / arm.c

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index fefd577..f49ebdd 100644 (file)
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -887,9 +887,11 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
                 * context synchronization event) is necessary to ensure that
                 * pending interrupts are taken.
                 */
-               local_irq_enable();
-               isb();
-               local_irq_disable();
+               if (ARM_EXCEPTION_CODE(ret) == ARM_EXCEPTION_IRQ) {
+                       local_irq_enable();
+                       isb();
+                       local_irq_disable();
+               }
 
                guest_timing_exit_irqoff();