diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-07-08 23:20:38 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-07-08 23:20:38 +0300 |
| commit | 6c6165f83ba7cee1997303115ffea9d5aa646188 (patch) | |
| tree | e14c01354e5a141cc44fedae571314957e785ca3 /arch/x86/kvm/mmu | |
| parent | 26d05b368a5c0a4e12da527fab98903a204bdc88 (diff) | |
| parent | 8038a922cf9af5266eaff29ce996a0d1b788fc0d (diff) | |
| download | linux-6c6165f83ba7cee1997303115ffea9d5aa646188.tar.xz | |
Merge branch 'kvm-master' into HEAD
Merge 5.8-rc bugfixes.
Diffstat (limited to 'arch/x86/kvm/mmu')
| -rw-r--r-- | arch/x86/kvm/mmu/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 76817d13c86e..6d6a0ae7800c 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4449,7 +4449,7 @@ __reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, nonleaf_bit8_rsvd | rsvd_bits(7, 7) | rsvd_bits(maxphyaddr, 51); rsvd_check->rsvd_bits_mask[0][2] = exb_bit_rsvd | - nonleaf_bit8_rsvd | gbpages_bit_rsvd | + gbpages_bit_rsvd | rsvd_bits(maxphyaddr, 51); rsvd_check->rsvd_bits_mask[0][1] = exb_bit_rsvd | rsvd_bits(maxphyaddr, 51); |