From patchwork Fri Mar 10 20:54:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 67694 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1101100wrd; Fri, 10 Mar 2023 13:10:40 -0800 (PST) X-Google-Smtp-Source: AK7set+FpmqLwXfx0na6r1l2ZbK/geVA/+gnWpKdS2ogj3Coea9LqybjXVNf76qTNrcn2JP64kwn X-Received: by 2002:aa7:9e1c:0:b0:5a8:4b27:5db2 with SMTP id y28-20020aa79e1c000000b005a84b275db2mr22769288pfq.1.1678482640074; Fri, 10 Mar 2023 13:10:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678482640; cv=none; d=google.com; s=arc-20160816; b=ccxtzJjWl7L30yzLBQvNEW7Smo3CvqPudds5QjzwxljT5V1bQgKl8cyyl84FYQXHz0 X74YVnLzi/q3Zx6h2OBglLqnu6q3L5UvbmPjAw2MQKx1ji0p0fQGgn4D0fJzK6yz4QL+ IErXlwHaNDTL+L8MUWdW8BfnD25VfDcwIdRyYzxbwUsI33dI4mJeawBfoXtdy4egrrPB 8D+8C4KD66izWjK0v22E8EhtcCRHa+uSzaZud9KcuyMpU7peBA0mtwtX5DxLwIO7MDtd m1A/9LpWgERqdjbNMtFZiRdy33SJvQy5BRGElBpdrX8vEajWAHURJ+v0Tmb+xUAk98J3 8+Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=kMPzM/F8YsiXn7sC9c0rFKMUm+rO912M1OpNjDMBBsU=; b=aDpEIbp7xw154nDwbzk8910Nyuy/zQ4QW9eXaey/b0R/t1AX6dxPeT6PIL4cLzR+h4 Z5bPkuPvx4r9kubZRIlHNNyfOhn4257Xb71I0W/X3WLffUO5dgWEoBjhdZ2IzZpAV/YY ZTGqYEAt8qAmij3Wn9oXxmm0PRUI3MknY0vej5BWb/gErmVu31ZRxKk6QGhny0ofi54U KqnxWjMJqqI6aI2BGs2EAe1O+Ali6+IgF9Zgj4itqHeew0gygn7mk92ckMHDOGDWTZHt Cvn7aTvckr6ltRZZHiiXJfil8DEzy5ODavJ92AAAcPLdIccOubSQ132ZQQokmZYzQeRh 03PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=KYNmmcMP; dkim=neutral (no key) header.i=@linutronix.de header.b=xJtZcHNh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z2-20020a626502000000b0059d96ba730dsi546997pfb.110.2023.03.10.13.10.02; Fri, 10 Mar 2023 13:10:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=KYNmmcMP; dkim=neutral (no key) header.i=@linutronix.de header.b=xJtZcHNh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231303AbjCJUzf (ORCPT + 99 others); Fri, 10 Mar 2023 15:55:35 -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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757789468778573431?= X-GMAIL-MSGID: =?utf-8?q?1760016613078331903?= 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);