From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Apr 2023 22:03:43 +0000 (-0700)
Subject: Merge tag 'smp-core-2023-04-27' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.6-pxa1908~1339
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=f20730efbd305d42eded761f6fbd9a59d6125228;p=linux.git

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

Pull SMP cross-CPU function-call updates from Ingo Molnar:

 - Remove diagnostics and adjust config for CSD lock diagnostics

 - Add a generic IPI-sending tracepoint, as currently there's no easy
   way to instrument IPI origins: it's arch dependent and for some major
   architectures it's not even consistently available.

* tag 'smp-core-2023-04-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  trace,smp: Trace all smp_function_call*() invocations
  trace: Add trace_ipi_send_cpu()
  sched, smp: Trace smp callback causing an IPI
  smp: reword smp call IPI comment
  treewide: Trace IPIs sent via smp_send_reschedule()
  irq_work: Trace self-IPIs sent via arch_irq_work_raise()
  smp: Trace IPIs sent via arch_send_call_function_ipi_mask()
  sched, smp: Trace IPIs sent via send_call_function_single_ipi()
  trace: Add trace_ipi_send_cpumask()
  kernel/smp: Make csdlock_debug= resettable
  locking/csd_lock: Remove per-CPU data indirection from CSD lock debugging
  locking/csd_lock: Remove added data from CSD lock debugging
  locking/csd_lock: Add Kconfig option for csd_debug default
---

f20730efbd305d42eded761f6fbd9a59d6125228
diff --cc arch/x86/include/asm/smp.h
index 9fa795102b93,f9757123d8fa..4e91054c84be
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@@ -93,13 -93,12 +93,13 @@@ static inline void __cpu_die(unsigned i
  	smp_ops.cpu_die(cpu);
  }
  
 -static inline void play_dead(void)
 +static inline void __noreturn play_dead(void)
  {
  	smp_ops.play_dead();
 +	BUG();
  }
  
- static inline void smp_send_reschedule(int cpu)
+ static inline void arch_smp_send_reschedule(int cpu)
  {
  	smp_ops.smp_send_reschedule(cpu);
  }