git: a1452eec4768 - main - dtrace: fix signature mismatch for taskqueue callbacks

[Mark Johnston]

The branch main has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=a1452eec4768272056aa070db94ea7184ce1117c

commit a1452eec4768272056aa070db94ea7184ce1117c
Author:     SHENGYI HONG <aokbl...@freebsd.org>
AuthorDate: 2025-02-23 17:42:41 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-02-24 14:56:29 +0000

    dtrace: fix signature mismatch for taskqueue callbacks
    
    Reviewed by:    markj
    MFC after:      1 week
    Differential Revision: https://reviews.freebsd.org/D49112
---
 sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c 
b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
index 608bff1d23ae..cfd403ac1a01 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
@@ -594,7 +594,8 @@ static dtrace_probe_t *dtrace_probe_lookup_id(dtrace_id_t 
id);
 static void dtrace_enabling_provide(dtrace_provider_t *);
 static int dtrace_enabling_match(dtrace_enabling_t *, int *);
 static void dtrace_enabling_matchall(void);
-static void dtrace_enabling_reap(void);
+static void dtrace_enabling_matchall_task(void *);
+static void dtrace_enabling_reap(void *);
 static dtrace_state_t *dtrace_anon_grab(void);
 static uint64_t dtrace_helper(int, dtrace_mstate_t *,
     dtrace_state_t *, uint64_t, uint64_t);
@@ -12991,6 +12992,12 @@ dtrace_enabling_match(dtrace_enabling_t *enab, int 
*nmatched)
        return (0);
 }
 
+static void
+dtrace_enabling_matchall_task(void *args __unused)
+{
+       dtrace_enabling_matchall();
+}
+
 static void
 dtrace_enabling_matchall(void)
 {
@@ -13118,7 +13125,7 @@ retry:
  * Called to reap ECBs that are attached to probes from defunct providers.
  */
 static void
-dtrace_enabling_reap(void)
+dtrace_enabling_reap(void *args __unused)
 {
        dtrace_provider_t *prov;
        dtrace_probe_t *probe;
@@ -16719,8 +16726,8 @@ dtrace_module_loaded(modctl_t *ctl)
                return;
        }
 
-       (void) taskq_dispatch(dtrace_taskq,
-           (task_func_t *)dtrace_enabling_matchall, NULL, TQ_SLEEP);
+       (void)taskq_dispatch(dtrace_taskq,
+           (task_func_t *)dtrace_enabling_matchall_task, NULL, TQ_SLEEP);
 
        mutex_exit(&dtrace_lock);