Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F981C6FA99 for ; Fri, 10 Mar 2023 20:55:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231641AbjCJUzi (ORCPT ); Fri, 10 Mar 2023 15:55:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231515AbjCJUyy (ORCPT ); Fri, 10 Mar 2023 15:54:54 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23E45134834; Fri, 10 Mar 2023 12:54:53 -0800 (PST) Date: Fri, 10 Mar 2023 20:54:51 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1678481691; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kMPzM/F8YsiXn7sC9c0rFKMUm+rO912M1OpNjDMBBsU=; b=KYNmmcMPGddnw+eGnxKVcu/MVoQfSP4hvToJCLMtCl5KqS4a/NfxPVTHn93+fQxARb+TfS TvgCn+6jV2z8ltjm/WfPEHBn+qFoXr+IB1tlMZevq3jSnJwkDp00rOyDZQa3HrhOXEebxa dBUtZjr5jRYYlRZwFsHlglzqo6VHH4871meiz7ncSuaUpMJ2B0E6aPq2mEkCs4jVWDnm8s OYTOuTJhfI/o205BIJ8b0Y6RV/RKbGOXR09UFb+zBgO+Gm0Uz+E71VfvOXT437DPqdalTc NYzPvlifZiDzjg237ZDnuuatpIYfFTPEhIUmjjGDesbkWq674lt3ehH5IrZarQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1678481691; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kMPzM/F8YsiXn7sC9c0rFKMUm+rO912M1OpNjDMBBsU=; b=xJtZcHNh4KQaRAK6Un5YoqpEBhiWBptc7tp2pRJYoWiCzS2ekfDDp7BCPVqgdYlpNbiCMq 8pvnqU51VjLdrnBw== From: "tip-bot2 for Josh Poimboeuf" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/core] sh/cpu: Make sure play_dead() doesn't return Cc: Josh Poimboeuf , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <167848169104.5837.6829636561739087615.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the objtool/core branch of tip: Commit-ID: 243971885418fcf772f18019eb3fabadcf0205d1 Gitweb: https://git.kernel.org/tip/243971885418fcf772f18019eb3fabadcf0205d1 Author: Josh Poimboeuf AuthorDate: Mon, 13 Feb 2023 23:05:47 -08:00 Committer: Josh Poimboeuf CommitterDate: Wed, 08 Mar 2023 08:44:24 -08:00 sh/cpu: Make sure play_dead() doesn't return play_dead() doesn't return. Make that more explicit with a BUG(). BUG() is preferable to unreachable() because BUG() is a more explicit failure mode and avoids undefined behavior like falling off the edge of the function into whatever code happens to be next. Link: https://lore.kernel.org/r/d0c3ff5349adfe8fd227acc236ae2c278a05eb4c.1676358308.git.jpoimboe@kernel.org Signed-off-by: Josh Poimboeuf --- arch/sh/include/asm/smp-ops.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/sh/include/asm/smp-ops.h b/arch/sh/include/asm/smp-ops.h index e277021..63866b1 100644 --- a/arch/sh/include/asm/smp-ops.h +++ b/arch/sh/include/asm/smp-ops.h @@ -27,6 +27,7 @@ static inline void plat_smp_setup(void) static inline void play_dead(void) { mp_ops->play_dead(); + BUG(); } extern void register_smp_ops(struct plat_smp_ops *ops);