Do not use arm specific kvm_nvhe_sym, expose a new definition pkvm_sym for this usage. Signed-off-by: Jason Chen CJ <jason.cj.chen@xxxxxxxxx> --- arch/arm64/include/asm/kvm_pkvm.h | 2 ++ arch/arm64/kvm/pkvm.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/kvm_pkvm.h b/arch/arm64/include/asm/kvm_pkvm.h index 2cc283feb97d..b508c7b63ff4 100644 --- a/arch/arm64/include/asm/kvm_pkvm.h +++ b/arch/arm64/include/asm/kvm_pkvm.h @@ -17,6 +17,8 @@ #define __hyp_va(phys) ((void *)((phys_addr_t)(phys) - hyp_physvirt_offset)) +#define pkvm_sym kvm_nvhe_sym + int pkvm_init_host_vm(struct kvm *kvm); int pkvm_create_hyp_vm(struct kvm *kvm); void pkvm_destroy_hyp_vm(struct kvm *kvm); diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index cf56958b1492..e787bd704043 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -13,8 +13,8 @@ #include "hyp_constants.h" -static struct memblock_region *hyp_memory = kvm_nvhe_sym(hyp_memory); -static unsigned int *hyp_memblock_nr_ptr = &kvm_nvhe_sym(hyp_memblock_nr); +static struct memblock_region *hyp_memory = pkvm_sym(hyp_memory); +static unsigned int *hyp_memblock_nr_ptr = &pkvm_sym(hyp_memblock_nr); phys_addr_t hyp_mem_base; phys_addr_t hyp_mem_size; -- 2.25.1
