Module Name:    src
Committed By:   hannken
Date:           Fri Jul  5 08:28:52 UTC 2019

Modified Files:
        src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c

Log Message:
Change module type to "MODULE_CLASS_MISC" to allow preloading.

Change "dtrace_nullop()" to return zero, it gets casted to "int (*)(...)".


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 \
    src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.38 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.39
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.38	Fri Jun 29 11:33:47 2018
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c	Fri Jul  5 08:28:52 2019
@@ -395,9 +395,12 @@ static dtrace_pattr_t	dtrace_provider_at
 { DTRACE_STABILITY_STABLE, DTRACE_STABILITY_STABLE, DTRACE_CLASS_COMMON },
 };
 
-static void
+static int
 dtrace_nullop(void)
-{}
+{
+
+	return 0;
+}
 
 static dtrace_pops_t	dtrace_provider_ops = {
 	(void (*)(void *, dtrace_probedesc_t *))dtrace_nullop,
@@ -18994,5 +18997,5 @@ MODULE_DEPEND(dtrace, opensolaris, 1, 1,
 #endif /* __FreeBSD__ */
 
 #ifdef __NetBSD__
-MODULE(MODULE_CLASS_DRIVER, dtrace, "solaris");
+MODULE(MODULE_CLASS_MISC, dtrace, "solaris");
 #endif /* __NetBSD__ */

Reply via email to