diff options
| author | Marc Zyngier <maz@kernel.org> | 2022-07-17 13:45:22 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2022-07-17 13:45:22 +0300 |
| commit | aeb7942b64ccab88140542a92a6ac3ac5726e053 (patch) | |
| tree | 860f0149628d7c306d777f58e4c8d9c9693110da /arch/arm64/kvm/handle_exit.c | |
| parent | dc94f89ae68fba71f0423dde3c9956f4d9c47e5d (diff) | |
| parent | ed6313a93fd11d2015ad17046f3c418bf6a8dab1 (diff) | |
| download | linux-aeb7942b64ccab88140542a92a6ac3ac5726e053.tar.xz | |
Merge branch kvm-arm64/misc-5.20 into kvmarm-master/next
* kvm-arm64/misc-5.20:
: .
: Misc fixes for 5.20:
:
: - Tidy up the hyp/nvhe Makefile
:
: - Fix functions pointlessly returning a void value
:
: - Fix vgic_init selftest to handle the GICv3-on-v3 case
:
: - Fix hypervisor symbolisation when CONFIG_RANDOMIZE_BASE=y
: .
KVM: arm64: Fix hypervisor address symbolization
KVM: arm64: selftests: Add support for GICv2 on v3
KVM: arm64: Don't return from void function
KVM: arm64: nvhe: Add intermediates to 'targets' instead of extra-y
KVM: arm64: nvhe: Rename confusing obj-y
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/handle_exit.c')
| -rw-r--r-- | arch/arm64/kvm/handle_exit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index d045f5b973b9..cb0bc77c16f9 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -347,10 +347,10 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr, kvm_err("nVHE hyp BUG at: %s:%u!\n", file, line); else kvm_err("nVHE hyp BUG at: [<%016llx>] %pB!\n", panic_addr, - (void *)panic_addr); + (void *)(panic_addr + kaslr_offset())); } else { kvm_err("nVHE hyp panic at: [<%016llx>] %pB!\n", panic_addr, - (void *)panic_addr); + (void *)(panic_addr + kaslr_offset())); } /* |