shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: KVM: arm64: Initialize pkvm_pgtable.mm_ops earlier"

Browse Source 
This reverts commit e3bc721865.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I0f24937e19518bab92d7c649c6f87ec18eec2549
This commit is contained in:
Will Deacon
2022-07-07 15:51:44 +01:00
parent 31094eab00
commit 8d1be014db
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm64/kvm/hyp/nvhe/setup.c
View File

@@ -268,6 +268,12 @@ void __noreturn __pkvm_init_finalise(void)
if (ret)
goto out;
if (kvm_iommu_ops.init) {
ret = kvm_iommu_ops.init();
if (ret)
goto out;
}
pkvm_pgtable_mm_ops = (struct kvm_pgtable_mm_ops) {
.zalloc_page = hyp_zalloc_hyp_page,
.phys_to_virt = hyp_phys_to_virt,
@@ -278,12 +284,6 @@ void __noreturn __pkvm_init_finalise(void)
};
pkvm_pgtable.mm_ops = &pkvm_pgtable_mm_ops;
if (kvm_iommu_ops.init) {
ret = kvm_iommu_ops.init();
if (ret)
goto out;
}
ret = finalize_host_mappings();
if (ret)
goto out;