summaryrefslogtreecommitdiff
path: root/arch/arm64/kvm/vgic/vgic.c
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2020-12-04 10:12:55 +0000
committerMarc Zyngier <maz@kernel.org>2020-12-04 10:12:55 +0000
commit17f84520cb8fcaf475c96c3ee90dd97b55a63669 (patch)
treef865c7d4a917642bf84e7348a6149d025b9082e0 /arch/arm64/kvm/vgic/vgic.c
parentf86e54653e67171a7cc0f85e0fe5766deb310e03 (diff)
parent652d0b701d136ede6bc8a977b3abbe2d420226b9 (diff)
downloadlwn-17f84520cb8fcaf475c96c3ee90dd97b55a63669.tar.gz
lwn-17f84520cb8fcaf475c96c3ee90dd97b55a63669.zip
Merge remote-tracking branch 'origin/kvm-arm64/misc-5.11' into kvmarm-master/queue
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/vgic/vgic.c')
-rw-r--r--arch/arm64/kvm/vgic/vgic.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kvm/vgic/vgic.c b/arch/arm64/kvm/vgic/vgic.c
index c3643b7f101b..1c597c9885fa 100644
--- a/arch/arm64/kvm/vgic/vgic.c
+++ b/arch/arm64/kvm/vgic/vgic.c
@@ -915,6 +915,9 @@ void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu)
if (can_access_vgic_from_kernel())
vgic_restore_state(vcpu);
+
+ if (vgic_supports_direct_msis(vcpu->kvm))
+ vgic_v4_commit(vcpu);
}
void kvm_vgic_load(struct kvm_vcpu *vcpu)