Merge 4.19.110 into android-4.19

Changes in 4.19.110
	KVM: SVM: fix up incorrect backport
	Linux 4.19.110

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3f39a79203a3a39fd3e61c6d757fde84d2491686
This commit is contained in:
Greg Kroah-Hartman
2020-03-16 11:07:08 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 19
SUBLEVEL = 109
SUBLEVEL = 110
EXTRAVERSION =
NAME = "People's Front"

View File

@@ -1336,7 +1336,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, PT_WRITABLE_MASK | PT_USER_MASK);
kvm_mmu_set_mmio_spte_mask(mask, mask);
}
static __init int svm_hardware_setup(void)