The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=68a573cc5d06099fcf55a67f3eb3368cc3705081
commit 68a573cc5d06099fcf55a67f3eb3368cc3705081 Author: Mark Johnston <[email protected]> AuthorDate: 2022-06-30 17:31:57 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2022-07-25 13:45:01 +0000 callout: Remove a redundant parameter to callout_cc_add() The passed cpuid is always equal to the one stored in the callout structure. No functional change intended. Sponsored by: The FreeBSD Foundation (cherry picked from commit aac7c7ac545804889d3bc28fae4efbcc07bcb6d3) --- sys/kern/kern_timeout.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 85f342cdeb3b..016365a9bea0 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -564,7 +564,7 @@ callout_lock(struct callout *c) static void callout_cc_add(struct callout *c, struct callout_cpu *cc, sbintime_t sbt, sbintime_t precision, void (*func)(void *), - void *arg, int cpu, int flags) + void *arg, int flags) { int bucket; @@ -597,7 +597,7 @@ callout_cc_add(struct callout *c, struct callout_cpu *cc, sbt = c->c_time + c->c_precision; if (sbt < cc->cc_firstevent) { cc->cc_firstevent = sbt; - cpu_new_callout(cpu, sbt, c->c_time); + cpu_new_callout(c->c_cpu, sbt, c->c_time); } } @@ -774,7 +774,7 @@ skip: new_cc = callout_cpu_switch(c, cc, new_cpu); flags = (direct) ? C_DIRECT_EXEC : 0; callout_cc_add(c, new_cc, new_time, new_prec, new_func, - new_arg, new_cpu, flags); + new_arg, flags); CC_UNLOCK(new_cc); CC_LOCK(cc); #else @@ -1023,7 +1023,7 @@ callout_reset_sbt_on(struct callout *c, sbintime_t sbt, sbintime_t prec, } #endif - callout_cc_add(c, cc, to_sbt, precision, ftn, arg, cpu, flags); + callout_cc_add(c, cc, to_sbt, precision, ftn, arg, flags); CTR6(KTR_CALLOUT, "%sscheduled %p func %p arg %p in %d.%08x", cancelled ? "re" : "", c, c->c_func, c->c_arg, (int)(to_sbt >> 32), (u_int)(to_sbt & 0xffffffff));
