]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
s390/nmi: Annotate s390_handle_damage() with __noreturn
authorThorsten Blum <thorsten.blum@linux.dev>
Mon, 27 Oct 2025 08:47:25 +0000 (09:47 +0100)
committerHeiko Carstens <hca@linux.ibm.com>
Thu, 6 Nov 2025 13:17:28 +0000 (14:17 +0100)
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>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
arch/s390/kernel/nmi.c

index 11f33243a23f353d71c6f83e29c506e47298fd30..a55abbf65333a17dd869ba5fb9fd6189e2a152ee 100644 (file)
@@ -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);