Merge tag 'smp-core-2023-04-27' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / arch / arm / kernel / smp.c

diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index b350bfc9d1f8085f040707f9f217c0685f10247f..87f8d0e5e314a87acbae464484c5d565f2874018 100644 (file)
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -319,7 +319,7 @@ void __cpu_die(unsigned int cpu)
  * of the other hotplug-cpu capable cores, so presumably coming
  * out of idle fixes this.
  */
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
 {
        unsigned int cpu = smp_processor_id();
 
@@ -381,6 +381,8 @@ void arch_cpu_idle_dead(void)
                : "r" (task_stack_page(current) + THREAD_SIZE - 8),
                  "r" (current)
                : "r0");
+
+       unreachable();
 }
 #endif /* CONFIG_HOTPLUG_CPU */
 
@@ -776,7 +778,7 @@ void smp_send_stop(void)
  * kdump fails. So split out the panic_smp_self_stop() and add
  * set_cpu_online(smp_processor_id(), false).
  */
-void panic_smp_self_stop(void)
+void __noreturn panic_smp_self_stop(void)
 {
        pr_debug("CPU %u will stop doing anything useful since another CPU has paniced\n",
                 smp_processor_id());