mirror of
https://github.com/nxp-imx/linux-imx.git
synced 2025-07-18 23:29:57 +02:00
Revert "FROMLIST: KVM: arm64: VHE: Mark __hyp_call_panic __noreturn"
Revert submission 3081516 Reason for revert: Cherry-picking corresponding FROMGIT commit Reverted changes: /q/submissionid:3081516 Change-Id: Ic98cdeecb3ee49c87fa24322eef5287075af624b Signed-off-by: Pierre-Clément Tosi <ptosi@google.com>
This commit is contained in:
parent
b6e7c9eb19
commit
fe72c7b6c5
|
@ -311,7 +311,7 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __noreturn __hyp_call_panic(u64 spsr, u64 elr, u64 par)
|
static void __hyp_call_panic(u64 spsr, u64 elr, u64 par)
|
||||||
{
|
{
|
||||||
struct kvm_cpu_context *host_ctxt;
|
struct kvm_cpu_context *host_ctxt;
|
||||||
struct kvm_vcpu *vcpu;
|
struct kvm_vcpu *vcpu;
|
||||||
|
@ -336,6 +336,7 @@ void __noreturn hyp_panic(void)
|
||||||
u64 par = read_sysreg_par();
|
u64 par = read_sysreg_par();
|
||||||
|
|
||||||
__hyp_call_panic(spsr, elr, par);
|
__hyp_call_panic(spsr, elr, par);
|
||||||
|
unreachable();
|
||||||
}
|
}
|
||||||
|
|
||||||
asmlinkage void kvm_unexpected_el2_exception(void)
|
asmlinkage void kvm_unexpected_el2_exception(void)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user