From patchwork Fri Feb 3 22:05:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 52688 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1081052wrn; Fri, 3 Feb 2023 14:10:07 -0800 (PST) X-Google-Smtp-Source: AK7set9uWB8SDO3lB4PHnJNPHcHHBhnT2SJvVuKvS3KCZ6vIa0tpdTqZ1+7ZVDSb8ghoo5VOEoAH X-Received: by 2002:a05:6a20:e611:b0:bf:d9f0:aa27 with SMTP id my17-20020a056a20e61100b000bfd9f0aa27mr4737165pzb.55.1675462207656; Fri, 03 Feb 2023 14:10:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675462207; cv=none; d=google.com; s=arc-20160816; b=Q1IaVfRAotEu2Cfp3CdJ5lC2wV8a0O6gImQCP4jxFfDlv3+XmkIhbZNcKzvOqWEg1E t9Kkeua6ObbNUisoqLk0GZKZalUuXCzJ6167Qh+K0n6Mx+51e2YnHzT5RqTJWV0mxq50 AW9lzJGDetb673sssbzxX9oQoEVn1DvaD79OBmW8VfHCqaM5vBBcwe37X61TrNyTuQoB HkD3Uy7UtWQLzDP18vgdFQOXGwGZF+ezKqFrAOYreqUToAxVrR0FHyJFy/anNenRvxUl D+lY9VIXiT4VzlKEBJRD+71qo9DFHoH9mOw+EgY9YIqIpHrHbIZ8MNpKJoB7U/LK1Yj/ 8fKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gtzQ4f+Sl7IjL8DnmBcrYxcH/rm0pahW193n2c/GXw0=; b=OFCNv5q2Sqyqq5LhgBMehp16HfNgdAT2r8HfrJWy9Jcuu9S+sZkq4nY+fp7jRbD19n ulFUMxd3mnFgC9WWVjpQ6kCaj/SR9sNpp+6H5EjN8LfMSk5I1Qb3jaTACQ2tb8pwcxZC IQD6HTTcmHJnmC9n2UxALAaxA78FhSgsaK5a1wMHP3iKZIeZjt2z6ry/klpCTql81bJU 4NCUZUXLcG+vaV86WD9Q1gVjkLmWnJSM3kQJNxfGg4FI5LhfS2Orb3jU2cKBwVrA7RRQ XZm3yNeAgoWrko9BZOstFWdcDcVrTV2lGezv/LizTmIWzLpXtKUvHj4WFaKa1vJlBsFJ nCXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=k2rixxjx; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x11-20020a63aa4b000000b004e1f84a0049si3401887pgo.823.2023.02.03.14.09.54; Fri, 03 Feb 2023 14:10:07 -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=@kernel.org header.s=k20201202 header.b=k2rixxjx; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234151AbjBCWJA (ORCPT + 99 others); Fri, 3 Feb 2023 17:09:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233533AbjBCWIF (ORCPT ); Fri, 3 Feb 2023 17:08:05 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D939AF0DE; Fri, 3 Feb 2023 14:06:31 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id F4222CE31C3; Fri, 3 Feb 2023 22:06:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DF46C4339C; Fri, 3 Feb 2023 22:06:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675461975; bh=bXJvKHvsodpO0BPlco2s0aMLVPJi3gp9AhXx9K2v2Lo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k2rixxjxWrJRRyUMI/UIOonFKDfpZNhS5xd+/8CuXK0prPGkQnnv9Kfg10DIKZOUJ TnQ9bBPlqmYQDrXpQSFxMhJGIKsE/V+npKts3TEZNdT8iuM0s9Iq/8P0rYPzPyZwJ4 Jh6lhsIXNcEbx1B5mweJ3CQge57WG2SQxBM/6jESjWiE44sc6FKSEPhym1/PqmwKMO nhRytRWxyWzWSDDhS1ZWNY+LxbnIUqHAkuGjhF7/fQVzkTW/gQPTqo4uppxXJbVsVu u2gxECq3yVWPrt2pTsvgswuFgQhH6K6nVThvA924uuSIhWhkbCYXj3lDMkpQXXw5sZ tcWARjjzt2M+A== From: Josh Poimboeuf To: linux-kernel@vger.kernel.org Cc: jgross@suse.com, richard.henderson@linaro.org, ink@jurassic.park.msu.ru, mattst88@gmail.com, linux-alpha@vger.kernel.org, linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, will@kernel.org, guoren@kernel.org, linux-csky@vger.kernel.org, linux-ia64@vger.kernel.org, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev, f.fainelli@gmail.com, bcm-kernel-feedback-list@broadcom.com, tsbogend@alpha.franken.de, linux-mips@vger.kernel.org, jiaxun.yang@flygoat.com, mpe@ellerman.id.au, npiggin@gmail.com, christophe.leroy@csgroup.eu, linuxppc-dev@lists.ozlabs.org, ysato@users.sourceforge.jp, dalias@libc.org, linux-sh@vger.kernel.org, davem@davemloft.net, sparclinux@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, chris@zankel.net, jcmvbkbc@gmail.com, linux-xtensa@linux-xtensa.org, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, paulmck@kernel.org Subject: [PATCH 18/22] x86/cpu: Mark play_dead() __noreturn Date: Fri, 3 Feb 2023 14:05:27 -0800 Message-Id: <6e322880a30ed582847702f400fa99f55be821d3.1675461757.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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?1756849460085162318?= X-GMAIL-MSGID: =?utf-8?q?1756849460085162318?= play_dead() doesn't return. Annotate it as such. By extension this also makes arch_cpu_idle_dead() noreturn. Signed-off-by: Josh Poimboeuf --- arch/x86/include/asm/smp.h | 2 +- arch/x86/kernel/process.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index 8f628e08b25a..e6d1d2810e38 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h @@ -93,7 +93,7 @@ static inline void __cpu_die(unsigned int cpu) smp_ops.cpu_die(cpu); } -static inline void play_dead(void) +static inline void __noreturn play_dead(void) { smp_ops.play_dead(); BUG(); diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index b650cde3f64d..f1ec36caf1d8 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -715,7 +715,7 @@ static bool x86_idle_set(void) } #ifndef CONFIG_SMP -static inline void play_dead(void) +static inline void __noreturn play_dead(void) { BUG(); }