From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from devianza.investici.org (devianza.investici.org [198.167.222.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 542F1376A12 for ; Sun, 26 Jul 2026 19:04:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.167.222.108 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785092664; cv=none; b=d/D/tDYfWysXPZ/8MSLifCmCk9UCKv2l98sSQAz/uT+zZMPJeRDN3uZE2DBP0wpx8lHi3tsNuVwQVoXfJG0QM3L8G6cILl/grpHxDgyV50Tl3J8UbGrk0OYQXgIQGKBGtfDn0TQvxyZhr/IhUATgS5+E7/ne2D06CrkTsv+gJ3k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785092664; c=relaxed/simple; bh=ZeFz+dd3IWoD9BlzEeWgy4nO4CZbKtxG3eXmo7xNyck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cgxc8cD4dzeNjE8BgwFjZVWsWe0jFNfQVF91NLX06Jdw+5hAM7S8W0QYoXpCL5KtYoFj3oD1U8utbgKFW4M85169JjGJqRUijtBmLhRHDVRiN7KbfXmy10oQnZ3bP6UULwWbOlJyk9L9MML6PN9YXop5ncDY3MvPmyV6Ahz7ZQs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=grrlz.net; spf=pass smtp.mailfrom=grrlz.net; dkim=pass (1024-bit key) header.d=grrlz.net header.i=@grrlz.net header.b=iRxZX9YX; arc=none smtp.client-ip=198.167.222.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=grrlz.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=grrlz.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=grrlz.net header.i=@grrlz.net header.b="iRxZX9YX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grrlz.net; s=stigmate; t=1785092654; bh=LsqHl18LoCGdS70wfmb8INWc84YkpVgkdqU9NDxWADo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iRxZX9YXMC1ol2ojeOl77nxqqObpxuN5ZBfCv+0WENeVIBHP3kHvUyllrJSWf+kez n4YIAThkw6ck8pshbtYehvI8PkebXfeKTIpbD+iAv3IoKGHWFUF56UZoQ8uO0EosZK h53Y9RURT/huMYCfR/Tyit+SaL1jr0cNi0VC7iGE= Received: from mx2.investici.org (unknown [127.0.0.1]) by devianza.investici.org (Postfix) with ESMTP id 4h7WNt4qTtz6vQH; Sun, 26 Jul 2026 19:04:14 +0000 (UTC) Received: by mx2.investici.org (Postfix) id 4h7WNt0DSBz4y2Q; Sun, 26 Jul 2026 19:04:13 +0000 (UTC) From: Bradley Morgan To: Andrew Morton Cc: Petr Mladek , Jinchao Wang , Feng Tang , Rio , Pnina Feder , Petr Pavlu , Sergey Senozhatsky , linux-kernel@vger.kernel.org, Bradley Morgan Subject: [PATCH v5 2/4] panic: flatten nmi_panic control flow Date: Sun, 26 Jul 2026 19:04:10 +0000 Message-ID: <20260726190412.10891-3-include@grrlz.net> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260726190412.10891-1-include@grrlz.net> References: <20260726190412.10891-1-include@grrlz.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Reviewed-by: Petr Mladek Signed-off-by: Bradley Morgan --- kernel/panic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/panic.c b/kernel/panic.c index 26b91b92dd71..74065c860779 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -516,7 +516,8 @@ void nmi_panic(struct pt_regs *regs, const char *msg) { if (panic_try_start()) panic("%s", msg); - else if (panic_on_other_cpu()) + + if (panic_on_other_cpu()) nmi_panic_self_stop(regs); } EXPORT_SYMBOL(nmi_panic); -- 2.47.3