diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-09-14 11:05:39 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-09-14 11:05:39 -0400 |
| commit | 7c7cce2cf7ee2ac54851ba1fbcf0e968932e32b9 (patch) | |
| tree | d37c220ff624e4023d861d5d725ccb45aedd3e46 /arch/arm64/kvm/mmu.c | |
| parent | 0bb80ecc33a8fb5a682236443c1e740d5c917d1d (diff) | |
| parent | 373beef00f7d781a000b12c31fb17a5a9c25969c (diff) | |
Merge tag 'kvmarm-fixes-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 6.6, take #1
- Fix EL2 Stage-1 MMIO mappings where a random address was used
- Fix SMCCC function number comparison when the SVE hint is set
Diffstat (limited to 'arch/arm64/kvm/mmu.c')
| -rw-r--r-- | arch/arm64/kvm/mmu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 587a104f66c3..482280fe22d7 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -652,6 +652,9 @@ int hyp_alloc_private_va_range(size_t size, unsigned long *haddr) mutex_unlock(&kvm_hyp_pgd_mutex); + if (!ret) + *haddr = base; + return ret; } |