From owner-p4-projects@FreeBSD.ORG  Mon Apr 24 23:31:39 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9DDB116A403; Mon, 24 Apr 2006 23:31:39 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 664AD16A401
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 23:31:39 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 30A7343D49
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 23:31:39 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ONVdlD007845
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 23:31:39 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ONVcgx007839
	for perforce@freebsd.org; Mon, 24 Apr 2006 23:31:38 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 24 Apr 2006 23:31:38 GMT
Message-Id: <200604242331.k3ONVcgx007839@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 96027 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Apr 2006 23:31:39 -0000

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

Change 96027 by jb@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);