From owner-p4-projects@FreeBSD.ORG  Wed Dec 19 03:29:36 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 34FE316A421; Wed, 19 Dec 2007 03:29:36 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EECF916A417
	for <perforce@freebsd.org>; Wed, 19 Dec 2007 03:29:35 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F258513C448
	for <perforce@freebsd.org>; Wed, 19 Dec 2007 03:29:35 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBJ3TZkO008277
	for <perforce@freebsd.org>; Wed, 19 Dec 2007 03:29:35 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBJ3TZv3008274
	for perforce@freebsd.org; Wed, 19 Dec 2007 03:29:35 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 19 Dec 2007 03:29:35 GMT
Message-Id: <200712190329.lBJ3TZv3008274@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 131211 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: Wed, 19 Dec 2007 03:29:36 -0000

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

Change 131211 by jb@jb_freebsd1 on 2007/12/19 03:28:56

	WIP

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/cyclic.c#4 edit
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cyclic_impl.h#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/cyclic.c#4 (text) ====

@@ -558,7 +558,10 @@
 #include <sys/atomic.h>
 #include <sys/kmem.h>
 #include <sys/cmn_err.h>
+
+#if defined(sun)
 #include <sys/ddi.h>
+#endif
 
 #ifdef CYCLIC_TRACE
 
@@ -598,7 +601,7 @@
 			break;
 
 		if (cyc_coverage[ndx].cyv_why != NULL ||
-		    casptr(&cyc_coverage[ndx].cyv_why, NULL, why) != NULL) {
+		    casptr(&cyc_coverage[ndx].cyv_why, NULL, why) != 0) {
 
 			if (++ndx == CY_NCOVERAGE)
 				ndx = 0;

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

@@ -425,7 +425,7 @@
 } cyc_backend_t;
 
 extern void cyclic_init(cyc_backend_t *be, hrtime_t resolution);
-extern void cyclic_mp_init();
+extern void cyclic_mp_init(void);
 
 #ifdef DEBUG
 #define	CYCLIC_TRACE
@@ -483,7 +483,7 @@
 #define	CY_NCOVERAGE	127
 
 typedef struct cyc_coverage {
-	char *cyv_why;
+	volatile void *cyv_why;
 	int cyv_passive_count;
 	int cyv_count[CY_LEVELS];
 	uint64_t cyv_arg0;