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/kernel | |
| 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/kernel')
| -rw-r--r-- | arch/arm64/kernel/image-vars.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kernel/image-vars.h b/arch/arm64/kernel/image-vars.h index fdd60cd1d7e8..bcf3c2755370 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -71,8 +71,7 @@ KVM_NVHE_ALIAS(kvm_compute_final_ctr_el0); KVM_NVHE_ALIAS(kvm_vgic_global_state); /* Kernel symbols used to call panic() from nVHE hyp code (via ERET). */ -KVM_NVHE_ALIAS(__hyp_panic_string); -KVM_NVHE_ALIAS(panic); +KVM_NVHE_ALIAS(nvhe_hyp_panic_handler); /* Vectors installed by hyp-init on reset HVC. */ KVM_NVHE_ALIAS(__hyp_stub_vectors); |