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

[linux-block.git] / include / linux / smp.h

diff --git a/include/linux/smp.h b/include/linux/smp.h
index c036a2228d8d0e3c916db0653806ba7896ab9f7b..91ea4a67f8ca2a37395f21b160bf89167828f7b5 100644 (file)
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -59,8 +59,8 @@ int smp_call_function_single_async(int cpu, struct __call_single_data *csd);
  * Cpus stopping functions in panic. All have default weak definitions.
  * Architecture-dependent code may override them.
  */
-void panic_smp_self_stop(void);
-void nmi_panic_self_stop(struct pt_regs *regs);
+void __noreturn panic_smp_self_stop(void);
+void __noreturn nmi_panic_self_stop(struct pt_regs *regs);
 void crash_smp_send_stop(void);
 
 /*
@@ -130,9 +130,9 @@ extern void arch_smp_send_reschedule(int cpu);
  * scheduler_ipi() is inline so can't be passed as callback reason, but the
  * callsite IP should be sufficient for root-causing IPIs sent from here.
  */
-#define smp_send_reschedule(cpu) ({                              \
-       trace_ipi_send_cpumask(cpumask_of(cpu), _RET_IP_, NULL);  \
-       arch_smp_send_reschedule(cpu);                            \
+#define smp_send_reschedule(cpu) ({              \
+       trace_ipi_send_cpu(cpu, _RET_IP_, NULL);  \
+       arch_smp_send_reschedule(cpu);            \
 })
 
 /*