[PATCH v2.1 04/24] arm64/cpu: Mark cpu_die() __noreturn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
- To: Mark Rutland <mark.rutland@xxxxxxx>
- Subject: [PATCH v2.1 04/24] arm64/cpu: Mark cpu_die() __noreturn
- From: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
- Date: Thu, 16 Feb 2023 10:41:57 -0800
- Cc: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>, juri.lelli@xxxxxxxxxx, dalias@xxxxxxxx, linux-ia64@xxxxxxxxxxxxxxx, linux-sh@xxxxxxxxxxxxxxx, peterz@xxxxxxxxxxxxx, catalin.marinas@xxxxxxx, dave.hansen@xxxxxxxxxxxxxxx, x86@xxxxxxxxxx, jiaxun.yang@xxxxxxxxxxx, linux-mips@xxxxxxxxxxxxxxx, bsegall@xxxxxxxxxx, jcmvbkbc@xxxxxxxxx, guoren@xxxxxxxxxx, hpa@xxxxxxxxx, sparclinux@xxxxxxxxxxxxxxx, kernel@xxxxxxxxxx, will@xxxxxxxxxx, vschneid@xxxxxxxxxx, f.fainelli@xxxxxxxxx, vincent.guittot@xxxxxxxxxx, ysato@xxxxxxxxxxxxx, chenhuacai@xxxxxxxxxx, linux@xxxxxxxxxxxxxxx, linux-csky@xxxxxxxxxxxxxxx, dietmar.eggemann@xxxxxxx, mingo@xxxxxxxxxx, bcm-kernel-feedback-list@xxxxxxxxxxxx, mgorman@xxxxxxx, mattst88@xxxxxxxxx, linux-xtensa@xxxxxxxxxxxxxxxx, paulmck@xxxxxxxxxx, richard.henderson@xxxxxxxxxx, npiggin@xxxxxxxxx, ink@xxxxxxxxxxxxxxxxxxxx, rostedt@xxxxxxxxxxx, loongarch@xxxxxxxxxxxxxxx, tglx@xxxxxxxxxxxxx, linux-arm-kernel@xxxxxxxxxxxxxxxxxxx, jgross@xxxxxxxx, chris@xxxxxxxxxx, tsbogend@xxxxxxxxxxxxxxxx, bristot@xxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, linux-alpha@xxxxxxxxxxxxxxx, bp@xxxxxxxxx, linuxppc-dev@xxxxxxxxxxxxxxxx, davem@xxxxxxxxxxxxx
- In-reply-to: <20230215194538.aiiris3uabnuvkkg@treble>
- References: <cover.1676358308.git.jpoimboe@kernel.org> <e47fc487980d5330e6059ac6e16416bec88cda0e.1676358308.git.jpoimboe@kernel.org> <14274f04-2991-95bd-c29b-07e86e8755c1@linaro.org> <Y+zZgZIP7RPIgyQf@FVFF77S0Q05N> <20230215194538.aiiris3uabnuvkkg@treble>
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@xxxxxxx>
Signed-off-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
---
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
[Index of Archives]
[Linux Kernel]
[Sparc Linux]
[DCCP]
[Linux ARM]
[Yosemite News]
[Linux SCSI]
[Linux x86_64]
[Linux for Ham Radio]