[PATCH v3 07/12] KVM: arm64: VHE: Mark __hyp_call_panic __noreturn

Will Deacon will at kernel.org
Mon May 13 07:52:43 PDT 2024


On Fri, May 10, 2024 at 12:26:36PM +0100, Pierre-Clément Tosi wrote:
> Given that the sole purpose of __hyp_call_panic() is to call panic(), a
> __noreturn function, give it the __noreturn attribute, removing the need
> for its caller to use unreachable().
> 
> Signed-off-by: Pierre-Clément Tosi <ptosi at google.com>
> ---
>  arch/arm64/kvm/hyp/vhe/switch.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/kvm/hyp/vhe/switch.c b/arch/arm64/kvm/hyp/vhe/switch.c
> index 1581df6aec87..9db04a286398 100644
> --- a/arch/arm64/kvm/hyp/vhe/switch.c
> +++ b/arch/arm64/kvm/hyp/vhe/switch.c
> @@ -301,7 +301,7 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu)
>  	return ret;
>  }
>  
> -static void __hyp_call_panic(u64 spsr, u64 elr, u64 par)
> +static void __noreturn __hyp_call_panic(u64 spsr, u64 elr, u64 par)
>  {
>  	struct kvm_cpu_context *host_ctxt;
>  	struct kvm_vcpu *vcpu;
> @@ -326,7 +326,6 @@ void __noreturn hyp_panic(void)
>  	u64 par = read_sysreg_par();
>  
>  	__hyp_call_panic(spsr, elr, par);
> -	unreachable();
>  }
> 

Acked-by: Will Deacon <will at kernel.org>

Will



More information about the linux-arm-kernel mailing list