PERFORCE change 96026 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=96026

Change 96026 by jb at jb_freebsd2 on 2006/04/24 23:30:03

	Change 'struct modctl' to modctl_t to be consistent with the rest
	of the Solaris code. We compatible-ise to modctl_t.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#15 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hook.c#3 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_register.c#4 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#15 (text+ko) ====

@@ -53,6 +53,7 @@
 #include <sys/kdb.h>
 #include <sys/kthread.h>
 #include <sys/limits.h>
+#include <sys/linker.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
@@ -245,7 +246,7 @@
 	/* dtps_provide */
 	(void (*)(void *, const dtrace_probedesc_t *))dtrace_nullop,
 	/* dtps_provide_module */
-	(void (*)(void *, struct modctl *))dtrace_nullop,
+	(void (*)(void *, modctl_t *))dtrace_nullop,
 	/* dtps_enable */
 	(void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
 	/* dtps_disable */
@@ -429,6 +430,7 @@
 dtrace_dynvar_t *dtrace_dynvar(dtrace_dstate_t *, uint_t, dtrace_key_t *, size_t, dtrace_dynvar_op_t);
 dtrace_state_t *dtrace_state_create(struct cdev *);
 int dtrace_dstate_init(dtrace_dstate_t *, size_t);
+int dtrace_probe_provide_cb(linker_file_t, void *);
 static char *dtrace_strdup(const char *);
 static dof_hdr_t *dtrace_dof_copyin(uintptr_t, int *);
 static dof_hdr_t *dtrace_dof_create(dtrace_state_t *);
@@ -537,8 +539,8 @@
 static void dtrace_helper_trace(dtrace_helper_action_t *r, dtrace_mstate_t *, dtrace_vstate_t *, int);
 static void dtrace_helpers_destroy(void);
 static void dtrace_helpers_duplicate(proc_t *, proc_t *);
-static void dtrace_module_loaded(struct modctl *);
-static void dtrace_module_unloaded(struct modctl *);
+static void dtrace_module_loaded(modctl_t *);
+static void dtrace_module_unloaded(modctl_t *);
 static void dtrace_predicate_hold(dtrace_predicate_t *);
 static void dtrace_predicate_release(dtrace_predicate_t *, dtrace_vstate_t *);
 static void dtrace_probe_description(const dtrace_probe_t *, dtrace_probedesc_t *);

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hook.c#3 (text+ko) ====

@@ -3,7 +3,7 @@
  * DTrace Hook Functions
  */
 static void
-dtrace_module_loaded(struct modctl *ctl)
+dtrace_module_loaded(modctl_t *ctl)
 {
 	dtrace_provider_t *prv;
 
@@ -58,7 +58,7 @@
 }
 
 static void
-dtrace_module_unloaded(struct modctl *ctl)
+dtrace_module_unloaded(modctl_t *ctl)
 {
 	dtrace_probe_t template, *probe, *first, *next;
 	dtrace_provider_t *prov;

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_register.c#4 (text+ko) ====

@@ -84,7 +84,7 @@
 	if (pops->dtps_provide_module == NULL) {
 		ASSERT(pops->dtps_provide != NULL);
 		provider->dtpv_pops.dtps_provide_module =
-		    (void (*)(void *, struct modctl *))dtrace_nullop;
+		    (void (*)(void *, modctl_t *))dtrace_nullop;
 	}
 
 	if (pops->dtps_suspend == NULL) {