The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a39788bd281c3b297be37a2df79594c5cbb3ded8
commit a39788bd281c3b297be37a2df79594c5cbb3ded8 Author: Yuichiro NAITO <[email protected]> AuthorDate: 2022-06-06 15:21:33 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2022-06-13 12:43:06 +0000 smp: Use local copies of the setup function pointer and argument No functional change intended. PR: 264383 Reviewed by: jhb, markj (cherry picked from commit 8d95f500521128c2b40270bdd703a54b56dbccf2) --- sys/kern/subr_smp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index a677075937e6..d66120666f9d 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -500,8 +500,8 @@ smp_rendezvous_action(void) * function before moving on to the action function. */ if (local_setup_func != smp_no_rendezvous_barrier) { - if (smp_rv_setup_func != NULL) - smp_rv_setup_func(smp_rv_func_arg); + if (local_setup_func != NULL) + local_setup_func(local_func_arg); atomic_add_int(&smp_rv_waiters[1], 1); while (smp_rv_waiters[1] < smp_rv_ncpus) cpu_spinwait();
