diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-04-13 15:38:03 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-04-13 15:38:03 +0100 |
| commit | 5c92a7643b14a5bc93bac6e2af5f9010e284b584 (patch) | |
| tree | 240d2caf739f1e2e42f23f12bd7fa8b38d920795 /arch/arm64/include/asm/kvm_mmu.h | |
| parent | ad569b70aa02ffba1e86411b79570cbe4e6c7bb8 (diff) | |
| parent | aec0fae62e47050019474936248a311a0ab08705 (diff) | |
Merge branch 'kvm-arm64/nvhe-panic-info' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/kvm_mmu.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_mmu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h index 9d64fa73ee67..25ed956f9af1 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) + static __always_inline unsigned long __kern_hyp_va(unsigned long v) { asm volatile(ALTERNATIVE_CB("and %0, %0, #1\n" |