diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2018-03-19 20:43:01 +0300 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2018-03-19 20:43:01 +0300 |
| commit | 5fbb0df6f68e31a586b947433e93ba9654c8080f (patch) | |
| tree | 65e68ad352e17318d009e5f69bde535c79b8c3e7 /virt/kvm/arm/hyp/vgic-v3-sr.c | |
| parent | 4b472ffd1513407ee3607b8e638e8695e9b487ca (diff) | |
| parent | 27e91ad1e746e341ca2312f29bccb9736be7b476 (diff) | |
| download | linux-5fbb0df6f68e31a586b947433e93ba9654c8080f.tar.xz | |
Merge tag 'kvm-arm-fixes-for-v4.16-2' into HEAD
Resolve conflicts with current mainline
Diffstat (limited to 'virt/kvm/arm/hyp/vgic-v3-sr.c')
| -rw-r--r-- | virt/kvm/arm/hyp/vgic-v3-sr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/virt/kvm/arm/hyp/vgic-v3-sr.c b/virt/kvm/arm/hyp/vgic-v3-sr.c index b13cbd41dbc3..616e5a433ab0 100644 --- a/virt/kvm/arm/hyp/vgic-v3-sr.c +++ b/virt/kvm/arm/hyp/vgic-v3-sr.c @@ -216,8 +216,10 @@ void __hyp_text __vgic_v3_save_state(struct kvm_vcpu *vcpu) * LRs, and when reading back the VMCR on non-VHE systems. */ if (used_lrs || !has_vhe()) { - if (!cpu_if->vgic_sre) - dsb(st); + if (!cpu_if->vgic_sre) { + dsb(sy); + isb(); + } } if (used_lrs) { |