From patchwork Fri Mar 10 20:54:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 67689 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1098149wrd; Fri, 10 Mar 2023 13:03:38 -0800 (PST) X-Google-Smtp-Source: AK7set8IoaU3xQaSiBtfAFt0bcRp1Ma8LtU152xvRu+omX1QrrWhN5LJLdikRUyDep2Zk6OFRiSy X-Received: by 2002:a05:6a20:4281:b0:cc:a8d7:ad62 with SMTP id o1-20020a056a20428100b000cca8d7ad62mr33002465pzj.27.1678482218405; Fri, 10 Mar 2023 13:03:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678482218; cv=none; d=google.com; s=arc-20160816; b=mSmClA6l+5CWzc1RYYjLpXWl4+MwHmcF97UNZjjUjD6Pvm46qMbo9DjTpiinaSUixp WqTUxoPV7LnILCU4dr0p0FHabpRkhm3OEiTqGhu6j1ay4cxIehkh2aHVvnf5NAWeOg/6 lHpYLc79du4IW9oTqOGWOiAt8xIHwi6nscVhR5HxmXhRnHrg9CR4XKpovQLD6PGH0A8n t+exWFuaKLqlh0yzGDF5t46ZaPLOk1E/zGksqPBTIaws64Y5v8PHziZ2FhD2x/xsYzj5 bNZTDfD8czZIl6j1ARqHWGxHdxvMReiI2TiKGlik11viugkuC0XiU+eoJYe4+8xHggMO IIPg== 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=fq5sDqpaaKjEYwGm+P2VoPuD8L7sJUJkorSkQBagyC8=; b=yQibBD5K0psurYgiAH3WzKjblXIFr+KWusQp+yuSG2r4tac6XhUA/sqI3puPHV7qeO WI+VBWgPDvJQ3WL9wVxw6PQQDaDTdkWk8lF9UPR5nmYtC2OjhqwxN2sH6ju5m6mX8OhG reLVQpkPax5gTMAKO2vZdBKeblFAlo45weMmwn272WR2P+7JysdldTLa0N2YXr8+oewf 9H6Oa2GHCnF8USvT7RVI8wonOWRoMYL9dIwL3nlMYsuzlzYyofJWYla52VFDkBOiS9zX FZjd3jOqeoS0t7CdtF8MWJbcoDunlj2J5IFdHBTV5kzA5DPhZfPhr5ofXrOAEa3F1zTg 5Oag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=0s0uv9r6; dkim=neutral (no key) header.i=@linutronix.de; 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 e189-20020a6369c6000000b0050301655047si652124pgc.30.2023.03.10.13.03.22; Fri, 10 Mar 2023 13:03:38 -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=0s0uv9r6; dkim=neutral (no key) header.i=@linutronix.de; 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 S231792AbjCJU4P (ORCPT + 99 others); Fri, 10 Mar 2023 15:56:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231594AbjCJUy5 (ORCPT ); Fri, 10 Mar 2023 15:54:57 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4530136894; Fri, 10 Mar 2023 12:54:56 -0800 (PST) Date: Fri, 10 Mar 2023 20:54:55 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1678481695; 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=fq5sDqpaaKjEYwGm+P2VoPuD8L7sJUJkorSkQBagyC8=; b=0s0uv9r6TFi6zJQw4lU2L8vBImJZYQOrC2zS3u/DZphFHxoZwgIFjZqYQf0X9y19ytmJKI yr0PRQaVjiYkAECH7o3oOgbnL4k/MfI2fow9jI1nEYT4GADNvQn5ADtxrzhwEWD0xec2CW 4yAZvwXPij/goWnotpXhMtHaDcbpepxOXktga4t0buG3WJiu4lJC6EmbQVRZ7HkLV+k2Pp YmKEJSfGak0E01Ohgj2B3b0v47AvLiDOfL0gKqCVH/6+tS6jXwQCY7Sd1cIbMreVla5vHH lrxYuGKhuXVn2sI9vW56M/e/PFcS9mVR97z/6iCnURTwNc13AcRMsDkJN54LCA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1678481695; 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=fq5sDqpaaKjEYwGm+P2VoPuD8L7sJUJkorSkQBagyC8=; b=DWuU2TYoQ0rnG4wCCDlb6q8g7njXwp4VdmoNXU8dEBZg1H4wjDVApYrSxCXVdVPtQqJg6C 9PDxKjE2XVfpFUDw== 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] arm64/cpu: Mark cpu_die() __noreturn Cc: Mark Rutland , philmd@linaro.org, Josh Poimboeuf , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230216184157.4hup6y6mmspr2kll@treble> References: <20230216184157.4hup6y6mmspr2kll@treble> MIME-Version: 1.0 Message-ID: <167848169508.5837.542474183671220322.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?1757789359682997448?= X-GMAIL-MSGID: =?utf-8?q?1760016170726266536?= The following commit has been merged into the objtool/core branch of tip: Commit-ID: 9bdc61ef27db5eaac48f1cc5deb8224603e79c89 Gitweb: https://git.kernel.org/tip/9bdc61ef27db5eaac48f1cc5deb8224603e79c89 Author: Josh Poimboeuf AuthorDate: Thu, 16 Feb 2023 10:42:01 -08:00 Committer: Josh Poimboeuf CommitterDate: Mon, 06 Mar 2023 15:34:04 -08:00 arm64/cpu: Mark cpu_die() __noreturn cpu_die() doesn't return. Annotate it as such. By extension this also makes arch_cpu_idle_dead() noreturn. Acked-by: Mark Rutland Reviewed-by: Philippe Mathieu-Daudé Link: https://lkml.kernel.org/r/20230216184157.4hup6y6mmspr2kll@treble Signed-off-by: Josh Poimboeuf --- arch/arm64/include/asm/smp.h | 2 +- arch/arm64/kernel/smp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h index fc55f5a..5733a31 100644 --- a/arch/arm64/include/asm/smp.h +++ b/arch/arm64/include/asm/smp.h @@ -100,7 +100,7 @@ static inline void arch_send_wakeup_ipi_mask(const struct cpumask *mask) extern int __cpu_disable(void); extern void __cpu_die(unsigned int cpu); -extern void cpu_die(void); +extern void __noreturn cpu_die(void); extern void cpu_die_early(void); static inline void cpu_park_loop(void) diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 4e83272..d5d09a1 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -361,7 +361,7 @@ void __cpu_die(unsigned int cpu) * Called from the idle thread for the CPU which has been shutdown. * */ -void cpu_die(void) +void __noreturn cpu_die(void) { unsigned int cpu = smp_processor_id(); const struct cpu_operations *ops = get_cpu_ops(cpu);