Merge tag 'kvm-arm-fixes-for-v4.16-2' into HEAD

Resolve conflicts with current mainline
2018-03-19 17:43:01 +00:00
parent 4b472ffd15 27e91ad1e7
commit 5fbb0df6f6
12 changed files with 182 additions and 73 deletions
--- 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) {