[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230216184157.4hup6y6mmspr2kll@treble>
Date: Thu, 16 Feb 2023 10:41:57 -0800
From: Josh Poimboeuf <jpoimboe@...nel.org>
To: Mark Rutland <mark.rutland@....com>
Cc: Philippe Mathieu-Daudé <philmd@...aro.org>,
juri.lelli@...hat.com, dalias@...c.org, linux-ia64@...r.kernel.org,
linux-sh@...r.kernel.org, peterz@...radead.org,
catalin.marinas@....com, dave.hansen@...ux.intel.com,
x86@...nel.org, jiaxun.yang@...goat.com,
linux-mips@...r.kernel.org, bsegall@...gle.com, jcmvbkbc@...il.com,
guoren@...nel.org, hpa@...or.com, sparclinux@...r.kernel.org,
kernel@...0n.name, will@...nel.org, vschneid@...hat.com,
f.fainelli@...il.com, vincent.guittot@...aro.org,
ysato@...rs.sourceforge.jp, chenhuacai@...nel.org,
linux@...linux.org.uk, linux-csky@...r.kernel.org,
dietmar.eggemann@....com, mingo@...hat.com,
bcm-kernel-feedback-list@...adcom.com, mgorman@...e.de,
mattst88@...il.com, linux-xtensa@...ux-xtensa.org,
paulmck@...nel.org, richard.henderson@...aro.org,
npiggin@...il.com, ink@...assic.park.msu.ru, rostedt@...dmis.org,
loongarch@...ts.linux.dev, tglx@...utronix.de,
linux-arm-kernel@...ts.infradead.org, jgross@...e.com,
chris@...kel.net, tsbogend@...ha.franken.de, bristot@...hat.com,
linux-kernel@...r.kernel.org, linux-alpha@...r.kernel.org,
bp@...en8.de, linuxppc-dev@...ts.ozlabs.org, davem@...emloft.net
Subject: [PATCH v2.1 04/24] 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 <mark.rutland@....com>
Signed-off-by: Josh Poimboeuf <jpoimboe@...nel.org>
---
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 fc55f5a57a06..5733a31bab08 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 4e8327264255..d5d09a18b4f8 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);
--
2.39.1
Powered by blists - more mailing lists