diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-04-13 17:38:03 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-04-13 17:38:03 +0300 |
| commit | 5c92a7643b14a5bc93bac6e2af5f9010e284b584 (patch) | |
| tree | 240d2caf739f1e2e42f23f12bd7fa8b38d920795 /arch/arm64/kvm/hyp/nvhe/mem_protect.c | |
| parent | ad569b70aa02ffba1e86411b79570cbe4e6c7bb8 (diff) | |
| parent | aec0fae62e47050019474936248a311a0ab08705 (diff) | |
| download | linux-5c92a7643b14a5bc93bac6e2af5f9010e284b584.tar.xz | |
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/nvhe/mem_protect.c')
| -rw-r--r-- | arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index f4f364aa3282..e342f7f4f4fb 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -271,11 +271,9 @@ void handle_host_mem_abort(struct kvm_cpu_context *host_ctxt) int ret = 0; esr = read_sysreg_el2(SYS_ESR); - if (!__get_fault_info(esr, &fault)) - hyp_panic(); + BUG_ON(!__get_fault_info(esr, &fault)); addr = (fault.hpfar_el2 & HPFAR_MASK) << 8; ret = host_stage2_idmap(addr); - if (ret && ret != -EAGAIN) - hyp_panic(); + BUG_ON(ret && ret != -EAGAIN); } |