Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1984fffe authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I3f39a79203a3a39fd3e61c6d757fde84d2491686
parents 855b3593 339485c9

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 109

SUBLEVEL = 110

EXTRAVERSION =

NAME = "People's Front"

arch/x86/kvm/svm.c

+1 −1
Original line number Diff line number Diff line
@@ -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)