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/kvm/hyp/include | |
| 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/kvm/hyp/include')
| -rw-r--r-- | arch/arm64/kvm/hyp/include/hyp/switch.h | 2 | ||||
| -rw-r--r-- | arch/arm64/kvm/hyp/include/nvhe/gfp.h | 2 | ||||
| -rw-r--r-- | arch/arm64/kvm/hyp/include/nvhe/memory.h | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h index cdf42e347d3f..e4a2f295a394 100644 --- a/arch/arm64/kvm/hyp/include/hyp/switch.h +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h @@ -30,8 +30,6 @@ #include <asm/processor.h> #include <asm/thread_info.h> -extern const char __hyp_panic_string[]; - extern struct exception_table_entry __start___kvm_ex_table; extern struct exception_table_entry __stop___kvm_ex_table; diff --git a/arch/arm64/kvm/hyp/include/nvhe/gfp.h b/arch/arm64/kvm/hyp/include/nvhe/gfp.h index 55b3f0ce5bc8..18a4494337bd 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/gfp.h +++ b/arch/arm64/kvm/hyp/include/nvhe/gfp.h @@ -51,7 +51,7 @@ static inline void hyp_set_page_refcounted(struct hyp_page *p) hyp_spin_lock(&pool->lock); if (p->refcount) { hyp_spin_unlock(&pool->lock); - hyp_panic(); + BUG(); } p->refcount = 1; hyp_spin_unlock(&pool->lock); diff --git a/arch/arm64/kvm/hyp/include/nvhe/memory.h b/arch/arm64/kvm/hyp/include/nvhe/memory.h index d2fb307c5952..fd78bde939ee 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/memory.h +++ b/arch/arm64/kvm/hyp/include/nvhe/memory.h @@ -2,6 +2,7 @@ #ifndef __KVM_HYP_MEMORY_H #define __KVM_HYP_MEMORY_H +#include <asm/kvm_mmu.h> #include <asm/page.h> #include <linux/types.h> @@ -14,11 +15,9 @@ struct hyp_page { struct list_head node; }; -extern s64 hyp_physvirt_offset; extern u64 __hyp_vmemmap; #define hyp_vmemmap ((struct hyp_page *)__hyp_vmemmap) -#define __hyp_pa(virt) ((phys_addr_t)(virt) + hyp_physvirt_offset) #define __hyp_va(phys) ((void *)((phys_addr_t)(phys) - hyp_physvirt_offset)) static inline void *hyp_phys_to_virt(phys_addr_t phys) |