PERFORCE change 96027 for review

[John Birrell]

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

Change 96027 by jb at jb_freebsd2 on 2006/04/24 23:31:29

	Change 'struct modctl' to modctl_t and type define that the way it
	suits FreeBSD to refer to modules.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#8 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#8 (text) ====

@@ -57,16 +57,14 @@
 #include <opensolaris/compat/sys/processor.h>
 #include <opensolaris/compat/sys/time.h>
 #include <sys/param.h>
+#include <sys/linker.h>
 #include <sys/ioccom.h>
 #include <sys/ucred.h>
 typedef struct ucred cred_t;
 typedef struct proc proc_t;
 typedef struct thread kthread_t;
 typedef int model_t;
-struct modctl {
-	char		*mod_filename;
-	char		*mod_modname;
-};
+typedef struct linker_file modctl_t;
 #endif
 #include <sys/ctf_api.h>
 #if defined(sun)
@@ -1384,7 +1382,7 @@
  *   DTrace routines, including dtrace_probe_create(), dtrace_probe_lookup(),
  *   and dtrace_probe_arg().
  *
- * 1.3  void dtps_provide_module(void *arg, struct modctl *mp)
+ * 1.3  void dtps_provide_module(void *arg, modctl_t *mp)
  *
  * 1.3.1  Overview
  *
@@ -1990,7 +1988,7 @@
  */
 typedef struct dtrace_pops {
 	void (*dtps_provide)(void *arg, const dtrace_probedesc_t *spec);
-	void (*dtps_provide_module)(void *arg, struct modctl *mp);
+	void (*dtps_provide_module)(void *arg, modctl_t *mp);
 	void (*dtps_enable)(void *arg, dtrace_id_t id, void *parg);
 	void (*dtps_disable)(void *arg, dtrace_id_t id, void *parg);
 	void (*dtps_suspend)(void *arg, dtrace_id_t id, void *parg);
@@ -2211,8 +2209,8 @@
 extern void dtrace_membar_consumer(void);
 
 extern void (*dtrace_cpu_init)(processorid_t);
-extern void (*dtrace_modload)(struct modctl *);
-extern void (*dtrace_modunload)(struct modctl *);
+extern void (*dtrace_modload)(modctl_t *);
+extern void (*dtrace_modunload)(modctl_t *);
 extern void (*dtrace_helpers_cleanup)(void);
 extern void (*dtrace_helpers_fork)(proc_t *parent, proc_t *child);
 extern void (*dtrace_cpustart_init)(void);