diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2020-05-27 19:10:29 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-05-27 19:10:29 +0200 |
commit | 7529e767c2a94b33a689ff9c1293e351ecc234ee (patch) | |
tree | 6e1728c2270378a1fcde485d1d10a86f255c339a /arch/x86/kvm/svm | |
parent | Merge tag 'kvm-s390-next-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
parent | KVM: x86: simplify is_mmio_spte (diff) | |
download | linux-7529e767c2a94b33a689ff9c1293e351ecc234ee.tar.xz linux-7529e767c2a94b33a689ff9c1293e351ecc234ee.zip |
Merge branch 'kvm-master' into HEAD
Merge AMD fixes before doing more development work.
Diffstat (limited to 'arch/x86/kvm/svm')
-rw-r--r-- | arch/x86/kvm/svm/svm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 4e9cd2a73ad0..e9c0fb68387d 100644 --- 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) |