* [PATCH] s390/nmi: Annotate s390_handle_damage with __noreturn
@ 2025-10-27 8:47 Thorsten Blum
2025-10-29 13:12 ` Heiko Carstens
0 siblings, 1 reply; 2+ messages in thread
From: Thorsten Blum @ 2025-10-27 8:47 UTC (permalink / raw)
To: Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle
Cc: Thorsten Blum, linux-s390, linux-kernel
s390_handle_damage() ends by calling the non-returning function
disabled_wait() and therefore also never returns. Annotate it with the
__noreturn compiler attribute to improve compiler optimizations.
Remove the unreachable infinite while loop.
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
arch/s390/kernel/nmi.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c
index 11f33243a23f..a55abbf65333 100644
--- a/arch/s390/kernel/nmi.c
+++ b/arch/s390/kernel/nmi.c
@@ -184,7 +184,7 @@ static notrace void nmi_print_info(void)
sclp_emergency_printk(message);
}
-static notrace void s390_handle_damage(void)
+static notrace void __noreturn s390_handle_damage(void)
{
struct lowcore *lc = get_lowcore();
union ctlreg0 cr0, cr0_new;
@@ -214,7 +214,6 @@ static notrace void s390_handle_damage(void)
lc->mcck_new_psw = psw_save;
local_ctl_load(0, &cr0.reg);
disabled_wait();
- while (1);
}
NOKPROBE_SYMBOL(s390_handle_damage);
--
2.51.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] s390/nmi: Annotate s390_handle_damage with __noreturn
2025-10-27 8:47 [PATCH] s390/nmi: Annotate s390_handle_damage with __noreturn Thorsten Blum
@ 2025-10-29 13:12 ` Heiko Carstens
0 siblings, 0 replies; 2+ messages in thread
From: Heiko Carstens @ 2025-10-29 13:12 UTC (permalink / raw)
To: Thorsten Blum
Cc: Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, linux-s390, linux-kernel
On Mon, Oct 27, 2025 at 09:47:25AM +0100, Thorsten Blum wrote:
> s390_handle_damage() ends by calling the non-returning function
> disabled_wait() and therefore also never returns. Annotate it with the
> __noreturn compiler attribute to improve compiler optimizations.
>
> Remove the unreachable infinite while loop.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> ---
> arch/s390/kernel/nmi.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-10-29 13:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-27 8:47 [PATCH] s390/nmi: Annotate s390_handle_damage with __noreturn Thorsten Blum
2025-10-29 13:12 ` Heiko Carstens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).