From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Bradley Morgan <brads@mainlining.org>,
Andrew Morton <akpm@linux-foundation.org>,
Petr Mladek <pmladek@suse.com>,
Guenetr Roeck <linux@roeck-us.net>,
Sashiko <sashiko-bot@kernel.org>,
Wang Jinchao <wangjinchao600@gmail.com>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.10.y] panic: flatten nmi_panic control flow
Date: Tue, 10 Nov 2026 14:58:28 -0500 [thread overview]
Message-ID: <20261110195623.3491996-1-sashal@kernel.org> (raw)
In-Reply-To: <20261107062241-failed-5.10-75eb687ff2bc@kernel.org>
From: Bradley Morgan <brads@mainlining.org>
[ Upstream commit 75eb687ff2bcec9fba31bbe266e5f91e5c283efe ]
panic() is __noreturn, so the else after panic_try_start() is dead. Drop
it so the force_cpu path can be added cleanly on top.
Link: https://lore.kernel.org/20260916182957.7788-3-brads@mainlining.org
Signed-off-by: Bradley Morgan <brads@mainlining.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Cc: Guenetr Roeck <linux@roeck-us.net>
Cc: Sashiko <sashiko-bot@kernel.org>
Cc: Wang Jinchao <wangjinchao600@gmail.com>
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: <stable@vger.kernel.org>
[ sashal: adapted helper-based conditions to existing direct old_cpu comparisons ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
kernel/panic.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/panic.c b/kernel/panic.c
index 30d8da0d43d8f..f7dd6095b4ece 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -194,7 +194,8 @@ void nmi_panic(struct pt_regs *regs, const char *msg)
if (old_cpu == PANIC_CPU_INVALID)
panic("%s", msg);
- else if (old_cpu != cpu)
+
+ if (old_cpu != cpu)
nmi_panic_self_stop(regs);
}
EXPORT_SYMBOL(nmi_panic);
--
2.53.0
prev parent reply other threads:[~2026-11-10 19:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-07 11:22 FAILED: patch "[PATCH] panic: flatten nmi_panic control flow" failed to apply to 5.10-stable tree Sasha Levin
2026-11-10 19:58 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261110195623.3491996-1-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=brads@mainlining.org \
--cc=linux@roeck-us.net \
--cc=pmladek@suse.com \
--cc=sashiko-bot@kernel.org \
--cc=stable@vger.kernel.org \
--cc=wangjinchao600@gmail.com \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.