From owner-p4-projects@FreeBSD.ORG  Sun May  7 22:52:02 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 11A3516A40B; Sun,  7 May 2006 22:52:02 +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 D031F16A405
	for <perforce@freebsd.org>; Sun,  7 May 2006 22:52:01 +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 A00FB43D6D
	for <perforce@freebsd.org>; Sun,  7 May 2006 22:51:55 +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 k47MptcC070241
	for <perforce@freebsd.org>; Sun, 7 May 2006 22:51:55 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47Mptae070223
	for perforce@freebsd.org; Sun, 7 May 2006 22:51:55 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 7 May 2006 22:51:55 GMT
Message-Id: <200605072251.k47Mptae070223@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 96801 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: Sun, 07 May 2006 22:52:02 -0000

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

Change 96801 by jb@jb_freebsd2 on 2006/05/07 22:50:55

	Clean up the include files.
	
	Move vmem_t out to a compatibility header.
	
	Fix a prototype to satisfy gcc's taste for all things consistent.

Affected files ...

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

Differences ...

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

@@ -45,16 +45,13 @@
  * Please refer to the "Solaris Dynamic Tracing Guide" for more information.
  */
 
-#if defined(sun)
 #include <sys/dtrace.h>
-#else
-#include <contrib/opensolaris/uts/common/sys/dtrace.h>
+#if !defined(sun)
 #ifdef __sparcv9
 typedef uint32_t		pc_t;
 #else
 typedef uintptr_t		pc_t;
 #endif
-typedef	u_int32_t		vmem_t;
 typedef	u_int			greg_t;
 #endif
 
@@ -1127,10 +1124,8 @@
 	uint32_t dts_dblerrors;			/* errors in ERROR probes */
 	uint32_t dts_reserve;			/* space reserved for END */
 	hrtime_t dts_laststatus;		/* time of last status */
-#ifdef DOODAD
 	cyclic_id_t dts_cleaner;		/* cleaning cyclic */
 	cyclic_id_t dts_deadman;		/* deadman cyclic */
-#endif
 	hrtime_t dts_alive;			/* time last alive */
 	char dts_speculates;			/* boolean: has speculations */
 	char dts_destructive;			/* boolean: has dest. actions */
@@ -1246,7 +1241,7 @@
 extern int dtrace_getipl(void);
 extern uintptr_t dtrace_caller(int);
 extern uint32_t dtrace_cas32(uint32_t *, uint32_t, uint32_t);
-extern void *dtrace_casptr(void *, void *, void *);
+extern void *dtrace_casptr(volatile void *, volatile void *, volatile void *);
 extern void dtrace_copyin(uintptr_t, uintptr_t, size_t);
 extern void dtrace_copyinstr(uintptr_t, uintptr_t, size_t);
 extern void dtrace_copyout(uintptr_t, uintptr_t, size_t);