Merge branch 'kvm-master' into HEAD

Merge AMD fixes before doing more development work.
2020-05-27 13:10:29 -04:00
parent 4c7ccc3bf7 e7581caca4
commit 7529e767c2
5 changed files with 33 additions and 39 deletions
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -778,7 +778,7 @@ static __init void svm_adjust_mmio_mask(void)
 	 */
 	mask = (mask_bit < 52) ? rsvd_bits(mask_bit, 51) | PT_PRESENT_MASK : 0;

-	kvm_mmu_set_mmio_spte_mask(mask, mask, PT_WRITABLE_MASK | PT_USER_MASK);
+	kvm_mmu_set_mmio_spte_mask(mask, PT_WRITABLE_MASK | PT_USER_MASK);
 }

 static void svm_hardware_teardown(void)