> > > diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h > > > index 90873851f677..7c17a67d2291 100644 > > > --- a/arch/arm64/include/asm/kvm_mmu.h > > > +++ b/arch/arm64/include/asm/kvm_mmu.h > > > @@ -121,6 +121,8 @@ void kvm_update_va_mask(struct alt_instr *alt, > > > void kvm_compute_layout(void); > > > void kvm_apply_hyp_relocations(void); > > > > > > +#define __hyp_pa(x) (((phys_addr_t)(x)) + hyp_physvirt_offset) > > > > Just a heads up: but Quentin's series moves this same macro, but to a > > different header (arch/arm64/kvm/hyp/include/nvhe/memory.h) > > I can make sure we're putting it in the same header to ease the merge. Seems I was too optimistic since nvhe/memory.h can only be used from nVHE hyp. I could rebase no top of Quentin to move the macro somewhere that can be used from here, but that would add a series dependency that you usually seem to try and avoid so I'm not going to change this, unless you'd prefer that I do. _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/mailman/listinfo/kvmarm